Fix from upstream for pipe code when PGRP_PIPE is enabled #92349 by Harald van Dijk.

Package-Manager: portage-2.0.51.22-r1

5 files changed, 249 insertions, 29 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index aae49de41029..201cb0a6f4c7 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-shells/bash
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.68 2005/06/27 21:54:54 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.69 2005/07/05 22:52:33 vapier Exp $
+
+*bash-3.0-r12 (05 Jul 2005)
+
+  05 Jul 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/bash-3.0-pgrp-pipe-fix.patch, +bash-3.0-r12.ebuild:
+  Fix from upstream for pipe code when PGRP_PIPE is enabled #92349 by Harald
+  van Dijk.
 
   27 Jun 2005; Aron Griffis <agriffis@gentoo.org>
   +files/bash-3.0-parallel.patch, bash-3.0-r11.ebuild:
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 763e07952144..06328c4af10f 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -1,38 +1,51 @@
-MD5 a4df32e089db48d7c99fd6be36368475 bash-2.05b-r9.ebuild 3516
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 3da49e27281cbe16582393239ba5b29b bash-2.05b-r11.ebuild 3715
+MD5 a4df32e089db48d7c99fd6be36368475 bash-2.05b-r9.ebuild 3516
 MD5 27a795f52631ec69ef83b28d72e449dc bash-3.0-r11.ebuild 5143
-MD5 ca7ee8a43aeb061e45ceb0b826622a20 ChangeLog 14136
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 13a88fae79fed8f76999ec8fdca2f085 files/digest-bash-3.0-r11 976
-MD5 edac0c7e2accd7f60d64d6361913db6e files/bash-3.0-darwin-conn.patch 983
+MD5 1aed6587af3996315d2f7e9ef70ab4fb ChangeLog 14364
+MD5 9c99b39b7024137cc6dbe94a0f2fdbea bash-3.0-r12.ebuild 5172
+MD5 3b706b4e822e0480f1ba098db4b292f6 files/bash-3.0-parallel.patch 378
+MD5 96238e7d942d091ca71574ba7392e847 files/bash-3.0-array-stripping.patch 294
+MD5 edf95b873162f4548435c379e4998b4e files/bash-2.05b-empty-herestring.patch 836
+MD5 3b905c7c9341c9009bd68f14c047815e files/bash-2.05b-rbash.patch 804
 MD5 3d73159ab671b57a3f488c044e1a1f47 files/bash-2.05b-setlocale.patch 694
-MD5 b86b65863c2ae21b59d8201c2a3a9e91 files/bash-3.0-trap-fg-signals.patch 641
-MD5 da9995bff4b3377fe028f3ef95427cd1 files/dot-bash_profile 308
-MD5 4a3ebcb995491c2730d156b314cbab0b files/bash-3.0-etc-inputrc.patch 1223
+MD5 b518c92ffb4ee61be7e4b1d27264a652 files/bash-3.0-pgrp-pipe-fix.patch 462
+MD5 05f32594822720a84f58197c1535fc82 files/bash-3.0-jobs.patch 1064
 MD5 4af330b479f27337b6e77fff11d6c468 files/bash_logout 132
-MD5 00cd6ee276de4810e2209dc426b133e4 files/bash-3.0-ulimit.patch 2659
-MD5 3b905c7c9341c9009bd68f14c047815e files/bash-2.05b-rbash.patch 804
-MD5 6bc03ea9b1de46a4789e8223f2224658 files/bash-3.0-read-builtin-pipe.patch 689
-MD5 b3345c5274b7b08ce50dc5ec0aa11197 files/bash-3.0-read-e-segfault.patch 825
-MD5 46c2816ee5909e997477063cdc050620 files/bash-3.0-manpage.patch 533
-MD5 694b8b1e47e4743e78ee5f7515f76542 files/bash-3.0-posixtrap.patch 789
-MD5 3a15c63dcc58cecd09b00ae08524322c files/bashrc 1627
 MD5 c8362f29e2f8e6cdfd3306c7bcce0439 files/bash-3.0-pwd.patch 583
