Fix from upstream for #151120.

Package-Manager: portage-2.1.2_pre3-r4

4 files changed, 174 insertions, 12 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index 7bc783d6ed74..d87e09e02f22 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,11 @@
 # 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.120 2006/10/17 05:58:51 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.121 2006/10/18 16:49:42 vapier Exp $
+
+*bash-3.2_p1 (18 Oct 2006)
+
+  18 Oct 2006; Mike Frysinger <vapier@gentoo.org> +bash-3.2_p1.ebuild:
+  Fix from upstream for #151120.
 
   17 Oct 2006; Roy Marples <uberlord@gentoo.org> bash-3.1_p17.ebuild,
   bash-3.2.ebuild:
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 5af1ee843172..9223489b4ff5 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -1,3 +1,6 @@
+-----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
@@ -247,6 +250,7 @@ DIST bash31-014 2818 RMD160 d627b92e82e6c850b8f6abf2f6828b8120f1a695 SHA1 b95c67
 DIST bash31-015 3089 RMD160 1c2203711e26acf8f7e7bc51f05c2827b03f8eb9 SHA1 e22f2490d9403de0b28a295f4ac89554e55e901f SHA256 3070548adf1c6ce481000b6bb96db7511637d6aef52276fe2f83e2bcb078865c
 DIST bash31-016 1295 RMD160 b474ec209cc59f8e9d2616eed9327c96cf3cc606 SHA1 7f4629b94464f53e98786e4a2d38f2b02566bb05 SHA256 2438b71c7fadf2971141e6854d317804e143d86eefd6d7b4479d62afd385ebad
 DIST bash31-017 3640 RMD160 838038cd5f70234504bb6d29741c48e15ca20d59 SHA1 652a02f90011a167fec6e23a46bbdf9338bc9a7c SHA256 8fb3ac54b9536ad1ba829f229f1ab906ab2af005f2bfa733f2687245e1569407
+DIST bash32-001 1539 RMD160 633f6eb6b2b48345234c442b835abb94d10e0dad SHA1 cec2d4b62abf3361a22fb9a53242b8a27a38fe02 SHA256 beda60ce6186fafa36cd0a98db9ced42cff68daee4342cca73167fb0f2f43eaa
 DIST readline51-001 2042 RMD160 93dd36106f68682c4dc73a9b1ecf62bf7943fae4 SHA1 2d369ad65a8751d0a9721002c06e139afe35265b SHA256 2c9786b231a454504c3f38361af6fd74e61789bc1009eba5fb2447b5a3ac5774
 EBUILD bash-2.05b-r11.ebuild 3408 RMD160 67bd104beb601e5cbf46d13bcd61e0b28c7590dc SHA1 6967480341932c50ed79c1d04e30d11abf2f8793 SHA256 672433e5a5364a9ea5dd226936e95af752a972be152a885b7141757ed1cdf8a6
 MD5 1b20b4f87ce25d15dad8e6333d4fd716 bash-2.05b-r11.ebuild 3408
@@ -276,14 +280,14 @@ EBUILD bash-3.1_p17.ebuild 4613 RMD160 b4ef8e6d8dd77f5b04b0e78250f196675da5957c
 MD5 3a1c832e95b27e2e237656b3f649ac6a bash-3.1_p17.ebuild 4613
 RMD160 b4ef8e6d8dd77f5b04b0e78250f196675da5957c bash-3.1_p17.ebuild 4613
 SHA256 77f86fd7dd0850bb8927d4ff9de6e466e6cf29095a8ac99d1909a9ff1b61b159 bash-3.1_p17.ebuild 4613
