Add another File-Path fix

Package-Manager: portage-2.2_rc33/cvs/Linux i686

5 files changed, 88 insertions, 9 deletions

diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index 811e7a35a29e..37f4a7c39107 100644
--- a/dev-lang/perl/ChangeLog
+++ b/dev-lang/perl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/perl
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.281 2009/05/27 08:39:04 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.282 2009/05/29 13:26:28 tove Exp $
+
+  29 May 2009; Torsten Veller <tove@gentoo.org> perl-5.8.8-r6.ebuild,
+  perl-5.8.8-r7.ebuild, +files/perl-5.8.8-fix_file_path_chdir.patch:
+  Add another File-Path fix
 
   27 May 2009; Torsten Veller <tove@gentoo.org> -perl-5.8.8-r2.ebuild,
   -perl-5.8.8-r3.ebuild, -perl-5.8.8-r4.ebuild:
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 2b0f773686a6..44a54bf5ccc9 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -10,6 +10,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 2880 RMD160 805294f4c1754d607dca1b6a42d7a5b7cf9a11aa SHA1 71315045f440d4f00a877b32f5a31a150ad33276 SHA256 90f9dd366ac931ac8baef61b1c8cdab4c80009554919c212b169fd37268ddf23
 AUX perl-5.8.8-lib64.patch 2880 RMD160 7538c40726f34f08f8e181153b7fa0047d7f73f4 SHA1 bb4e21dd5db6915918a9e7777d658a27a7c615ef SHA256 d2005cd1d57852a87f6060627c88eaab56534bcc8f922567e250ea79d2f6552d
@@ -29,14 +30,14 @@ AUX perl-prelink-lpthread.patch 476 RMD160 f3252258e5f7a0f82b5f9ea49598ea9f4b0b4
 AUX perl-regexp-nossp.patch 460 RMD160 dde3a25904275896e98d7b7f3a02926c8dbc5ca5 SHA1 e7de561f7885fb3d49635fa2dc733c0eed63b987 SHA256 e2d923711bb856b3c7f790dbc1cd1f468d647c1e50a3ff8a18745023c73b3e36
 DIST perl-5.8.8.tar.bz2 10123359 RMD160 e78f26d9b96e6db35f946ad4ff55e3a69385c71b SHA1 4aab490040727ca4419098720eca2ba4367df539 SHA256 818a140d9c04ea8dab3a05104b34ced7f7d9d0a91bfed91baf89a84d0dfb1bc9
 EBUILD perl-5.8.8-r5.ebuild 19295 RMD160 246aa81b035712c86bebbf1a436b03ddea56648e SHA1 e9f175ef668a6516d27bd08eddae743c8036c9f1 SHA256 9f169c6d160430d08c99effc8ef70cf28f0b03193daba5c60a828e4ded28c900
-EBUILD perl-5.8.8-r6.ebuild 19568 RMD160 b859dd07c8c017e0b4fb85ec72dc6d211baac6c2 SHA1 82bbc546e54ba21beb322e55f07f4f8d4f028f08 SHA256 5ba1eeea7d5f2fc9b2f3f42bc355f7ed1a9cf3d492a19b3b795fe3af597027b7
-EBUILD perl-5.8.8-r7.ebuild 19724 RMD160 c4125a6e84c9a422d65a2a360677f2bd1b40f1e7 SHA1 3947cbd390dc5875a38b434283b52f02a25f2faf SHA256 643033f6080cc637a1cad6f3af4d2acddb71ea29d7bfd016e28dcb9f16b9f5c1
-MISC ChangeLog 60443 RMD160 e0f82ea3a9756103944b41c3d7daf23fd25a9c5c SHA1 92258c3cf2365e3bc3200da3d7600929fcc051f8 SHA256 7f7fb91c56adb661e658b2342ce9a74799af074f21cce633e696927800476283
+EBUILD perl-5.8.8-r6.ebuild 19621 RMD160 f3558dccc3ca76fa33e304b0cf5865bc783f1d0a SHA1 9d11248df2a217a3d0ec35c34d025bd6bbf0a876 SHA256 2c473a151e1f37cd3f1ae21de4aa9c6281e6d21ed6a1ed2e7476d9bf2ee20cb4
+EBUILD perl-5.8.8-r7.ebuild 19777 RMD160 3388f845cfaa903dad38a728a910636582029bd4 SHA1 78b97e5e7a3bd6397b12bf2da1939bf1bb26fea6 SHA256 5b80b4c4c96ef681fe1634d1f5473fa2bd8f45d41db71b2a8ea9703352b54251
+MISC ChangeLog 60611 RMD160 18456114b52199702f796a59ed0ca7728b5280e7 SHA1 b7e2c861d11068a25da66d2a0074f756919d0436 SHA256 b7f3eeb40ee89dc75c37c5d58c8f18e02f59f0dc3a066baa562b7db486c79e1e
 MISC metadata.xml 451 RMD160 8424230d79d13df7462c454050058b3526a78e92 SHA1 1ae85db5c1c1fc6413ca324ebc93b6894831b437 SHA256 49e06011c113616fa1f618cf58d42c2d6abbce5f71936f109b6ae3a5dfff587c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoc/D4ACgkQV3J2n04EauzppwCgkqVaNuWL1w9oujrqD+uSDK+7
-KgYAn2LjjdEhzPtqPR3WcKxL5DJJ5dB9
-=HvSP
+iEYEARECAAYFAkof4p4ACgkQV3J2n04EauwucgCcCidcaRbPI1n5715+W8Z13XjR
+JG0Ani8NxTKOnQRDS6gpxElmCRRkQYvn
+=wJ8M
 -----END PGP SIGNATURE-----
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 000000000000..c75aa89369a8
--- /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/perl-5.8.8-r6.ebuild b/dev-lang/perl/perl-5.8.8-r6.ebuild
index 0f6d73dd8507..e69aac5432ea 100644
--- a/dev-lang/perl/perl-5.8.8-r6.ebuild
+++ b/dev-lang/perl/perl-5.8.8-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.8-r6.ebuild,v 1.4 2009/05/08 05:46:34 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.8-r6.ebuild,v 1.5 2009/05/29 13:26:28 tove Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -158,6 +158,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-CVE-2008-1927.patch
 
 	epatch "${FILESDIR}"/${P}-CAN-2005-0448-rmtree-2.patch
+	epatch "${FILESDIR}"/${P}-fix_file_path_chdir.patch
 }
 
 myconf() {
diff --git a/dev-lang/perl/perl-5.8.8-r7.ebuild b/dev-lang/perl/perl-5.8.8-r7.ebuild
index cc6d9ca2cadc..d34f67b02289 100644
--- a/dev-lang/perl/perl-5.8.8-r7.ebuild
+++ b/dev-lang/perl/perl-5.8.8-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.8-r7.ebuild,v 1.1 2009/05/27 08:34:48 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.8-r7.ebuild,v 1.2 2009/05/29 13:26:28 tove Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -161,6 +161,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-CVE-2008-1927.patch
 
 	epatch "${FILESDIR}"/${P}-CAN-2005-0448-rmtree-2.patch
+	epatch "${FILESDIR}"/${P}-fix_file_path_chdir.patch
 }
 
 myconf() {