-MD5 4383b25cd54b24b9f459e338f06d096c files/bash-2.05b-parallel-build.patch 459
 MD5 ccc195288edb06eb44f4d5e2a9c1da62 files/bash-3.0-crash.patch 1191
-MD5 582fb9ed0ca44627978ce6836a5000dc files/config-top.h.diff 487
-MD5 96238e7d942d091ca71574ba7392e847 files/bash-3.0-array-stripping.patch 294
-MD5 3b706b4e822e0480f1ba098db4b292f6 files/bash-3.0-parallel.patch 378
+MD5 6bc03ea9b1de46a4789e8223f2224658 files/bash-3.0-read-builtin-pipe.patch 689
 MD5 0392b634a7a02302d24ccc4a4b349423 files/bash-3.0-local-array.patch 275
+MD5 edac0c7e2accd7f60d64d6361913db6e files/bash-3.0-darwin-conn.patch 983
+MD5 3a15c63dcc58cecd09b00ae08524322c files/bashrc 1627
+MD5 ca64aff9caa582e07e0b34ed87d60d80 files/bash-2.05b-jobs.patch 876
+MD5 0387efe97e963a932d870b8f61c5b864 files/dot-bash_logout 240
+MD5 b3df3a162a43845cf9f107de9ea6ac27 files/dot-bashrc 1306
+MD5 582fb9ed0ca44627978ce6836a5000dc files/config-top.h.diff 487
+MD5 da9995bff4b3377fe028f3ef95427cd1 files/dot-bash_profile 308
+MD5 b86b65863c2ae21b59d8201c2a3a9e91 files/bash-3.0-trap-fg-signals.patch 641
 MD5 b802ce25d76787d8c9b4484ca66b17be files/bash-3.0-bash-logger.patch 2197
-MD5 28c9d7407d5332c29dddb656a4a1f1ce files/bash-3.0-invisible.patch 705
-MD5 eea55a33e84dc42b1683592dc8113400 files/bash-3.0-afs.patch 428
-MD5 1894aaae72806c410d851d046d13dd32 files/digest-bash-2.05b-r11 461
-MD5 1894aaae72806c410d851d046d13dd32 files/digest-bash-2.05b-r9 461
+MD5 4a3ebcb995491c2730d156b314cbab0b files/bash-3.0-etc-inputrc.patch 1223
+MD5 694b8b1e47e4743e78ee5f7515f76542 files/bash-3.0-posixtrap.patch 789
 MD5 a2845a2a194bba75c1875f4a1ad49344 files/bash30-014 698
-MD5 edf95b873162f4548435c379e4998b4e files/bash-2.05b-empty-herestring.patch 836
-MD5 ca64aff9caa582e07e0b34ed87d60d80 files/bash-2.05b-jobs.patch 876
+MD5 1894aaae72806c410d851d046d13dd32 files/digest-bash-2.05b-r11 461
+MD5 b3345c5274b7b08ce50dc5ec0aa11197 files/bash-3.0-read-e-segfault.patch 825
+MD5 46c2816ee5909e997477063cdc050620 files/bash-3.0-manpage.patch 533
+MD5 00cd6ee276de4810e2209dc426b133e4 files/bash-3.0-ulimit.patch 2659
+MD5 13a88fae79fed8f76999ec8fdca2f085 files/digest-bash-3.0-r12 976
+MD5 28c9d7407d5332c29dddb656a4a1f1ce files/bash-3.0-invisible.patch 705
 MD5 90ba92c981c1d26e45d88ecd23a1fbf5 files/bash-2.05b-multibyte-locale.patch 1897
