Add a patch to fix process substitution on BSD.

Package-Manager: portage-2.1.2_rc1-r2

5 files changed, 187 insertions, 15 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index 09eb50961427..f2bb5a7db918 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-shells/bash
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.122 2006/10/31 20:21:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.123 2006/11/02 16:37:17 uberlord Exp $
+
+*bash-3.2_p3-r1 (02 Nov 2006)
+
+  02 Nov 2006; Roy Marples <uberlord@gentoo.org>
+  +files/bash-3.2-process-subst.patch, +bash-3.2_p3-r1.ebuild:
+  Add a patch to fix process substitution on BSD.
 
 *bash-3.2_p3 (31 Oct 2006)
 
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 159b3dcf0c65..28adc00dddd2 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX bash-2.05b-empty-herestring.patch 836 RMD160 bdeef415bb8ef5294bfdb47a00beb3523f5e33c5 SHA1 fc34260611e395caee16930e66ec13e7aae63796 SHA256 a05098a9bb85520efc5c6d108fdcf635e4a9b20369d42d9aa0803c6b1d145cae
 MD5 edf95b873162f4548435c379e4998b4e files/bash-2.05b-empty-herestring.patch 836
 RMD160 bdeef415bb8ef5294bfdb47a00beb3523f5e33c5 files/bash-2.05b-empty-herestring.patch 836
@@ -181,6 +178,10 @@ AUX bash-3.2-dev-fd-test-as-user.patch 442 RMD160 c17fcd3def83b7271b5cbcc8ae2c3e
 MD5 07dd14671aa29bef9f56904d77adb199 files/bash-3.2-dev-fd-test-as-user.patch 442
 RMD160 c17fcd3def83b7271b5cbcc8ae2c3ecad3de6075 files/bash-3.2-dev-fd-test-as-user.patch 442
 SHA256 c223cb0de8dd9fcd7fab2c88ad92f22de253c2f5cb132f9b159f25b7085b568f files/bash-3.2-dev-fd-test-as-user.patch 442
+AUX bash-3.2-process-subst.patch 291 RMD160 0d295ebd160fd80d5c07758f992bb0de8c45b6a0 SHA1 1d374cf3f5dac6de77d32db927658ff8943e32fc SHA256 4c04ea6b60f57d6bc6daf85c35d13e24dec5ebac8e1aaf68c0eeaa180e6d2d98
+MD5 6a6536e68777ced16c9e66c086842cc0 files/bash-3.2-process-subst.patch 291
+RMD160 0d295ebd160fd80d5c07758f992bb0de8c45b6a0 files/bash-3.2-process-subst.patch 291
+SHA256 4c04ea6b60f57d6bc6daf85c35d13e24dec5ebac8e1aaf68c0eeaa180e6d2d98 files/bash-3.2-process-subst.patch 291
 AUX bash-3.2-ulimit.patch 449 RMD160 db5277031105cd4d2b7a6b92a8e74e532eb6f3db SHA1 cc634a2c188ac7661b9f4843f1b98f59d8f311a6 SHA256 d40709360f25ab355dc83e334b512d3dd80e435e241d1e69581fbc41504f8381
 MD5 d192d33c34972e9120bc3f40e555b11c files/bash-3.2-ulimit.patch 449
 RMD160 db5277031105cd4d2b7a6b92a8e74e532eb6f3db files/bash-3.2-ulimit.patch 449
@@ -278,14 +279,18 @@ EBUILD bash-3.1_p17.ebuild 4610 RMD160 5c71218ace9af0a8a0fb0bb8310d0dda3a90c64b
 MD5 c9b138b86d97c90211249adbec0eef36 bash-3.1_p17.ebuild 4610
 RMD160 5c71218ace9af0a8a0fb0bb8310d0dda3a90c64b bash-3.1_p17.ebuild 4610
 SHA256 02a4e2c4eabff6e2000dcbe9bdaf3e07b4ae1bbe7e8b58acb54a65a49580f106 bash-3.1_p17.ebuild 4610
