Fix missing patches and update manifest

3 files changed, 135 insertions, 0 deletions

diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 197e063fe..2db18d596 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -7,6 +7,7 @@ AUX perl-5.8.8-asm-page-h-compile-failure.patch 384 RMD160 cb55d65bd1245019689f7
 AUX perl-5.8.8-cplusplus.patch 854 RMD160 1fbfc7ec9940622beb644ce0fa98a6f52131c9db SHA1 e4718e0b1c869ec56d59466caed3fab555848085 SHA256 ea1368e609b0d992b6cd5f92c327768d8c61ca2096826f26af2576263efb8a89
 AUX perl-5.8.8-dragonfly-clean.patch 5211 RMD160 d2411913185276cd9c9aa55a614ae2ed13d22fe9 SHA1 2d2bb9a8b7fa312229d5e13eea845384069d7e2f SHA256 08b22fe26695f6f7f7d21ca2628954eded91205b64450e24d0b295eb75952b6c
 AUX perl-5.8.8-fbsdhints.patch 1984 RMD160 0b298920ce1dce296fc574a4e27f00e59332343c SHA1 50d58cf1bb837261a148eb9d0b7e2a4856c1a9b0 SHA256 98ff829c9544e7edb329974b883f98b1391a5bb0e071edbb5e96feeba2c066c8
+AUX perl-5.8.8-fix_file_path_chdir.patch 2195 RMD160 affc85a3406b54c1a22e1b3e49b35e5f643181c5 SHA1 d617e9aa86a5c6f8f22f6d77cc4b1e366f051cc3 SHA256 192883bb78ce487cc27e0158d7fb17837c45ae7a88091eb7bbf228888dff95c1
 AUX perl-5.8.8-gcc42-command-line.patch 497 RMD160 5fe723ae71be6c6316f11ca2219f489fce60101c SHA1 ae75dfd80b59afb23377fdf491b46b7a561714d7 SHA256 946d02284221bc3615e1f03afda1735e6da0296b03315e2a644bd784ad6f76d1
 AUX perl-5.8.8-lib32.patch 3395 RMD160 6ae9b9afe1bdb4a8d63c20fbfd7676f69e5052a6 SHA1 08eb7475c6455c99c0277db3755994b17d413047 SHA256 567f216c0a34f76ce6b6ddd61e8c0a2eb8c9d2d4a3f83a5c508d96b34b8288e5
 AUX perl-5.8.8-lib64.patch 3393 RMD160 406206c33b10b4af8cb2d1aba2fa6aadf5d9eea6 SHA1 d2e3bced513435dd66634d89938d65aa5839e7a8 SHA256 3efe8048934093a1a66bc37b22fbb56a6e10df2940bb85b57802c9129c9bd1bd
@@ -16,6 +17,7 @@ AUX perl-5.8.8-makedepend-syntax.patch 341 RMD160 8d0ee189b86c7c3b6467512a7be25c
 AUX perl-5.8.8-perlcc.patch 559 RMD160 cedf2f1666b4add3ef6baed214e31d76b4b6731d SHA1 1104b880d9570599308609fd793ded5bd2f450db SHA256 7c212d320ec34cf8d0d5443ce5fad5c94a9fa9075462d54ddd8cc5716a2f2aa9
 AUX perl-5.8.8-reorder-INC.patch 3046 RMD160 73bc824bebee8889073656a7b547dc63b35696dc SHA1 ec56010c38cbadce6fccf7ba314cfc7f42f470c6 SHA256 136ca6c6cfaa3467f6a164f26b34ff06cc55823ca5723118764589cc15d37aed
 AUX perl-5.8.8-utf8-boundary.patch 1866 RMD160 c65ee9df8b9f71504420b905be2067220ef9daaa SHA1 38eb633f427bf7cd843843bff525dbc50116df8b SHA256 62848b35ed88c7d3a1a836903707b467e421321810e18792da41b28f9e7124a1
+AUX perl-fix_h2ph_include_quote.patch 2462 RMD160 d38aef789a45483a99ae6302cbce9c5fd9cc3635 SHA1 42489f2c7849195e14ac3bb2cb22b666260fe9fb SHA256 bfe3ebd7e119ebf5e11dc00e55773732f483e740e153dff267dd5ca12affc432
 AUX perl-h2ph-ansi-header.patch 446 RMD160 8baf89df0d3f916a8c4f437444fa1af01f5fa8b0 SHA1 31f0a7e7444e914bec2a0a3e41838eb82e038e6f SHA256 dc28a8ccba56e0aa5e01b0ecf68a163ebfb9460917d201f1f6d9a1efef06c788
 AUX perl-hppa-pa7200-configure.patch 446 RMD160 ab902e2b5cf7f96023e0e267f170401b036dd4f5 SHA1 fcb7e61cdf1ce1c9993f257507b3289ce45382d7 SHA256 4fe6a010dbdc39325f4003e7ccd02cb7996b4a99b64ab0fa8b12d6fe67f87a31
 AUX perl-noksh.patch 611 RMD160 6ddb9e7140c60e05042c3c488c97399a86f965fc SHA1 61bf5bb0955bd04a758d1381fa4260ed9fdbb1d1 SHA256 0861f7f54c184e99a0ffeebeab9420d969d2002f921bc3fb14841a1e24be1f5e
