bug 42665

4 files changed, 35 insertions, 18 deletions

diff --git a/sys-devel/libperl/ChangeLog b/sys-devel/libperl/ChangeLog
index 77ea844d9dfa..beafdc7dda08 100644
--- a/sys-devel/libperl/ChangeLog
+++ b/sys-devel/libperl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/libperl
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/ChangeLog,v 1.29 2004/06/02 05:02:51 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/ChangeLog,v 1.30 2004/06/09 20:16:04 rac Exp $
+
+  09 Jun 2004; Robert Coie <rac@gentoo.org> +files/libperl-5.8.4-noksh.patch,
+  libperl-5.8.4.ebuild:
+  Add noksh.patch, bug 42665
 
   02 Jun 2004; Travis Tilley <lv@gentoo.org> libperl-5.8.4.ebuild:
   stable on amd64
diff --git a/sys-devel/libperl/Manifest b/sys-devel/libperl/Manifest
index 09af240af5a5..50c25628a199 100644
--- a/sys-devel/libperl/Manifest
+++ b/sys-devel/libperl/Manifest
@@ -1,21 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 1469ca3fca2ba05da23efdbb7101273f ChangeLog 3990
-MD5 6fdd466a33637a39199ec8cd0a4e2302 libperl-5.8.4.ebuild 10821
 MD5 c70aa9525be96a22398fbc7a1425cfb3 libperl-5.8.3.ebuild 10868
 MD5 f26389d2c42ee51afc479cfd659c5582 libperl-5.8.2.ebuild 10848
+MD5 29ab2af9471bcde9a214630ae47b7132 ChangeLog 4122
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-MD5 93155b02a7e9d3cdc6d6934ce78d9f11 files/digest-libperl-5.8.4 64
-MD5 35eb3b7645102bbcc4088d900dc28984 files/digest-libperl-5.8.3 64
+MD5 80aee96555074f8cf09c3ae4bf826414 libperl-5.8.4.ebuild 11068
+MD5 0bdca74363c218d91a0db4ad1ea55485 files/libperl-5.8.3-create-libperl-soname.patch 417
+MD5 0bdca74363c218d91a0db4ad1ea55485 files/libperl-5.8.2-create-libperl-soname.patch 417
 MD5 8381e239056a7895edf8f3c6c05c835c files/digest-libperl-5.8.2 64
+MD5 35eb3b7645102bbcc4088d900dc28984 files/digest-libperl-5.8.3 64
+MD5 93155b02a7e9d3cdc6d6934ce78d9f11 files/digest-libperl-5.8.4 64
 MD5 0bdca74363c218d91a0db4ad1ea55485 files/libperl-5.8.4-create-libperl-soname.patch 417
-MD5 0bdca74363c218d91a0db4ad1ea55485 files/libperl-5.8.2-create-libperl-soname.patch 417
-MD5 0bdca74363c218d91a0db4ad1ea55485 files/libperl-5.8.3-create-libperl-soname.patch 417
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.8 (GNU/Linux)
-
-iD8DBQFAxJzQHTu7gpaalycRAi1wAJ93oWgHKtfDfET+G0Z9ZzF6B6nJSACg4Kv+
-IOtIV10xJ7bg/4tWE+0KNTU=
-=i4Ba
------END PGP SIGNATURE-----
+MD5 076dcbef37263d6dd7af719b55cfc2de files/libperl-5.8.4-noksh.patch 611
diff --git a/sys-devel/libperl/files/libperl-5.8.4-noksh.patch b/sys-devel/libperl/files/libperl-5.8.4-noksh.patch
new file mode 100644
index 000000000000..4c33b3e71b33
--- /dev/null
+++ b/sys-devel/libperl/files/libperl-5.8.4-noksh.patch
@@ -0,0 +1,16 @@
+diff -burN perl-5.8.4.orig/Configure perl-5.8.4/Configure
+--- perl-5.8.4.orig/Configure	2004-04-01 05:48:18.000000000 -0800
++++ perl-5.8.4/Configure	2004-06-09 12:02:54.694172368 -0700
+@@ -164,6 +164,12 @@
+ 	;;
+ esac
+ 
++# 2004.06.09 rac
++# having $newsh persist as ksh here is bad news if ksh doesn't really
++# exist. this causes us to toss away a perfectly good working test in
++# bash in favour of more exotic external options. see bug 42665.
++test -x "${newsh}" || unset newsh
++
+ : if needed set CDPATH to a harmless value that is not chatty
+ : avoid bash 2.02 problems with empty CDPATH.
+ case "$CDPATH" in
diff --git a/sys-devel/libperl/libperl-5.8.4.ebuild b/sys-devel/libperl/libperl-5.8.4.ebuild
index c583aa77af53..300b78ab07a6 100644
--- a/sys-devel/libperl/libperl-5.8.4.ebuild
+++ b/sys-devel/libperl/libperl-5.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.4.ebuild,v 1.6 2004/06/07 16:50:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.4.ebuild,v 1.7 2004/06/09 20:16:04 rac Exp $
 
 # The basic theory based on comments from Daniel Robbins <drobbins@gentoo.org>.
 #
@@ -135,6 +135,12 @@ src_unpack() {
 	#   LIBPERL=libperl.so.${SLOT}.`echo ${PV} | cut -d. -f1,2`
 	#
 	cd ${S}; epatch ${FILESDIR}/${P}-create-libperl-soname.patch
+
+	# Configure makes an unwarranted assumption that /bin/ksh is a
+	# good shell. This patch makes it revert to using /bin/sh unless
+	# /bin/ksh really is executable. Should fix bug 42665.
+	# rac 2004.06.09
+	cd ${S}; epatch ${FILESDIR}/${P}-noksh.patch
 }
 
 src_compile() {