+EBUILD bash-3.2_p3-r1.ebuild 4342 RMD160 1ca43fe98ba4163fcb1af900da92724be31d68d8 SHA1 44fc15738b4d1ea845b0476176c6cdc1ed23b2a3 SHA256 2a244a13ffc4ee38c91b57c964d415cb2b0b25f76076f0f48a3401992b02158f
+MD5 1653eade81c26c01b226c31cf94bb629 bash-3.2_p3-r1.ebuild 4342
+RMD160 1ca43fe98ba4163fcb1af900da92724be31d68d8 bash-3.2_p3-r1.ebuild 4342
+SHA256 2a244a13ffc4ee38c91b57c964d415cb2b0b25f76076f0f48a3401992b02158f bash-3.2_p3-r1.ebuild 4342
 EBUILD bash-3.2_p3.ebuild 4248 RMD160 3707de16293cac08df10223fa9aec9d75c1cd954 SHA1 f3f0001d06d359b9a7e5ec08d0d623b1e604700b SHA256 799a7ac9872cc7d5f698a0d23b5b28b7e0c32f9609eda37b0b05e85ec09eee7f
 MD5 cfda041aac324995058c30585ec65b05 bash-3.2_p3.ebuild 4248
 RMD160 3707de16293cac08df10223fa9aec9d75c1cd954 bash-3.2_p3.ebuild 4248
 SHA256 799a7ac9872cc7d5f698a0d23b5b28b7e0c32f9609eda37b0b05e85ec09eee7f bash-3.2_p3.ebuild 4248