diff --git a/dev-lang/perl/files/perl-5.8.8-fix_file_path_chdir.patch b/dev-lang/perl/files/perl-5.8.8-fix_file_path_chdir.patch
new file mode 100644
index 000000000..c75aa8936
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.8.8-fix_file_path_chdir.patch
@@ -0,0 +1,72 @@
+ExtUtils/Command.pm (among other things) expects to be able to destroy
+a strangely-permissioned testdir.  This is a backport of the chdir/chmod
+work performed in File::Path released in Perl 5.10.0.
+
+--- perl-5.8.7.orig/lib/File/Path.pm	2008-12-05 13:23:32.000000000 -0800
++++ perl-5.8.7/lib/File/Path.pm	2008-12-05 13:33:13.000000000 -0800
+@@ -162,7 +162,7 @@
+ {
+     my ($path, $prefix, $up, $up_dev, $up_ino, $verbose, $safe) = @_;
+ 
+-    my ($dev, $ino) = lstat $path or return 0;
++    my ($dev, $ino, $perm) = lstat $path or return 0;
+     unless (-d _)
+     {
+ 	print "unlink $prefix$path\n" if $verbose;
+@@ -175,15 +175,25 @@
+ 	return 1;
+     }
+ 
+-    unless (chdir $path)
+-    {
++    if (!chdir($path)) {
++        # see if we can escalate privileges to get in
++        # (e.g. funny protection mask such as -w- instead of rwx)
++        $perm &= 07777;
++        my $nperm = $perm | 0700;
++        if (!($safe or $nperm == $perm or chmod($nperm, $path))) {
++            carp "cannot make $prefix$path read-write-exec";
++            return 0;
++        }
++        elsif (!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 '.';
++    my ($new_dev, $new_ino);
++    ($new_dev, $new_ino, $perm) = stat '.';
+     unless ("$new_dev:$new_ino" eq "$dev:$ino")
+     {
+ 	croak "Directory $prefix$path changed before chdir, aborting";
+--- perl-5.8.8.orig/lib/ExtUtils/t/Command.t
++++ perl-5.8.8/lib/ExtUtils/t/Command.t
+@@ -23,7 +23,7 @@
+ }
+ 
+ BEGIN {
+-    use Test::More tests => 38;
++    use Test::More tests => 39;
+     use File::Spec;
+ }
+ 
+@@ -148,7 +148,7 @@
+             $^O eq 'NetWare' || $^O eq 'dos' || $^O eq 'cygwin'  ||
+             $^O eq 'MacOS'
+            ) {
+-            skip( "different file permission semantics on $^O", 4);
++            skip( "different file permission semantics on $^O", 5);
+         }
+ 
+         @ARGV = ('testdir');
+@@ -178,6 +178,7 @@
+ 
+         @ARGV = ('testdir');
+         rm_rf;
++        ok( ! -e 'testdir', 'rm_rf can delete a read-only dir' );
+     }
+ 
+ 
diff --git a/dev-lang/perl/files/perl-fix_h2ph_include_quote.patch b/dev-lang/perl/files/perl-fix_h2ph_include_quote.patch
new file mode 100644
index 000000000..a71fbe6e2
--- /dev/null
+++ b/dev-lang/perl/files/perl-fix_h2ph_include_quote.patch
@@ -0,0 +1,61 @@
+Subject: Fix h2ph with double-quote-delimited #include directives.
+
+Allow the quote mark delimiter also for those #include directives chased with "h2ph -a".
+
+Debian bug #479762.
+
+Also add the directory prefix of the current file when the quote syntax is
+used; 'require' will only look in @INC, not the current directory.
+
+Upstream change 33835.
+--- a/utils/h2ph.PL
++++ b/utils/h2ph.PL
+@@ -85,7 +85,7 @@ sub reindent($) {
+ }
+ 
+ my ($t, $tab, %curargs, $new, $eval_index, $dir, $name, $args, $outfile);
+-my ($incl, $incl_type, $next);
++my ($incl, $incl_type, $incl_quote, $next);
+ while (defined (my $file = next_file())) {
+     if (-l $file and -d $file) {
+         link_if_possible($file) if ($opt_l);
+@@ -186,9 +186,10 @@ while (defined (my $file = next_file())) {
+                       print OUT $t,"unless(defined(\&$name)) {\n    sub $name () {\t",$new,";}\n}\n";
+ 		    }
+ 		}
+-	    } elsif (/^(include|import|include_next)\s*[<\"](.*)[>\"]/) {
++	    } elsif (/^(include|import|include_next)\s*([<\"])(.*)[>\"]/) {
+                 $incl_type = $1;
+-                $incl = $2;
++                $incl_quote = $2;
++                $incl = $3;
+                 if (($incl_type eq 'include_next') ||
+                     ($opt_e && exists($bad_file{$incl}))) {
+                     $incl =~ s/\.h$/.ph/;
+@@ -221,6 +222,10 @@ while (defined (my $file = next_file())) {
+ 			   "warn(\$\@) if \$\@;\n");
+                 } else {
+                     $incl =~ s/\.h$/.ph/;
++                    # copy the prefix in the quote syntax (#include "x.h") case
++                    if ($incl !~ m|/| && $incl_quote eq q{"} && $file =~ m|^(.*)/|) {
++                        $incl = "$1/$incl";
++                    }
+ 		    print OUT $t,"require '$incl';\n";
+                 }
+ 	    } elsif (/^ifdef\s+(\w+)/) {
+@@ -724,8 +729,13 @@ sub queue_includes_from
+                 $line .= <HEADER>;
+             }
+ 
+-            if ($line =~ /^#\s*include\s+<(.*?)>/) {
+-                push(@ARGV, $1) unless $Is_converted{$1};
++            if ($line =~ /^#\s*include\s+([<"])(.*?)[>"]/) {
++                my ($delimiter, $new_file) = ($1, $2);
++                # copy the prefix in the quote syntax (#include "x.h") case
++                if ($delimiter eq q{"} && $file =~ m|^(.*)/|) {
++                    $new_file = "$1/$new_file";
++                }
++                push(@ARGV, $new_file) unless $Is_converted{$new_file};
+             }
+         }
+     close HEADER;