diff options
author | Michael Cummings <mcummings@gentoo.org> | 2006-11-18 16:24:24 +0000 |
---|---|---|
committer | Michael Cummings <mcummings@gentoo.org> | 2006-11-18 16:24:24 +0000 |
commit | 6ca5e0b22b4b25353aa1f5c94906f2eb081471b9 (patch) | |
tree | 3ab54c5d31dc31763e0622b5f0ecea86f1f4b9de /dev-lang/perl/files | |
parent | Remove old versions. (diff) | |
download | gentoo-2-6ca5e0b22b4b25353aa1f5c94906f2eb081471b9.tar.gz gentoo-2-6ca5e0b22b4b25353aa1f5c94906f2eb081471b9.tar.bz2 gentoo-2-6ca5e0b22b4b25353aa1f5c94906f2eb081471b9.zip |
Bug 150702; also cleaned up unused patches
(Portage version: 2.1.2_rc1-r7)
(Signed Manifest commit)
Diffstat (limited to 'dev-lang/perl/files')
-rw-r--r-- | dev-lang/perl/files/perl-5.8.7-CAN-2005-0448-rmtree.patch | 263 | ||||
-rw-r--r-- | dev-lang/perl/files/perl-5.8.7-regexp-nossp.patch | 11 | ||||
-rw-r--r-- | dev-lang/perl/files/perl-5.8.7-tempfiles.patch | 33 | ||||
-rw-r--r-- | dev-lang/perl/files/perl-exp_intwrap.patch | 58 | ||||
-rw-r--r-- | dev-lang/perl/files/perl-nonblock.patch | 11 | ||||
-rw-r--r-- | dev-lang/perl/files/perl-reorder-INC.patch | 40 |
6 files changed, 0 insertions, 416 deletions
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<mkpath> --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<rmtree> to adjust the mode of directories (if required) prior -+to attempting to remove the contents. Note that on interruption or -+failure of C<rmtree>, 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 |