-EBUILD bash-3.2.ebuild 4262 RMD160 b0092d47b6a282640ab0f676bf6f08e6bbfcc483 SHA1 217849356bb57bff8677831a909b5e36b3fa58b6 SHA256 dfae14d374ae5129736c0d8daedca03e63d078eb96b31ac0b045abe84f90a7e6
-MD5 ee57984ecd6a8b09f336dd8208686260 bash-3.2.ebuild 4262
-RMD160 b0092d47b6a282640ab0f676bf6f08e6bbfcc483 bash-3.2.ebuild 4262
-SHA256 dfae14d374ae5129736c0d8daedca03e63d078eb96b31ac0b045abe84f90a7e6 bash-3.2.ebuild 4262
-MISC ChangeLog 21695 RMD160 5491ab3039c6fbc992bd291e4fbacb7fa638f417 SHA1 60be44c2fe2c4b2bfe5114e8bb6dc0b46ea6ca3e SHA256 636f6f235ff6bf2e9f631cd3d99f6310aa7b9a6536659ff547072b5577e21c82
-MD5 7ceb7c4cb0afd17a9133183972562da7 ChangeLog 21695
-RMD160 5491ab3039c6fbc992bd291e4fbacb7fa638f417 ChangeLog 21695
-SHA256 636f6f235ff6bf2e9f631cd3d99f6310aa7b9a6536659ff547072b5577e21c82 ChangeLog 21695
+EBUILD bash-3.2_p1.ebuild 4248 RMD160 c937844787cd4f9da2c48755649246416f7e0803 SHA1 1ee148be84fc690e0026bc01dec0475bf7989bab SHA256 f1dab2d12a0a9fdb05aaabde497726a3cd1651c9d3729a4952702f7ed3c55230
+MD5 67ca94855a900ff2f93c53d483b26cf8 bash-3.2_p1.ebuild 4248
+RMD160 c937844787cd4f9da2c48755649246416f7e0803 bash-3.2_p1.ebuild 4248
+SHA256 f1dab2d12a0a9fdb05aaabde497726a3cd1651c9d3729a4952702f7ed3c55230 bash-3.2_p1.ebuild 4248
+MISC ChangeLog 21826 RMD160 8aef894ef94d5d0ddfb67c860d1eb9bad5d67735 SHA1 71aeaf04c58afb14657362fd329f4819205751e7 SHA256 502ea97254d42c8633cee84916ea457d4b7be581a3697bb0168edbaffe0373bf
+MD5 4e1bb7afe8a5e2bea5e4661eb16afa03 ChangeLog 21826
+RMD160 8aef894ef94d5d0ddfb67c860d1eb9bad5d67735 ChangeLog 21826
+SHA256 502ea97254d42c8633cee84916ea457d4b7be581a3697bb0168edbaffe0373bf ChangeLog 21826
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -309,6 +313,13 @@ SHA256 1a25ed9d1fa648442a32e3bc60706b427718809325cf030c5acc5ea51aecc443 files/di
 MD5 341b816c5acf74ac16bf443d156e9719 files/digest-bash-3.1_p17 3931
 RMD160 607c556f7fd1528c64beb33828d95a31e22077ab files/digest-bash-3.1_p17 3931
 SHA256 04f2452aacb4b2e69a683d9ee5b2a9a04f3c9d0ef9b5bb0f28ec88b48db25bf6 files/digest-bash-3.1_p17 3931
-MD5 b94c53c9a7c09646a87366a1894d04fb files/digest-bash-3.2 229
-RMD160 544a64d6a70ea419b7ebc96859df23e099b181f8 files/digest-bash-3.2 229
-SHA256 78e50eebee5a4cb365bda9ab6386797d017119f57e1dfcd01fe867b956880918 files/digest-bash-3.2 229
+MD5 625884429cab6ded2bca358acfaf3934 files/digest-bash-3.2_p1 434
+RMD160 20bd6fdcd4fd6932f7f7f5520679a8c06658249f files/digest-bash-3.2_p1 434
+SHA256 730154741ebbad3b5b9ce82a9b0f7dd203cb7ac3e46dc3449ad058021aa8e8a5 files/digest-bash-3.2_p1 434
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFNls9amhnQswr0vIRAo/eAJ9SkxvAztUgb2FNgo2BY0B4d0l3WQCeJsms
+fTF+Og8lJPITGCvQUxJx4TE=
+=r9rW
+-----END PGP SIGNATURE-----
diff --git a/app-shells/bash/bash-3.2_p1.ebuild b/app-shells/bash/bash-3.2_p1.ebuild
new file mode 100644
index 000000000000..97ed96e527ac
--- /dev/null
+++ b/app-shells/bash/bash-3.2_p1.ebuild
@@ -0,0 +1,140 @@
+# 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_p1.ebuild,v 1.1 2006/10/18 16:49:42 vapier 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
+
+	# 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/digest-bash-3.2_p1 b/app-shells/bash/files/digest-bash-3.2_p1
new file mode 100644
index 000000000000..85a17feed4a3
--- /dev/null
+++ b/app-shells/bash/files/digest-bash-3.2_p1
@@ -0,0 +1,6 @@
+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