comparison: openpkg/perl.patch
openpkg/perl.patch
- changeset 556
- d927b76d07e3
- parent 428
- f880f219c566
equal
deleted
inserted
replaced
| 2:a7d6b5498987 | 3:d9e530bcd30a |
|---|---|
| 4 area is. | 4 area is. |
| 5 | 5 |
| 6 Index: installperl | 6 Index: installperl |
| 7 --- installperl.orig 2011-06-09 22:04:29.000000000 +0200 | 7 --- installperl.orig 2011-06-09 22:04:29.000000000 +0200 |
| 8 +++ installperl 2011-06-17 15:20:48.000000000 +0200 | 8 +++ installperl 2011-06-17 15:20:48.000000000 +0200 |
| 9 @@ -200,6 +200,8 @@ | 9 @@ -196,6 +196,8 @@ |
| 10 my $installarchlib = "$opts{destdir}$Config{installarchlib}"; | 10 my $installarchlib = "$opts{destdir}$Config{installarchlib}"; |
| 11 my $installsitelib = "$opts{destdir}$Config{installsitelib}"; | 11 my $installsitelib = "$opts{destdir}$Config{installsitelib}"; |
| 12 my $installsitearch = "$opts{destdir}$Config{installsitearch}"; | 12 my $installsitearch = "$opts{destdir}$Config{installsitearch}"; |
| 13 +my $installvendorlib = "$opts{destdir}$Config{installvendorlib}"; | 13 +my $installvendorlib = "$opts{destdir}$Config{installvendorlib}"; |
| 14 +my $installvendorarch = "$opts{destdir}$Config{installvendorarch}"; | 14 +my $installvendorarch = "$opts{destdir}$Config{installvendorarch}"; |
| 117 Linker flag change for Solaris. | 117 Linker flag change for Solaris. |
| 118 | 118 |
| 119 Index: Configure | 119 Index: Configure |
| 120 --- Configure.orig 2011-06-09 22:04:29.000000000 +0200 | 120 --- Configure.orig 2011-06-09 22:04:29.000000000 +0200 |
| 121 +++ Configure 2011-06-17 15:20:48.000000000 +0200 | 121 +++ Configure 2011-06-17 15:20:48.000000000 +0200 |
| 122 @@ -8078,9 +8058,9 @@ | 122 @@ -8014,9 +8014,9 @@ |
| 123 ;; | 123 ;; |
| 124 linux|irix*|gnu*) dflt="-shared $optimize" ;; | 124 linux|irix*|gnu*) dflt="-shared $optimize" ;; |
| 125 next) dflt='none' ;; | 125 next) dflt='none' ;; |
| 126 - solaris) dflt='-G' ;; | 126 - solaris) dflt='-G' ;; |
| 127 + solaris) dflt='-shared' ;; | 127 + solaris) dflt='-shared' ;; |
| 137 Security Fix (CVE-2005-3962, OpenPKG-SA-2005.025-perl) | 137 Security Fix (CVE-2005-3962, OpenPKG-SA-2005.025-perl) |
| 138 | 138 |
| 139 Index: sv.c | 139 Index: sv.c |
| 140 --- sv.c.orig 2011-06-17 02:06:09.000000000 +0200 | 140 --- sv.c.orig 2011-06-17 02:06:09.000000000 +0200 |
| 141 +++ sv.c 2011-06-17 15:20:48.000000000 +0200 | 141 +++ sv.c 2011-06-17 15:20:48.000000000 +0200 |
| 142 @@ -10198,7 +10198,10 @@ | 142 @@ -10283,7 +10283,10 @@ |
| 143 if ( (width = expect_number(&q)) ) { | 143 if ( (width = expect_number(&q)) ) { |
| 144 if (*q == '$') { | 144 if (*q == '$') { |
| 145 ++q; | 145 ++q; |
| 146 - efix = width; | 146 - efix = width; |
| 147 + if (width > PERL_INT_MAX) | 147 + if (width > PERL_INT_MAX) |
| 157 Do not use -fstack-protector as it causes too much portability issues. | 157 Do not use -fstack-protector as it causes too much portability issues. |
| 158 | 158 |
| 159 Index: Configure | 159 Index: Configure |
| 160 --- Configure.orig 2011-06-09 22:04:29.000000000 +0200 | 160 --- Configure.orig 2011-06-09 22:04:29.000000000 +0200 |
| 161 +++ Configure 2011-06-17 15:20:48.000000000 +0200 | 161 +++ Configure 2011-06-17 15:20:48.000000000 +0200 |
| 162 @@ -5158,17 +5158,6 @@ | 162 @@ -5103,17 +5103,6 @@ |
| 163 ;; | 163 ;; |
| 164 esac | 164 esac |
| 165 | 165 |
| 166 - # on x86_64 (at least) we require an extra library (libssp) in the | 166 - # on x86_64 (at least) we require an extra library (libssp) in the |
| 167 - # link command line. This library is not named, so I infer that it is | 167 - # link command line. This library is not named, so I infer that it is |
| 175 - ;; | 175 - ;; |
| 176 - esac | 176 - esac |
| 177 ;; | 177 ;; |
| 178 esac | 178 esac |
| 179 | 179 |
| 180 @@ -5307,15 +5296,6 @@ | 180 @@ -5241,15 +5241,6 @@ |
| 181 ;; | 181 ;; |
| 182 *) dflt="$ldflags";; | 182 *) dflt="$ldflags";; |
| 183 esac | 183 esac |
| 184 -# See note above about -fstack-protector | 184 -# See note above about -fstack-protector |
| 185 -case "$ccflags" in | 185 -case "$ccflags" in |
| 191 - ;; | 191 - ;; |
| 192 -esac | 192 -esac |
| 193 | 193 |
| 194 : Try to guess additional flags to pick up local libraries. | 194 : Try to guess additional flags to pick up local libraries. |
| 195 for thislibdir in $libpth; do | 195 for thislibdir in $libpth; do |
| 196 @@ -8107,14 +8087,6 @@ | 196 @@ -8023,14 +8023,6 @@ |
| 197 ''|' ') dflt='none' ;; | 197 ''|' ') dflt='none' ;; |
| 198 esac | 198 esac |
| 199 | 199 |
| 200 - case "$ldflags" in | 200 - case "$ldflags" in |
| 201 - *-fstack-protector*) | 201 - *-fstack-protector*) |
| 214 Make sure we install into <prefix>/lib/perl/ and not <prefix>/lib/perl5/ | 214 Make sure we install into <prefix>/lib/perl/ and not <prefix>/lib/perl5/ |
| 215 | 215 |
| 216 Index: Configure | 216 Index: Configure |
| 217 --- Configure.orig 2009-08-24 18:33:49 +0200 | 217 --- Configure.orig 2009-08-24 18:33:49 +0200 |
| 218 +++ Configure 2009-08-24 18:44:39 +0200 | 218 +++ Configure 2009-08-24 18:44:39 +0200 |
| 219 @@ -1769,7 +1769,7 @@ | 219 @@ -1778,7 +1778,7 @@ |
| 220 touch posthint.sh | 220 touch posthint.sh |
| 221 | 221 |
| 222 : set package name | 222 : set package name |
| 223 -package='perl5' | 223 -package='perl5' |
| 224 +package='perl' | 224 +package='perl' |
| 232 because it also needs libgdbm (which Perl doesn't pick up, too) | 232 because it also needs libgdbm (which Perl doesn't pick up, too) |
| 233 | 233 |
| 234 Index: hints/linux.sh | 234 Index: hints/linux.sh |
| 235 --- hints/linux.sh.orig 2011-06-09 22:04:29.000000000 +0200 | 235 --- hints/linux.sh.orig 2011-06-09 22:04:29.000000000 +0200 |
| 236 +++ hints/linux.sh 2011-06-17 15:20:48.000000000 +0200 | 236 +++ hints/linux.sh 2011-06-17 15:20:48.000000000 +0200 |
| 237 @@ -55,7 +55,9 @@ | 237 @@ -58,7 +58,9 @@ |
| 238 libswanted="$*" | 238 libswanted="$*" |
| 239 | 239 |
| 240 # Debian 4.0 puts ndbm in the -lgdbm_compat library. | 240 # Debian 4.0 puts ndbm in the -lgdbm_compat library. |
| 241 -libswanted="$libswanted gdbm_compat" | 241 -libswanted="$libswanted gdbm_compat" |
| 242 +if [ -f /etc/debian_version -o -f /etc/ubuntu_version ]; then | 242 +if [ -f /etc/debian_version -o -f /etc/ubuntu_version ]; then |
