From: Michael Cummings Date: Sat, 18 Nov 2006 16:24:24 +0000 (+0000) Subject: Bug 150702; also cleaned up unused patches X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=800b2469ee30e442411ab6a8ec9b8a02f53b3162;p=gentoo.git Bug 150702; also cleaned up unused patches Package-Manager: portage-2.1.2_rc1-r7 --- diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest index a54ec15eaa9f..7859c21610d5 100644 --- a/dev-lang/perl/Manifest +++ b/dev-lang/perl/Manifest @@ -1,22 +1,10 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX perl-5.8.7-CAN-2005-0448-rmtree.patch 6961 RMD160 bf242f32c1e1450a7d4d252cdc54cace36b50c62 SHA1 97d1f3a3b2d75b7a82983b1f98d4445ff82d2c19 SHA256 d6565afabbc35e0e1aeecfb469eaf037f892834312a7c2616357a309cd56e3f1 -MD5 fd8a46de4b22dbf9146a6d0459e812c4 files/perl-5.8.7-CAN-2005-0448-rmtree.patch 6961 -RMD160 bf242f32c1e1450a7d4d252cdc54cace36b50c62 files/perl-5.8.7-CAN-2005-0448-rmtree.patch 6961 -SHA256 d6565afabbc35e0e1aeecfb469eaf037f892834312a7c2616357a309cd56e3f1 files/perl-5.8.7-CAN-2005-0448-rmtree.patch 6961 AUX perl-5.8.7-MakeMaker-RUNPATH.patch 859 RMD160 b0e95fcd9b1bbc085e9986f8910e3fbcf3f78eb2 SHA1 1e7c2f05ffaf8f6aee753ab106a9798e6920ff06 SHA256 3d327c525e0cf57899eca48d417fa4363f40da9b0d6b70b61e951521749047ab MD5 044b90a8895f8a03bef8e4cf5759eecc files/perl-5.8.7-MakeMaker-RUNPATH.patch 859 RMD160 b0e95fcd9b1bbc085e9986f8910e3fbcf3f78eb2 files/perl-5.8.7-MakeMaker-RUNPATH.patch 859 SHA256 3d327c525e0cf57899eca48d417fa4363f40da9b0d6b70b61e951521749047ab files/perl-5.8.7-MakeMaker-RUNPATH.patch 859 -AUX perl-5.8.7-regexp-nossp.patch 460 RMD160 dde3a25904275896e98d7b7f3a02926c8dbc5ca5 SHA1 e7de561f7885fb3d49635fa2dc733c0eed63b987 SHA256 e2d923711bb856b3c7f790dbc1cd1f468d647c1e50a3ff8a18745023c73b3e36 -MD5 528fa2521c530d5a47df32b663e629af files/perl-5.8.7-regexp-nossp.patch 460 -RMD160 dde3a25904275896e98d7b7f3a02926c8dbc5ca5 files/perl-5.8.7-regexp-nossp.patch 460 -SHA256 e2d923711bb856b3c7f790dbc1cd1f468d647c1e50a3ff8a18745023c73b3e36 files/perl-5.8.7-regexp-nossp.patch 460 -AUX perl-5.8.7-tempfiles.patch 1007 RMD160 e3b5b7cd6b35b2ab66ccfb6a98cb50c0f1cb9fa8 SHA1 5dbd353ab2db2ea62f36c1406d60cbcda4126580 SHA256 2cc4a635f3d20417531884d0a821a0677efffe5caa642cf7d366cda210b6f267 -MD5 26a1e7c48c7f68f39db4262500f6a1d8 files/perl-5.8.7-tempfiles.patch 1007 -RMD160 e3b5b7cd6b35b2ab66ccfb6a98cb50c0f1cb9fa8 files/perl-5.8.7-tempfiles.patch 1007 -SHA256 2cc4a635f3d20417531884d0a821a0677efffe5caa642cf7d366cda210b6f267 files/perl-5.8.7-tempfiles.patch 1007 AUX perl-5.8.8-CAN-2005-0448-rmtree.patch 6961 RMD160 bf242f32c1e1450a7d4d252cdc54cace36b50c62 SHA1 97d1f3a3b2d75b7a82983b1f98d4445ff82d2c19 SHA256 d6565afabbc35e0e1aeecfb469eaf037f892834312a7c2616357a309cd56e3f1 MD5 fd8a46de4b22dbf9146a6d0459e812c4 files/perl-5.8.8-CAN-2005-0448-rmtree.patch 6961 RMD160 bf242f32c1e1450a7d4d252cdc54cace36b50c62 files/perl-5.8.8-CAN-2005-0448-rmtree.patch 6961 @@ -49,10 +37,6 @@ AUX perl-5.8.8-reorder-INC.patch 3046 RMD160 73bc824bebee8889073656a7b547dc63b35 MD5 f6c5dc893c771f72cc183c946628d35e files/perl-5.8.8-reorder-INC.patch 3046 RMD160 73bc824bebee8889073656a7b547dc63b35696dc files/perl-5.8.8-reorder-INC.patch 3046 SHA256 136ca6c6cfaa3467f6a164f26b34ff06cc55823ca5723118764589cc15d37aed files/perl-5.8.8-reorder-INC.patch 3046 -AUX perl-exp_intwrap.patch 1635 RMD160 275f05a9a1070e6abf51fea443e8bacccb599e74 SHA1 5acffc6360a3483915268f64b476daa798fcb6c5 SHA256 24450c746f930dfd78670cd6b7936929302625fc94db2f78dd6b4cd4287dffe8 -MD5 cc54c9f18cd584f4cac0ec109eae9335 files/perl-exp_intwrap.patch 1635 -RMD160 275f05a9a1070e6abf51fea443e8bacccb599e74 files/perl-exp_intwrap.patch 1635 -SHA256 24450c746f930dfd78670cd6b7936929302625fc94db2f78dd6b4cd4287dffe8 files/perl-exp_intwrap.patch 1635 AUX perl-h2ph-ansi-header.patch 446 RMD160 8baf89df0d3f916a8c4f437444fa1af01f5fa8b0 SHA1 31f0a7e7444e914bec2a0a3e41838eb82e038e6f SHA256 dc28a8ccba56e0aa5e01b0ecf68a163ebfb9460917d201f1f6d9a1efef06c788 MD5 060e9f10466fdc1268c75a7cf4dcbc7c files/perl-h2ph-ansi-header.patch 446 RMD160 8baf89df0d3f916a8c4f437444fa1af01f5fa8b0 files/perl-h2ph-ansi-header.patch 446 @@ -65,10 +49,6 @@ AUX perl-noksh.patch 611 RMD160 6ddb9e7140c60e05042c3c488c97399a86f965fc SHA1 61 MD5 076dcbef37263d6dd7af719b55cfc2de files/perl-noksh.patch 611 RMD160 6ddb9e7140c60e05042c3c488c97399a86f965fc files/perl-noksh.patch 611 SHA256 0861f7f54c184e99a0ffeebeab9420d969d2002f921bc3fb14841a1e24be1f5e files/perl-noksh.patch 611 -AUX perl-nonblock.patch 400 RMD160 11ea0cd9d56418c08400d7215536055890ab4a32 SHA1 1dbb8a5b11d2497d8e08d5322fce457ce50831cd SHA256 383cfbfb8ac0f15e5da8ff953fe41675f5fde798151b2d1644542dfaca145eef -MD5 01af75daf3d222a668059e90d78a1f9d files/perl-nonblock.patch 400 -RMD160 11ea0cd9d56418c08400d7215536055890ab4a32 files/perl-nonblock.patch 400 -SHA256 383cfbfb8ac0f15e5da8ff953fe41675f5fde798151b2d1644542dfaca145eef files/perl-nonblock.patch 400 AUX perl-perldoc-emptydirs.patch 489 RMD160 66d619f5811c1c35d16776e23a0a580bd83fe19b SHA1 d8f852db37fb1e5d1085bc94cab79c3422c12a84 SHA256 e8c52d67793f0a5ae0aee52a3b9db2b348a1303b57069d6f82c4bb499f45ee2f MD5 0a28eb41f5f12ed54f025004af45c83d files/perl-perldoc-emptydirs.patch 489 RMD160 66d619f5811c1c35d16776e23a0a580bd83fe19b files/perl-perldoc-emptydirs.patch 489 @@ -85,19 +65,15 @@ AUX perl-regexp-nossp.patch 460 RMD160 dde3a25904275896e98d7b7f3a02926c8dbc5ca5 MD5 528fa2521c530d5a47df32b663e629af files/perl-regexp-nossp.patch 460 RMD160 dde3a25904275896e98d7b7f3a02926c8dbc5ca5 files/perl-regexp-nossp.patch 460 SHA256 e2d923711bb856b3c7f790dbc1cd1f468d647c1e50a3ff8a18745023c73b3e36 files/perl-regexp-nossp.patch 460 -AUX perl-reorder-INC.patch 1141 RMD160 4a889fa029fb77e7454ed0c6f7870359340df672 SHA1 782cbfff76d4bc9e968d978f8311ccbd71ffe620 SHA256 4e075cb6b6b418ab3b2a6f6b9af633ac51cc7d7749330d3981fa69d0f2d16564 -MD5 f7324a62f22aabde3387b7e8a8b2106e files/perl-reorder-INC.patch 1141 -RMD160 4a889fa029fb77e7454ed0c6f7870359340df672 files/perl-reorder-INC.patch 1141 -SHA256 4e075cb6b6b418ab3b2a6f6b9af633ac51cc7d7749330d3981fa69d0f2d16564 files/perl-reorder-INC.patch 1141 DIST perl-5.8.8.tar.bz2 10123359 RMD160 e78f26d9b96e6db35f946ad4ff55e3a69385c71b SHA1 4aab490040727ca4419098720eca2ba4367df539 SHA256 818a140d9c04ea8dab3a05104b34ced7f7d9d0a91bfed91baf89a84d0dfb1bc9 -EBUILD perl-5.8.8-r2.ebuild 18116 RMD160 f08edfac4ba024e51815e69355dca9cebf958467 SHA1 2815c7dae46f561a299c91639e5c699f25e04887 SHA256 e8c1fd4b36e454f9a0979fb58fded91ebd18601d3dc2a88137df9e2544a5f5bd -MD5 db024d4b719d50afc924212dc9a9df31 perl-5.8.8-r2.ebuild 18116 -RMD160 f08edfac4ba024e51815e69355dca9cebf958467 perl-5.8.8-r2.ebuild 18116 -SHA256 e8c1fd4b36e454f9a0979fb58fded91ebd18601d3dc2a88137df9e2544a5f5bd perl-5.8.8-r2.ebuild 18116 -MISC ChangeLog 53260 RMD160 1653a4821ee22cbc2d137242549225d8c819fbff SHA1 c5e98cad81876191a1135b24067f536f218c9104 SHA256 9067239f00faf45fdc7f9a5773cfd1b5512935abd4acfaa492a78498e622d898 -MD5 9a12b91c721db9e0962bf38332325b96 ChangeLog 53260 -RMD160 1653a4821ee22cbc2d137242549225d8c819fbff ChangeLog 53260 -SHA256 9067239f00faf45fdc7f9a5773cfd1b5512935abd4acfaa492a78498e622d898 ChangeLog 53260 +EBUILD perl-5.8.8-r2.ebuild 18124 RMD160 30a4a08a6e79d56e242f1316d30e0144ca823756 SHA1 4ed827985a033946b30015c38b0aad7890eb0078 SHA256 55c9084ddd9ff4bb65f8a6b7a52bf3a85791bbb75d03cb20c452f307d7df50d4 +MD5 57dfa55de70a88f6ff7dcd7303113409 perl-5.8.8-r2.ebuild 18124 +RMD160 30a4a08a6e79d56e242f1316d30e0144ca823756 perl-5.8.8-r2.ebuild 18124 +SHA256 55c9084ddd9ff4bb65f8a6b7a52bf3a85791bbb75d03cb20c452f307d7df50d4 perl-5.8.8-r2.ebuild 18124 +MISC ChangeLog 53600 RMD160 d0588827b65cd274c8beb8376d2d6b47b78f478f SHA1 c71ef095716d3ce272a93cd98805b113fd750633 SHA256 558addc994ff8ab2950107837eb2a127a858fe2ac3f7b563dc04b9afb8075b85 +MD5 7ba016066045a8abda10e2951a5b6ab6 ChangeLog 53600 +RMD160 d0588827b65cd274c8beb8376d2d6b47b78f478f ChangeLog 53600 +SHA256 558addc994ff8ab2950107837eb2a127a858fe2ac3f7b563dc04b9afb8075b85 ChangeLog 53600 MISC metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 SHA1 99ef1deeae9a934fb6e46cf5fc4a5fcb8379a74a SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 metadata.xml 305 @@ -108,7 +84,7 @@ SHA256 1067b25eabccaa2d61cfc9db27e31c6b18d075e440713e44dcde000c71bbf178 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFPRmHtG5z4I8BtQoRAuo5AJ92uiJsJGZjzaQBxk0AolmYYnug8gCfRzli -bSw2jMPqsH9OGnzBO89Vvy0= -=ai9+ +iD8DBQFFXzO2tG5z4I8BtQoRAgrhAJ4nIG0RoD54Ij5qzO/7aH9Z1BvVeACfah7h +rbPXfJqRxjGCMM/dLHHUtD0= +=hixk -----END PGP SIGNATURE----- diff --git a/dev-lang/perl/files/perl-5.8.7-CAN-2005-0448-rmtree.patch b/dev-lang/perl/files/perl-5.8.7-CAN-2005-0448-rmtree.patch deleted file mode 100644 index 0bee3e107ebf..000000000000 --- a/dev-lang/perl/files/perl-5.8.7-CAN-2005-0448-rmtree.patch +++ /dev/null @@ -1,263 +0,0 @@ ---- lib/File/Path.pm.old 2005-06-28 17:22:21.000000000 -0400 -+++ lib/File/Path.pm 2005-06-28 17:32:32.000000000 -0400 -@@ -26,9 +26,11 @@ to a list of paths to create, - - =item * - --a boolean value, which if TRUE will cause C --to print the name of each directory as it is created --(defaults to FALSE), and -+a boolean value, which if FALSE (the default for non-root users) will -+cause C to adjust the mode of directories (if required) prior -+to attempting to remove the contents. Note that on interruption or -+failure of C, directories may be left with more permissi -+modes for the owner. - - =item * - -@@ -124,6 +126,7 @@ use File::Basename (); - use Exporter (); - use strict; - use warnings; -+use Cwd 'getcwd'; - - our $VERSION = "1.07"; - our @ISA = qw( Exporter ); -@@ -172,111 +175,133 @@ sub mkpath { - @created; - } - --sub rmtree { -- my($roots, $verbose, $safe) = @_; -- my(@files); -- my($count) = 0; -- $verbose ||= 0; -- $safe ||= 0; -- -- if ( defined($roots) && length($roots) ) { -- $roots = [$roots] unless ref $roots; -- } -- else { -- carp "No root path(s) specified\n"; -- return 0; -- } -- -- my($root); -- foreach $root (@{$roots}) { -- if ($Is_MacOS) { -- $root = ":$root" if $root !~ /:/; -- $root =~ s#([^:])\z#$1:#; -- } else { -- $root =~ s#/\z##; -- } -- (undef, undef, my $rp) = lstat $root or next; -- $rp &= 07777; # don't forget setuid, setgid, sticky bits -- if ( -d _ ) { -- # notabene: 0700 is for making readable in the first place, -- # it's also intended to change it to writable in case we have -- # to recurse in which case we are better than rm -rf for -- # subtrees with strange permissions -- chmod($rp | 0700, ($Is_VMS ? VMS::Filespec::fileify($root) : $root)) -- or carp "Can't make directory $root read+writeable: $!" -- unless $safe; -- -- if (opendir my $d, $root) { -- no strict 'refs'; -- if (!defined ${"\cTAINT"} or ${"\cTAINT"}) { -- # Blindly untaint dir names -- @files = map { /^(.*)$/s ; $1 } readdir $d; -- } else { -- @files = readdir $d; -- } -- closedir $d; -- } -- else { -- carp "Can't read $root: $!"; -- @files = (); -- } -+sub _rmtree; -+sub _rmtree -+{ -+ -+ my ($path, $prefix, $up, $up_dev, $up_ino, $verbose, $safe) = @_; -+ -+ my ($dev, $ino) = lstat $path or do { -+ carp "Can't stat $prefix$path ($!)" unless $!{ENOENT}; -+ return 0; -+ }; -+ -+ unless (-d _) -+ { -+ print "unlink $prefix$path\n" if $verbose; -+ unless (unlink $path) -+ { -+ carp "Can't remove file $prefix$path ($!)"; -+ return 0; -+ } -+ return 1; -+ } - -- # Deleting large numbers of files from VMS Files-11 filesystems -- # is faster if done in reverse ASCIIbetical order -- @files = reverse @files if $Is_VMS; -- ($root = VMS::Filespec::unixify($root)) =~ s#\.dir\z## if $Is_VMS; -- if ($Is_MacOS) { -- @files = map("$root$_", @files); -- } else { -- @files = map("$root/$_", grep $_!~/^\.{1,2}\z/s,@files); -- } -- $count += rmtree(\@files,$verbose,$safe); -- if ($safe && -- ($Is_VMS ? !&VMS::Filespec::candelete($root) : !-w $root)) { -- print "skipped $root\n" if $verbose; -- next; -- } -- chmod $rp | 0700, $root -- or carp "Can't make directory $root writeable: $!" -- if $force_writeable; -- print "rmdir $root\n" if $verbose; -- if (rmdir $root) { -- ++$count; -- } -- else { -- carp "Can't remove directory $root: $!"; -- chmod($rp, ($Is_VMS ? VMS::Filespec::fileify($root) : $root)) -- or carp("and can't restore permissions to " -- . sprintf("0%o",$rp) . "\n"); -- } -- } -- else { -- if ($safe && -- ($Is_VMS ? !&VMS::Filespec::candelete($root) -- : !(-l $root || -w $root))) -- { -- print "skipped $root\n" if $verbose; -- next; -- } -- chmod $rp | 0600, $root -- or carp "Can't make file $root writeable: $!" -- if $force_writeable; -- print "unlink $root\n" if $verbose; -- # delete all versions under VMS -- for (;;) { -- unless (unlink $root) { -- carp "Can't unlink file $root: $!"; -- if ($force_writeable) { -- chmod $rp, $root -- or carp("and can't restore permissions to " -- . sprintf("0%o",$rp) . "\n"); -- } -- last; -- } -- ++$count; -- last unless $Is_VMS && lstat $root; -- } -- } -+ unless (chdir $path) -+ { -+ carp "Can't chdir to $prefix$path ($!)"; -+ return 0; -+ } -+ -+ # avoid a race condition where a directory may be replaced by a -+ # symlink between the lstat and the chdir -+ my ($new_dev, $new_ino, $perm) = stat '.'; -+ unless ("$new_dev:$new_ino" eq "$dev:$ino") -+ { -+ croak "Directory $prefix$path changed before chdir, aborting"; -+ } -+ -+ $perm &= 07777; -+ my $nperm = $perm | 0700; -+ unless ($safe or $nperm == $perm or chmod $nperm, '.') -+ { -+ carp "Can't make directory $prefix$path read+writeable ($!)"; -+ $nperm = $perm; -+ } -+ -+ my $count = 0; -+ if (opendir my $dir, '.') -+ { -+ my $entry; -+ while (defined ($entry = readdir $dir)) -+ { -+ next if $entry =~ /^\.\.?$/; -+ $entry =~ /^(.*)$/s; $entry = $1; # untaint -+ $count += _rmtree $entry, "$prefix$path/", '..', $dev, $ino, -+ $verbose, $safe; -+ } -+ -+ closedir $dir; -+ } -+ -+ # restore directory permissions if required (in case the rmdir -+ # below fails) now, while we're still in the directory and may do -+ # so without a race via '.' -+ unless ($nperm == $perm or chmod $perm, '.') -+ { -+ carp "Can't restore permissions on directory $prefix$path ($!)"; -+ } -+ -+ # don't leave the caller in an unexpected directory -+ unless (chdir $up) -+ { -+ croak "Can't return to $up from $prefix$path ($!)"; -+ } -+ -+ # ensure that a chdir .. didn't take us somewhere other than -+ # where we expected (see CVE-2002-0435) -+ unless (($new_dev, $new_ino) = stat '.' -+ and "$new_dev:$new_ino" eq "$up_dev:$up_ino") -+ { -+ croak "Previous directory $up changed since entering $prefix$path"; -+ } -+ -+ print "rmdir $prefix$path\n" if $verbose; -+ if (rmdir $path) -+ { -+ $count++; -+ } -+ else -+ { -+ carp "Can't remove directory $prefix$path ($!)"; -+ } -+ -+ return $count; -+} -+ -+sub rmtree -+{ -+ my ($p, $verbose, $safe) = @_; -+ $p = [] unless defined $p and length $p; -+ $p = [ $p ] unless ref $p; -+ my @paths = grep defined && length, @$p; -+ -+ # default to "unsafe" for non-root (will chmod dirs) -+ $safe = $> ? 0 : 1 unless defined $safe; -+ -+ unless (@paths) -+ { -+ carp "No root path(s) specified"; -+ return; -+ } -+ -+ my $oldpwd = getcwd or do { -+ carp "Can't fetch initial working directory"; -+ return; -+ }; -+ -+ my ($dev, $ino) = stat '.' or do { -+ carp "Can't stat initial working directory"; -+ return; -+ }; -+ -+ # untaint -+ for ($oldpwd) { /^(.*)$/s; $_ = $1 } -+ -+ my $count = 0; -+ for my $path (@paths) -+ { -+ $count += _rmtree $path, '', $oldpwd, $dev, $ino, $verbose, $safe; - } - - $count; diff --git a/dev-lang/perl/files/perl-5.8.7-regexp-nossp.patch b/dev-lang/perl/files/perl-5.8.7-regexp-nossp.patch deleted file mode 100644 index d0357cd50629..000000000000 --- a/dev-lang/perl/files/perl-5.8.7-regexp-nossp.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cflags.SH.orig 2005-07-03 23:39:10.000000000 -0400 -+++ cflags.SH 2005-07-03 23:39:47.000000000 -0400 -@@ -165,6 +165,8 @@ - esac - - : Can we perhaps use $ansi2knr here -+ [ "x$file" = xregcomp ] && export ccflags="${ccflags} -fno-stack-protector" -+ [ "x$file" = xregexec ] && export ccflags="${ccflags} -fno-stack-protector" - echo "$cc -c -DPERL_CORE $ccflags $optimize $warn" - eval "$also "'"$cc -DPERL_CORE -c $ccflags $optimize $warn"' - diff --git a/dev-lang/perl/files/perl-5.8.7-tempfiles.patch b/dev-lang/perl/files/perl-5.8.7-tempfiles.patch deleted file mode 100644 index 8d8e306a72b3..000000000000 --- a/dev-lang/perl/files/perl-5.8.7-tempfiles.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- lib/ExtUtils/instmodsh.old 2005-06-28 16:57:43.000000000 -0400 -+++ lib/ExtUtils/instmodsh 2005-06-28 16:59:28.000000000 -0400 -@@ -2,6 +2,7 @@ - - use strict; - use IO::File; -+use File::Temp; - use ExtUtils::Packlist; - use ExtUtils::Installed; - -@@ -58,16 +59,12 @@ while (1) - $reply =~ /^t\s*/ and do - { - my $file = (split(' ', $reply))[1]; -- my $tmp = "/tmp/inst.$$"; -- if (my $fh = IO::File->new($tmp, "w")) -- { -- $fh->print(join("\n", $Inst->files($module))); -- $fh->close(); -- system("tar cvf $file -I $tmp"); -- unlink($tmp); -- last CASE; -- } -- else { print("Can't open $file: $!\n"); } -+ my ($fh, $tmp) = File::Temp::tempfile(UNLINK => 1); -+ $fh->print(join("\n", $Inst->files($module))); -+ $fh->close(); -+ # This used to use -I which is wrong for GNU tar. -+ system("tar cvf $file -T $tmp"); -+ unlink($tmp); - last CASE; - }; - $reply eq 'v' and do diff --git a/dev-lang/perl/files/perl-exp_intwrap.patch b/dev-lang/perl/files/perl-exp_intwrap.patch deleted file mode 100644 index 44c4d4ced361..000000000000 --- a/dev-lang/perl/files/perl-exp_intwrap.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- sv.c.orig 2005-12-05 06:45:46.000000000 -0500 -+++ sv.c 2005-12-06 11:56:42.000000000 -0500 -@@ -8519,7 +8519,10 @@ Perl_sv_vcatpvfn(pTHX_ SV *sv, const cha - if (EXPECT_NUMBER(q, width)) { - if (*q == '$') { - ++q; -- efix = width; -+ if (width > INT_MAX) -+ efix=INT_MAX; -+ else -+ efix = width; - } else { - goto gotwidth; - } -@@ -8707,9 +8710,10 @@ Perl_sv_vcatpvfn(pTHX_ SV *sv, const cha - - if (vectorize) - argsv = vecsv; -- else if (!args) -- argsv = (efix ? efix <= svmax : svix < svmax) ? -- svargs[efix ? efix-1 : svix++] : &PL_sv_undef; -+ else if (!args) { -+ I32 i = efix ? efix-1 : svix++; -+ argsv = (i >= 0 && i < svmax) ? svargs[i] : &PL_sv_undef; -+ } - - switch (c = *q++) { - -@@ -8972,6 +8976,8 @@ Perl_sv_vcatpvfn(pTHX_ SV *sv, const cha - *--eptr = '0'; - break; - case 2: -+ if (!uv) -+ alt = FALSE; - do { - dig = uv & 1; - *--eptr = '0' + dig; -@@ -9274,6 +9280,8 @@ Perl_sv_vcatpvfn(pTHX_ SV *sv, const cha - - /* calculate width before utf8_upgrade changes it */ - have = esignlen + zeros + elen; -+ if (have < zeros) -+ Perl_croak_nocontext(PL_memory_wrap); - - if (is_utf8 != has_utf8) { - if (is_utf8) { -@@ -9301,6 +9309,11 @@ Perl_sv_vcatpvfn(pTHX_ SV *sv, const cha - need = (have > width ? have : width); - gap = need - have; - -+#ifdef PERL_MALLOC_WRAP -+ if (need >= (((STRLEN)~0) - SvCUR(sv) - dotstrlen - 1)) { -+ Perl_croak_nocontext(PL_memory_wrap); -+ } -+#endif - SvGROW(sv, SvCUR(sv) + need + dotstrlen + 1); - p = SvEND(sv); - if (esignlen && fill == '0') { diff --git a/dev-lang/perl/files/perl-nonblock.patch b/dev-lang/perl/files/perl-nonblock.patch deleted file mode 100644 index 65c0acae6e62..000000000000 --- a/dev-lang/perl/files/perl-nonblock.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ext/IO/IO.xs.orig 2004-08-02 21:26:35.486883359 -0700 -+++ ext/IO/IO.xs 2004-08-02 21:26:58.285155590 -0700 -@@ -75,7 +75,7 @@ - int mode = RETVAL; - #ifdef O_NONBLOCK - /* POSIX style */ --#if defined(O_NDELAY) && O_NDELAY != O_NONBLOCK -+#if defined(O_NDELAY) && O_NDELAY != O_NONBLOCK && !defined(__linux__) - /* Ooops has O_NDELAY too - make sure we don't - * get SysV behaviour by mistake. */ - diff --git a/dev-lang/perl/files/perl-reorder-INC.patch b/dev-lang/perl/files/perl-reorder-INC.patch deleted file mode 100644 index cc314d97d314..000000000000 --- a/dev-lang/perl/files/perl-reorder-INC.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- perl.c.orig 2005-07-26 13:04:54.000000000 -0400 -+++ perl.c 2005-07-26 13:05:05.000000000 -0400 -@@ -4397,9 +4397,9 @@ S_init_perllib(pTHX) - incpush(APPLLIB_EXP, TRUE, TRUE, TRUE); - #endif - --#ifdef ARCHLIB_EXP -- incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE); --#endif -+ /* for configuration where /usr is mounted ro (CPAN::Config, Net::Config) */ -+ incpush("/etc/perl", FALSE, FALSE, TRUE); -+ - #ifdef MACOS_TRADITIONAL - { - Stat_t tmpstatbuf; -@@ -4426,8 +4426,6 @@ S_init_perllib(pTHX) - #endif - #if defined(WIN32) - incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE); --#else -- incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE); - #endif - - #ifdef SITEARCH_EXP -@@ -4471,6 +4469,15 @@ S_init_perllib(pTHX) - incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE); - #endif - -+ incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE); -+ incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE); -+ -+ /* Non-versioned site directory for local modules and for -+ compatability with the previous packages' site dirs */ -+ -+ incpush("/usr/local/lib/site_perl", TRUE, FALSE, TRUE); -+ -+ - #ifdef PERL_OTHERLIBDIRS - incpush(PERL_OTHERLIBDIRS, TRUE, TRUE, TRUE); - #endif