You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
114 lines
4.3 KiB
114 lines
4.3 KiB
Index: Crypt-DH-0.06/inc/Module/Install/AutoInstall.pm |
|
--- Crypt-DH-0.06/inc/Module/Install/AutoInstall.pm.orig 2005-06-11 08:16:43.000000000 +0200 |
|
+++ Crypt-DH-0.06/inc/Module/Install/AutoInstall.pm 2015-08-11 08:11:21.483183560 +0200 |
|
@@ -21,7 +21,7 @@ |
|
# ExtUtils::AutoInstall Bootstrap Code, version 7. |
|
AUTO:{my$p='ExtUtils::AutoInstall';my$v=0.49;$p->VERSION||0>=$v |
|
or+eval"use $p $v;1"or+do{my$e=$ENV{PERL_EXTUTILS_AUTOINSTALL}; |
|
-(!defined($e)||$e!~m/--(?:default|skip|testonly)/and-t STDIN or |
|
+(!defined($e)||$e!~m/--(?:default|skip|testonly)/ and-t STDIN or |
|
eval"use ExtUtils::MakeMaker;WriteMakefile(PREREQ_PM=>{'$p',$v} |
|
);1"and exit)and print"==> $p $v required. Install it from CP". |
|
"AN? [Y/n] "and<STDIN>!~/^n/i and print"*** Installing $p\n"and |
|
Index: Crypt-GOST-1.00/GOST.xs |
|
--- Crypt-GOST-1.00/GOST.xs.orig 2001-05-13 16:11:35.000000000 +0200 |
|
+++ Crypt-GOST-1.00/GOST.xs 2015-08-11 08:11:21.483183560 +0200 |
|
@@ -54,8 +54,9 @@ |
|
output = sv_newmortal(); |
|
outlen = 8; |
|
|
|
- if (SvREADONLY(output) || !SvUPGRADE(output, SVt_PV)) |
|
+ if (SvREADONLY(output)) |
|
croak("cannot use output as lvalue"); |
|
+ SvUPGRADE(output, SVt_PV); |
|
|
|
gost_crypt(self, |
|
(unsigned char *)input, |
|
Index: Data-UUID-1.226/UUID.h |
|
--- Data-UUID-1.226/UUID.h.orig 2014-12-16 01:01:11.000000000 +0100 |
|
+++ Data-UUID-1.226/UUID.h 2015-08-11 08:11:21.483183560 +0200 |
|
@@ -61,7 +61,11 @@ |
|
#define UUID_NODEID_NV_STORE _STDIR"/"UUID_NODEID |
|
#endif |
|
|
|
-#define UUIDS_PER_TICK 1024 |
|
+#if defined(__CYGWIN__) || defined(__MINGW32__) |
|
+#define UUIDS_PER_TICK 10000 |
|
+#else |
|
+#define UUIDS_PER_TICK 10 |
|
+#endif |
|
#ifdef _MSC_VER |
|
#define I64(C) C##i64 |
|
#else |
|
Index: Data-UUID-1.226/UUID.pm |
|
--- Data-UUID-1.226/UUID.pm.orig 2015-08-11 08:11:21.483183000 +0200 |
|
+++ Data-UUID-1.226/UUID.pm 2015-08-11 08:12:28.123223914 +0200 |
|
@@ -80,14 +80,12 @@ |
|
$ug->create_from_name_bin(<namespace>, <name>); |
|
|
|
# creates UUID string, using conventional UUID string format, |
|
- # such as: 4162F712-1DD2-11B2-B17E-C09EFE1DC403 |
|
- # Note that digits A-F are capitalized, which is contrary to rfc4122 |
|
+ # such as: 4162f712-1dd2-11b2-b17e-c09efe1dc403 |
|
$ug->create_str(); |
|
$ug->create_from_name_str(<namespace>, <name>); |
|
|
|
# creates UUID string as a hex string, |
|
- # such as: 0x4162F7121DD211B2B17EC09EFE1DC403 |
|
- # Note that digits A-F are capitalized, which is contrary to rfc4122 |
|
+ # such as: 0X4162f7121dd211b2b17ec09efe1dc403 |
|
$ug->create_hex(); |
|
$ug->create_from_name_hex(<namespace>, <name>); |
|
|
|
Index: Data-UUID-1.226/UUID.xs |
|
--- Data-UUID-1.226/UUID.xs.orig 2014-12-16 01:01:11.000000000 +0100 |
|
+++ Data-UUID-1.226/UUID.xs 2015-08-11 08:11:21.483183560 +0200 |
|
@@ -141,7 +141,7 @@ |
|
} |
|
|
|
static void get_system_time(perl_uuid_time_t *perl_uuid_time) { |
|
-#if defined __cygwin__ || defined __MINGW32__ || defined WIN32 |
|
+#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(WIN32) |
|
/* ULARGE_INTEGER time; */ |
|
LARGE_INTEGER time; |
|
|
|
@@ -165,7 +165,7 @@ |
|
|
|
static void get_random_info(unsigned char seed[16]) { |
|
SV* ctx; |
|
-#if defined __cygwin__ || defined __MINGW32__ || defined __MSWin32__ |
|
+#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(WIN32) |
|
typedef struct { |
|
MEMORYSTATUS m; |
|
SYSTEM_INFO s; |
|
@@ -188,7 +188,7 @@ |
|
#endif |
|
randomness r; |
|
|
|
-#if defined __cygwin__ || defined __MINGW32__ || defined __MSWin32__ |
|
+#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(WIN32) |
|
GlobalMemoryStatus(&r.m); |
|
GetSystemInfo(&r.s); |
|
GetSystemTimeAsFileTime(&r.t); |
|
@@ -225,10 +225,10 @@ |
|
len = sizeof(perl_uuid_t); |
|
break; |
|
case F_STR: |
|
- sprintf(buf, "%8.8X-%4.4X-%4.4X-%2.2X%2.2X-", (unsigned int)u.time_low, u.time_mid, |
|
+ sprintf(buf, "%8.8x-%4.4x-%4.4x-%2.2x%2.2x-", (unsigned int)u.time_low, u.time_mid, |
|
u.time_hi_and_version, u.clock_seq_hi_and_reserved, u.clock_seq_low); |
|
for(i = 0; i < 6; i++ ) |
|
- sprintf(buf+strlen(buf), "%2.2X", u.node[i]); |
|
+ sprintf(buf+strlen(buf), "%2.2x", u.node[i]); |
|
len = strlen(buf); |
|
break; |
|
case F_HEX: |
|
@@ -370,7 +370,7 @@ |
|
*hate += getpid(); |
|
} else { |
|
get_random_info(seed); |
|
- seed[0] |= 0x80; |
|
+ seed[0] |= 0x01; |
|
memcpy(&(RETVAL->nodeid), seed, sizeof(uuid_node_t)); |
|
mask = umask(_DEFAULT_UMASK); |
|
if ((fd = fopen(UUID_NODEID_NV_STORE, "wb"))) {
|
|
|