-MISC ChangeLog 21942 RMD160 736acad7676f0da8ddec4700f410370e79359252 SHA1 794a9ab960abd6224576854249cbb55ec9ed2171 SHA256 acb50c21f243e8995b525a96b952a64ebd84a3b2323ed733890a820e6919169b
-MD5 cfda5612947d1b931d675da1540044fe ChangeLog 21942
-RMD160 736acad7676f0da8ddec4700f410370e79359252 ChangeLog 21942
-SHA256 acb50c21f243e8995b525a96b952a64ebd84a3b2323ed733890a820e6919169b ChangeLog 21942
+MISC ChangeLog 22138 RMD160 f8c936b992dd38ee2130b37b2506d9939483d0c2 SHA1 270626cf56817798b41263454a0f5466bb89208a SHA256 1ad60a2b0c2444c76f33a4beb3a05e44d1565bf2846176206027411c74000f0c
+MD5 86d7ccc304085a7bdc68c377ffc60342 ChangeLog 22138
+RMD160 f8c936b992dd38ee2130b37b2506d9939483d0c2 ChangeLog 22138
+SHA256 1ad60a2b0c2444c76f33a4beb3a05e44d1565bf2846176206027411c74000f0c ChangeLog 22138
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -311,10 +316,6 @@ SHA256 04f2452aacb4b2e69a683d9ee5b2a9a04f3c9d0ef9b5bb0f28ec88b48db25bf6 files/di
 MD5 909936773e67d56ae38fa84149f0fbae files/digest-bash-3.2_p3 844
 RMD160 396b589727085fd24005c38218db7b5efde0e441 files/digest-bash-3.2_p3 844
 SHA256 7b93927d14beca57fecb969ee45e6fa0d53b6e3b1f86b5f4be32372df8142df4 files/digest-bash-3.2_p3 844
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFR7A4amhnQswr0vIRAuGYAKCGQIcnQub5U7+50OlKPqRDPlq3XwCfT94f
-VBYu3ZGBNOe9yY5LDiehO+c=
-=5fYs
------END PGP SIGNATURE-----
+MD5 909936773e67d56ae38fa84149f0fbae files/digest-bash-3.2_p3-r1 844
+RMD160 396b589727085fd24005c38218db7b5efde0e441 files/digest-bash-3.2_p3-r1 844
+SHA256 7b93927d14beca57fecb969ee45e6fa0d53b6e3b1f86b5f4be32372df8142df4 files/digest-bash-3.2_p3-r1 844
diff --git a/app-shells/bash/bash-3.2_p3-r1.ebuild b/app-shells/bash/bash-3.2_p3-r1.ebuild
new file mode 100644
index 000000000000..ac9a3f8d8cd8
--- /dev/null
+++ b/app-shells/bash/bash-3.2_p3-r1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.2_p3-r1.ebuild,v 1.1 2006/11/02 16:37:17 uberlord Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+# Official patchlevel
+# See ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/
+PLEVEL=${PV##*_p}
+MY_PV=${PV/_p*}
+MY_P=${PN}-${MY_PV}
+READLINE_VER=5.2
+READLINE_PLEVEL=0
+
+DESCRIPTION="The standard GNU Bourne again shell"
+HOMEPAGE="http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html"
+# Hit the GNU mirrors before hitting Chet's site
+#		printf 'mirror://gnu/bash/bash-%s-patches/bash%s-%03d\n' \
+#			${MY_PV} ${MY_PV/\.} ${i}
+SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz
+	ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz
+	$(for ((i=1; i<=PLEVEL; i++)); do
+		printf 'ftp://ftp.cwru.edu/pub/bash/bash-%s-patches/bash%s-%03d\n' \
+			${MY_PV} ${MY_PV/\.} ${i}
+	done)
+	$(for ((i=1; i<=READLINE_PLEVEL; i++)); do
+		printf 'ftp://ftp.cwru.edu/pub/bash/readline-%s-patches/readline%s-%03d\n' \
+			${READLINE_VER} ${READLINE_VER/\.} ${i}
+		printf 'mirror://gnu/bash/readline-%s-patches/readline%s-%03d\n' \
+			${READLINE_VER} ${READLINE_VER/\.} ${i}
+	done)"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="afs bashlogger nls vanilla"
+
+DEPEND=">=sys-libs/ncurses-5.2-r2"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-3.1-gentoo.patch
+
+	# Fix process substitution on BSD.
+	epatch "${FILESDIR}"/${PN}-3.2-process-subst.patch
+
+	# Include official patches
+	local i
+	for ((i=1; i<=PLEVEL; i++)); do
+		epatch "${DISTDIR}"/${PN}${MY_PV/\.}-$(printf '%03d' ${i})
+	done
+	cd lib/readline
+	for ((i=1; i<=READLINE_PLEVEL; i++)); do
+		epatch "${DISTDIR}"/readline${READLINE_VER/\.}-$(printf '%03d' ${i})
+	done
+	cd ../..
+
+	if ! use vanilla ; then
+		epatch "${FILESDIR}"/${PN}-3.2-ulimit.patch
+		# Don't barf on handled signals in scripts
+		epatch "${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch
+		epatch "${FILESDIR}"/${PN}-3.2-dev-fd-test-as-user.patch #131875
+		# Log bash commands to syslog #91327
+		if use bashlogger ; then
+			echo
+			ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
+			ewarn "This will log ALL output you enter into the shell, you have been warned."
+			ebeep
+			epause
+			epatch "${FILESDIR}"/${PN}-3.1-bash-logger.patch
+		fi
+	fi
+
+	epatch "${FILESDIR}"/${PN}-3.0-configs.patch
+}
+
+src_compile() {
+	filter-flags -malign-double
+
+	local myconf=
+
+	# Always use the buildin readline, else if we update readline
+	# bash gets borked as readline is usually not binary compadible
+	# between minor versions.
+	#myconf="${myconf} $(use_with !readline installed-readline)"
+	myconf="${myconf} --without-installed-readline"
+
+	# Don't even think about building this statically without
+	# reading Bug 7714 first.  If you still build it statically,
+	# don't come crying to use with bugs ;).
+	#use static && export LDFLAGS="${LDFLAGS} -static"
+	use nls || myconf="${myconf} --disable-nls"
+
+	# Force linking with system curses ... the bundled termcap lib
+	# sucks bad compared to ncurses
+	myconf="${myconf} --with-curses"
+
+	econf \
+		$(use_with afs) \
+		--disable-profiling \
+		--without-gnu-malloc \
+		${myconf} || die
+	emake -j1 || die "make failed"	# see bug 102426
+}
+
+src_install() {
+	einstall || die
+
+	dodir /bin
+	mv "${D}"/usr/bin/bash "${D}"/bin/
+	[[ ${USERLAND} != "BSD" ]] && dosym bash /bin/sh
+	dosym bash /bin/rbash
+
+	insinto /etc/bash
+	doins "${FILESDIR}"/{bashrc,bash_logout}
+	insinto /etc/skel
+	for f in bash{_logout,_profile,rc} ; do
+		newins "${FILESDIR}"/dot-${f} .${f}
+	done
+
+	sed -i -e "s:#${USERLAND}#@::" "${D}"/etc/skel/.bashrc "${D}"/etc/bash/bashrc
+	sed -i -e '/#@/d' "${D}"/etc/skel/.bashrc "${D}"/etc/bash/bashrc
+
+	doman doc/*.1
+	dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO
+	dosym bash.info.gz /usr/share/info/bashref.info.gz
+}
+
+pkg_preinst() {
+	if [[ -e ${ROOT}/etc/bashrc ]] && [[ ! -d ${ROOT}/etc/bash ]] ; then
+		mkdir -p "${ROOT}"/etc/bash
+		mv -f "${ROOT}"/etc/bashrc "${ROOT}"/etc/bash/
+	fi
+
+	# our bash_logout is just a place holder so dont
+	# force users to go through etc-update all the time
+	if [[ -e ${ROOT}/etc/bash/bash_logout ]] ; then
+		rm -f "${D}"/etc/bash/bash_logout
+	fi
+}
diff --git a/app-shells/bash/files/bash-3.2-process-subst.patch b/app-shells/bash/files/bash-3.2-process-subst.patch
new file mode 100644
index 000000000000..cdc50fb29e06
--- /dev/null
+++ b/app-shells/bash/files/bash-3.2-process-subst.patch
@@ -0,0 +1,10 @@
+--- execute_cmd.c	2006-11-01 18:32:36 +0000
++++ execute_cmd.c	2006-11-01 18:32:42 +0000
+@@ -2672,6 +2672,7 @@
+ 
+ 	  do_piping (pipe_in, pipe_out);
+ 
++	  subshell_environment = 0;
+ 	  if (async)
+ 	    subshell_environment |= SUBSHELL_ASYNC;
+ 	  if (pipe_in != NO_PIPE || pipe_out != NO_PIPE)
diff --git a/app-shells/bash/files/digest-bash-3.2_p3-r1 b/app-shells/bash/files/digest-bash-3.2_p3-r1
new file mode 100644
index 000000000000..e81ab95a3188
--- /dev/null
+++ b/app-shells/bash/files/digest-bash-3.2_p3-r1
@@ -0,0 +1,12 @@
+MD5 00bfa16d58e034e3c2aa27f390390d30 bash-3.2.tar.gz 2529838
+RMD160 a73f790817d98be375a36def567737498e33aaf1 bash-3.2.tar.gz 2529838
+SHA256 26c99025b59e30779300b68adb764f824974d267a4d7cc1b347d14a2393f9fb4 bash-3.2.tar.gz 2529838
+MD5 d8e10c754f477e3f3a581af566b89301 bash32-001 1539
+RMD160 633f6eb6b2b48345234c442b835abb94d10e0dad bash32-001 1539
+SHA256 beda60ce6186fafa36cd0a98db9ced42cff68daee4342cca73167fb0f2f43eaa bash32-001 1539
+MD5 d38a5288b2f0ea6c9ac76b66cc74ef7d bash32-002 1524
+RMD160 5d0f0dab859197784b15c683d54e7a505a8434c3 bash32-002 1524
+SHA256 a0ca49a3c47678ad074c990bdc871fcec680749b7f04f2def6527f04c589c40a bash32-002 1524
+MD5 0b90d37911827d8cb95f3b4353cc225e bash32-003 4599
+RMD160 efdcb4f8d6c800b5a3dab7bae37f95861bf186d8 bash32-003 4599
+SHA256 7ec9e5e7e402e43b12bfd3a9237f4f171029fc7f58e59335abf3ccb455a5a84d bash32-003 4599