comparison: openpkg/perl.patch
openpkg/perl.patch
- changeset 54
- f012bbb2a542
- parent 13
- cb59d6afeb61
- child 428
- f880f219c566
equal
deleted
inserted
replaced
| 0:e392a8b651b9 | 1:bd3665054dfc |
|---|---|
| 13 +my $installvendorlib = "$destdir$Config{installvendorlib}"; | 13 +my $installvendorlib = "$destdir$Config{installvendorlib}"; |
| 14 +my $installvendorarch = "$destdir$Config{installvendorarch}"; | 14 +my $installvendorarch = "$destdir$Config{installvendorarch}"; |
| 15 my $installman1dir = "$destdir$Config{installman1dir}"; | 15 my $installman1dir = "$destdir$Config{installman1dir}"; |
| 16 my $man1ext = $Config{man1ext}; | 16 my $man1ext = $Config{man1ext}; |
| 17 my $libperl = $Config{libperl}; | 17 my $libperl = $Config{libperl}; |
| 18 @@ -403,6 +405,8 @@ | 18 @@ -372,6 +374,8 @@ |
| 19 mkpath($installarchlib, $verbose, 0777); | 19 mkpath($installarchlib, $verbose, 0777); |
| 20 mkpath($installsitelib, $verbose, 0777) if ($installsitelib); | 20 mkpath($installsitelib, $verbose, 0777) if ($installsitelib); |
| 21 mkpath($installsitearch, $verbose, 0777) if ($installsitearch); | 21 mkpath($installsitearch, $verbose, 0777) if ($installsitearch); |
| 22 +mkpath($installvendorlib, $verbose, 0777) if ($installvendorlib); | 22 +mkpath($installvendorlib, $verbose, 0777) if ($installvendorlib); |
| 23 +mkpath($installvendorarch, $verbose, 0777) if ($installvendorarch); | 23 +mkpath($installvendorarch, $verbose, 0777) if ($installvendorarch); |
| 36 PERL[5]LIB, site, vendor, perl, other". | 36 PERL[5]LIB, site, vendor, perl, other". |
| 37 | 37 |
| 38 Index: perl.c | 38 Index: perl.c |
| 39 --- perl.c.orig 2006-08-15 14:37:41 +0200 | 39 --- perl.c.orig 2006-08-15 14:37:41 +0200 |
| 40 +++ perl.c 2006-08-18 21:08:14 +0200 | 40 +++ perl.c 2006-08-18 21:08:14 +0200 |
| 41 @@ -4749,39 +4749,6 @@ | 41 @@ -4753,39 +4753,6 @@ |
| 42 incpush(APPLLIB_EXP, TRUE, TRUE, TRUE, TRUE); | 42 incpush(APPLLIB_EXP, TRUE, TRUE, TRUE, TRUE); |
| 43 #endif | 43 #endif |
| 44 | 44 |
| 45 -#ifdef ARCHLIB_EXP | 45 -#ifdef ARCHLIB_EXP |
| 46 - incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE); | 46 - incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE); |
| 76 -#endif | 76 -#endif |
| 77 - | 77 - |
| 78 #ifdef SITEARCH_EXP | 78 #ifdef SITEARCH_EXP |
| 79 /* sitearch is always relative to sitelib on Windows for | 79 /* sitearch is always relative to sitelib on Windows for |
| 80 * DLL-based path intuition to work correctly */ | 80 * DLL-based path intuition to work correctly */ |
| 81 @@ -4824,6 +4791,39 @@ | 81 @@ -4828,6 +4795,39 @@ |
| 82 incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE, TRUE); | 82 incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE, TRUE); |
| 83 #endif | 83 #endif |
| 84 | 84 |
| 85 +#ifdef ARCHLIB_EXP | 85 +#ifdef ARCHLIB_EXP |
| 86 + incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE); | 86 + incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE); |
| 158 cat > UU/archname.cbu <<'EOCBU' | 158 cat > UU/archname.cbu <<'EOCBU' |
| 159 # This script UU/archname.cbu will get 'called-back' by Configure | 159 # This script UU/archname.cbu will get 'called-back' by Configure |
| 160 Index: perlio.c | 160 Index: perlio.c |
| 161 --- perlio.c.orig 2006-08-15 14:37:41 +0200 | 161 --- perlio.c.orig 2006-08-15 14:37:41 +0200 |
| 162 +++ perlio.c 2006-08-18 21:05:05 +0200 | 162 +++ perlio.c 2006-08-18 21:05:05 +0200 |
| 163 @@ -461,7 +461,14 @@ | 163 @@ -472,7 +472,14 @@ |
| 164 #include <unistd.h> | 164 #include <unistd.h> |
| 165 #endif | 165 #endif |
| 166 #ifdef HAS_MMAP | 166 #ifdef HAS_MMAP |
| 167 +#ifdef PERL_DARWIN | 167 +#ifdef PERL_DARWIN |
| 168 +#define environ_safe environ | 168 +#define environ_safe environ |
| 209 ----------------------------------------------------------------------------- | 209 ----------------------------------------------------------------------------- |
| 210 | 210 |
| 211 Index: Configure | 211 Index: Configure |
| 212 --- Configure.orig 2006-08-15 14:37:40 +0200 | 212 --- Configure.orig 2006-08-15 14:37:40 +0200 |
| 213 +++ Configure 2006-08-18 21:05:05 +0200 | 213 +++ Configure 2006-08-18 21:05:05 +0200 |
| 214 @@ -7787,7 +7787,7 @@ | 214 @@ -7871,7 +7871,7 @@ |
| 215 ;; | 215 ;; |
| 216 linux|irix*|gnu*) dflt='-shared' ;; | 216 linux|irix*|gnu*) dflt="-shared $optimize" ;; |
| 217 next) dflt='none' ;; | 217 next) dflt='none' ;; |
| 218 - solaris) dflt='-G' ;; | 218 - solaris) dflt='-G' ;; |
| 219 + solaris) dflt='-shared' ;; | 219 + solaris) dflt='-shared' ;; |
| 220 sunos) dflt='-assert nodefinitions' ;; | 220 sunos) dflt='-assert nodefinitions' ;; |
| 221 svr4*|esix*|nonstopux) dflt="-G $ldflags" ;; | 221 svr4*|esix*|nonstopux) dflt="-G $ldflags" ;; |
| 226 Security Fix (CVE-2005-3962, OpenPKG-SA-2005.025-perl) | 226 Security Fix (CVE-2005-3962, OpenPKG-SA-2005.025-perl) |
| 227 | 227 |
| 228 Index: sv.c | 228 Index: sv.c |
| 229 --- sv.c.orig 2006-08-15 14:37:41 +0200 | 229 --- sv.c.orig 2006-08-15 14:37:41 +0200 |
| 230 +++ sv.c 2006-08-18 21:05:05 +0200 | 230 +++ sv.c 2006-08-18 21:05:05 +0200 |
| 231 @@ -8595,7 +8595,10 @@ | 231 @@ -8667,7 +8667,10 @@ |
| 232 if ( (width = expect_number(&q)) ) { | 232 if ( (width = expect_number(&q)) ) { |
| 233 if (*q == '$') { | 233 if (*q == '$') { |
| 234 ++q; | 234 ++q; |
| 235 - efix = width; | 235 - efix = width; |
| 236 + if (width > PERL_INT_MAX) | 236 + if (width > PERL_INT_MAX) |
| 239 + efix = width; | 239 + efix = width; |
| 240 } else { | 240 } else { |
| 241 goto gotwidth; | 241 goto gotwidth; |
| 242 } | 242 } |
| 243 | 243 |
| 244 ----------------------------------------------------------------------------- | |
| 245 | |
| 246 Corrections for Solaris 11: | |
| 247 | |
| 248 Index: perl.h | |
| 249 diff -Nau perl.h.orig perl.h | |
| 250 --- perl.h.orig 2007-12-18 11:47:08.000000000 +0100 | |
| 251 +++ perl.h 2009-01-06 15:28:45.843276063 +0100 | |
| 252 @@ -1393,6 +1393,7 @@ | |
| 253 */ | |
| 254 | |
| 255 #if defined(I_SYSMODE) && !defined(PERL_MICRO) | |
| 256 +#include <sys/vnode.h> | |
| 257 #include <sys/mode.h> | |
| 258 #endif | |
| 259 |