-MD5 b3df3a162a43845cf9f107de9ea6ac27 files/dot-bashrc 1306
-MD5 0387efe97e963a932d870b8f61c5b864 files/dot-bash_logout 240
-MD5 05f32594822720a84f58197c1535fc82 files/bash-3.0-jobs.patch 1064
+MD5 1894aaae72806c410d851d046d13dd32 files/digest-bash-2.05b-r9 461
+MD5 4383b25cd54b24b9f459e338f06d096c files/bash-2.05b-parallel-build.patch 459
+MD5 eea55a33e84dc42b1683592dc8113400 files/bash-3.0-afs.patch 428
+MD5 13a88fae79fed8f76999ec8fdca2f085 files/digest-bash-3.0-r11 976
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCyw9kgIKl8Uu19MoRAip3AJ9j1L9LmGC7PrfnOboq803OJHzIpACfau75
+HIVgtLyd0IfuaywDTThZIiA=
+=/C3p
+-----END PGP SIGNATURE-----
diff --git a/app-shells/bash/bash-3.0-r12.ebuild b/app-shells/bash/bash-3.0-r12.ebuild
new file mode 100644
index 000000000000..03848ef90eaf
--- /dev/null
+++ b/app-shells/bash/bash-3.0-r12.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.0-r12.ebuild,v 1.1 2005/07/05 22:52:33 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+# Official patchlevel
+# See ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/
+PLEVEL=16
+
+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
+SRC_URI="mirror://gnu/bash/${P}.tar.gz
+	ftp://ftp.cwru.edu/pub/bash/${P}.tar.gz
+	mirror://gentoo/${P}-gentoo.diff.bz2
+	$(for ((i=1; i<=PLEVEL; i++)); do
+		printf 'ftp://ftp.cwru.edu/pub/bash/bash-%s-patches/bash%s-%03d\n' \
+			${PV} ${PV/\.} ${i}
+		printf 'mirror://gnu/bash/bash-%s-patches/bash%s-%03d\n' \
+			${PV} ${PV/\.} ${i}
+	done)"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
+IUSE="nls build bashlogger"
+
+# we link statically with ncurses
+DEPEND=">=sys-libs/ncurses-5.2-r2"
+RDEPEND=""
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}"
+	epatch "${DISTDIR}"/${P}-gentoo.diff.bz2
+
+	# Remove autoconf dependency
+	sed -i -e "/&& autoconf/d" Makefile.in
+
+	# Include official patches
+	local i
+	for ((i=1; i<=PLEVEL; i++)); do
+		epatch "${DISTDIR}"/${PN}${PV/\.}-$(printf '%03d' ${i})
+	done
+
+	# Patch readline's bind.c so that /etc/inputrc is read as a last resort
+	# following ~/.inputrc.  This is better than putting INPUTRC in
+	# the environment because INPUTRC will override even after the
+	# user creates a ~/.inputrc
+	epatch "${FILESDIR}"/${P}-etc-inputrc.patch
+	# Fix network tests on Darwin #79124
+	epatch "${FILESDIR}"/${P}-darwin-conn.patch
+	# A bunch of fixes from fedora
+	epatch "${FILESDIR}"/${P}-{afs,crash,jobs,manpage,pwd,read-e-segfault,ulimit}.patch
+	# Fix read-builtin and the -u pipe option #87093
+	epatch "${FILESDIR}"/${P}-read-builtin-pipe.patch
+	# Don't barf on handled signals in scripts
+	epatch "${FILESDIR}"/${P}-trap-fg-signals.patch
+	# Fix a problem when using pipes and PGRP_PIPE #92349
+	epatch "${FILESDIR}"/${P}-pgrp-pipe-fix.patch
+	# 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}"/${P}-bash-logger.patch
+	fi
+
+	# Enable SSH_SOURCE_BASHRC (#24762)
+	echo '#define SSH_SOURCE_BASHRC' >> config-top.h
+	# Enable system-wide bashrc (#26952)
+	echo '#define SYS_BASHRC "/etc/bash/bashrc"' >> config-top.h
+	# Enable system-wide logout (#90488)
+	echo '#define SYS_BASH_LOGOUT "/etc/bash/bash_logout"' >> config-top.h
+
+	# Force pgrp synchronization
+	# (https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=81653)
+	#
+	# The session will hang cases where you 'su' (not 'su -') and
+	# then run a piped command in emacs.
+	# This problem seem to happen due to scheduler changes kernel
+	# side - although reproduceble with later 2.4 kernels, it is
+	# especially easy with 2.6 kernels.
+	echo '#define PGRP_PIPE 1' >> config-bot.h
+
+	sed -i 's:-lcurses:-lncurses:' configure || die "sed configure"
+}
+
+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.
+	#
+	# Martin Schlemmer <azarah@gentoo.org> (1 Sep 2002)
+	#use readline && myconf="--with-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"
+
+	echo 'int main(){}' > "${T}"/term-test.c
+	if ! $(tc-getCC) -static -lncurses "${T}"/term-test.c 2> /dev/null ; then
+		export bash_cv_termcap_lib=gnutermcap
+	else
+		export bash_cv_termcap_lib=libcurses
+		myconf="${myconf} --with-ncurses"
+	fi
+
+	econf \
+		--disable-profiling \
+		--without-gnu-malloc \
+		${myconf} || die
+	# Make sure we always link statically with ncurses
+	sed -i "/^TERMCAP_LIB/s:-lncurses:-Wl,-Bstatic -lncurses -Wl,-Bdynamic:" Makefile || die "sed failed"
+	emake || die "make failed"
+}
+
+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
+
+	if use build ; then
+		rm -rf "${D}"/usr
+	else
+		doman doc/*.1
+		dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO
+		dosym bash.info.gz /usr/share/info/bashref.info.gz
+	fi
+}
+
+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.0-pgrp-pipe-fix.patch b/app-shells/bash/files/bash-3.0-pgrp-pipe-fix.patch
new file mode 100644
index 000000000000..35b0b7d05924
--- /dev/null
+++ b/app-shells/bash/files/bash-3.0-pgrp-pipe-fix.patch
@@ -0,0 +1,20 @@
+Fix an error when using pipes and PGRP_PIPE is enabled.
+( exec 3>&1; : `echo >&3` )
+bash: 3: Bad file descriptor
+
+http://bugs.gentoo.org/92349
+
+Patch from upstream
+
+*** jobs.c  Wed Sep  8 11:08:16 2004
+--- jobs.c      Thu Jun 30 17:21:26 2005
+***************
+*** 3456,3459 ****
+--- 3901,3907 ----
+    stop_making_children ();
+    start_pipeline ();
++ #if defined (PGRP_PIPE)
++   pipe_close (pgrp_pipe);
++ #endif
+    delete_all_jobs (0);
+    set_job_control (0);
diff --git a/app-shells/bash/files/digest-bash-3.0-r12 b/app-shells/bash/files/digest-bash-3.0-r12
new file mode 100644
index 000000000000..3f6ecc696328
--- /dev/null
+++ b/app-shells/bash/files/digest-bash-3.0-r12
@@ -0,0 +1,18 @@
+MD5 26c4d642e29b3533d8d754995bc277b3 bash-3.0.tar.gz 2418293
+MD5 220cdd45dc060fd41c2bd7c46e8a9064 bash-3.0-gentoo.diff.bz2 2423
+MD5 24a83f78a44a6029024371f02da174dd bash30-001 4999
+MD5 6f4cf2aa975a1fcc0cb43a406bd47ca5 bash30-002 2119
+MD5 c8bf41e78cda16d391b9099eeba01386 bash30-003 4669
+MD5 c069dffbb3f442aac3660b883ddd97f5 bash30-004 3372
+MD5 ad06309c623ff8e1b9f039d3b7eb97c2 bash30-005 1776
+MD5 f162bf93a76759bab37b29509a4a6e20 bash30-006 4258
+MD5 89903d92ca620921aecb3f1f30c05ebe bash30-007 1808
+MD5 9a295c02f46bc867fc096862c7380a88 bash30-008 1220
+MD5 786c7e2af1dca5104af92bbdc60f7474 bash30-009 2828
+MD5 f2d90d06ed445a285c8406016e9d9c13 bash30-010 3193
+MD5 9506c56968c58332489986633319a186 bash30-011 2635
+MD5 2753d4de0b57fc8890488463c5e86d3f bash30-012 1395
+MD5 5de5be8289764c11a3206b06351d81a6 bash30-013 1963
+MD5 d4b531e02b6a0287cffdbf527134ca29 bash30-014 1165
+MD5 adc1ab952b42ed0c0f53d1c308a32101 bash30-015 1480
+MD5 a3bb09a185e4c6a813227f3e84e4f6e5 bash30-016 2453