Fix bug 58703: Revert trap behavior for the sake of autoconf-generated configure scripts. The problem here is that bash -c 'trap 0' works, but sh -c 'trap 0' doesn't work because the bash developers are trying to adhere to POSIX in that case. Since all the configure scripts are #!/bin/sh, this breaks them... That's bad news and will need some time to fix, so it's easier to fix here for the moment

6 files changed, 170 insertions, 39 deletions

diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index 575e4f867a1a..e69de29bb2d1 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -1,20 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 96eff0b7b063b5b82ca05578dd4a1f69 ChangeLog 9752
-MD5 1dc8e7503e7e350f3382d37b612178cc metadata.xml 1023
-MD5 115faf601395c07a603403509d2e6e25 bash-completion-20040526.ebuild 1918
-MD5 cc5ea05a3deb5a269cb42964b943b230 bash-completion-20040704.ebuild 2091
-MD5 e706e0b50ba0bef7c53da0b9653c9175 bash-completion-20040704-r1.ebuild 2095
-MD5 444d3fdaa90c16e6d6320fd6b52d3c9b files/bash-completion 714
-MD5 1c828ed53387932b8ed971aafa179875 files/digest-bash-completion-20040526 76
-MD5 4bbcbd54e5ec94b050417205572e13e9 files/gentoo.completion-20040526 16023
-MD5 49e9f0b0674471ff56169ce7d9265fb2 files/digest-bash-completion-20040704 151
-MD5 49e9f0b0674471ff56169ce7d9265fb2 files/digest-bash-completion-20040704-r1 151
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.8 (GNU/Linux)
-
-iD8DBQFBCDa4HTu7gpaalycRAgRhAKCWeBjhn7T68HeyxPJ3qw8lZqc2GQCgzhJr
-boZk3fW3x0JlCYxM8VnQa6Q=
-=Dd2C
------END PGP SIGNATURE-----
diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index 87d6aff94421..3f24c2bbed06 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-shells/bash
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.40 2004/07/29 01:47:45 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.41 2004/07/29 02:54:36 agriffis Exp $
+
+*bash-3.0-r1 (28 Jul 2004)
+
+  28 Jul 2004; Aron Griffis <agriffis@gentoo.org>
+  +files/bash-3.0-posixtrap.patch, +bash-3.0-r1.ebuild:
+  Fix bug 58703: Revert trap behavior for the sake of autoconf-generated
+  configure scripts. The problem here is that bash -c 'trap 0' works, but sh -c
+  'trap 0' doesn't work because the bash developers are trying to adhere to
+  POSIX in that case. Since all the configure scripts are #!/bin/sh, this breaks
+  them... That's bad news and will need some time to fix, so it's easier to fix
+  here for the moment
 
   29 Jul 2004; Ciaran McCreesh <ciaranm@gentoo.org> bash-3.0.ebuild:
   Remove ~sparc for now, see bug #58703
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 973cdd783b2f..664f4c27165c 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -1,24 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 bfc3aba25e0e2dca3e91bccadeb09a30 ChangeLog 8234
+MD5 21a66602996074b7fa4445b6c5afed90 bash-3.0-r1.ebuild 3479
 MD5 9b26b6899167a29ee4e9c1ad0d39b5a1 bash-2.05b-r9.ebuild 2909
 MD5 ffb7966e9e7658be35568b2d021a0442 bash-3.0.ebuild 3125
-MD5 6a2f5ace1a2dd30b1bee55eba1509027 bash-2.05b-r10.ebuild 3041
+MD5 ead99b447215f057c7b91153f0df4ee3 ChangeLog 8782
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 edf95b873162f4548435c379e4998b4e files/bash-2.05b-empty-herestring.patch 836
-MD5 92f8f2d44177d92edd757366dbd261dc files/bashrc 761
-MD5 30a9ff1b688e79f59376a47d882f3419 files/digest-bash-3.0 128
+MD5 6a2f5ace1a2dd30b1bee55eba1509027 bash-2.05b-r10.ebuild 3041
 MD5 3b905c7c9341c9009bd68f14c047815e files/bash-2.05b-rbash.patch 804
-MD5 90ba92c981c1d26e45d88ecd23a1fbf5 files/bash-2.05b-multibyte-locale.patch 1897
+MD5 30a9ff1b688e79f59376a47d882f3419 files/digest-bash-3.0 128
+MD5 694b8b1e47e4743e78ee5f7515f76542 files/bash-3.0-posixtrap.patch 789
+MD5 92f8f2d44177d92edd757366dbd261dc files/bashrc 761
+MD5 4383b25cd54b24b9f459e338f06d096c files/bash-2.05b-parallel-build.patch 459
+MD5 582fb9ed0ca44627978ce6836a5000dc files/config-top.h.diff 487
+MD5 30a9ff1b688e79f59376a47d882f3419 files/digest-bash-3.0-r1 128
 MD5 1894aaae72806c410d851d046d13dd32 files/digest-bash-2.05b-r10 461
 MD5 1894aaae72806c410d851d046d13dd32 files/digest-bash-2.05b-r9 461
-MD5 582fb9ed0ca44627978ce6836a5000dc files/config-top.h.diff 487
-MD5 4383b25cd54b24b9f459e338f06d096c files/bash-2.05b-parallel-build.patch 459
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFBCFa2LLFUmVNQ7rkRAv1XAKC04sQkm4rmMOmAuWzBSVWz0s16yACgtE8S
-ii6M7DgvAK0tMJFI0hIIvr4=
-=Cpdv
------END PGP SIGNATURE-----
+MD5 edf95b873162f4548435c379e4998b4e files/bash-2.05b-empty-herestring.patch 836
+MD5 90ba92c981c1d26e45d88ecd23a1fbf5 files/bash-2.05b-multibyte-locale.patch 1897
diff --git a/app-shells/bash/bash-3.0-r1.ebuild b/app-shells/bash/bash-3.0-r1.ebuild
new file mode 100644
index 000000000000..dbe48b752539
--- /dev/null
+++ b/app-shells/bash/bash-3.0-r1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.0-r1.ebuild,v 1.1 2004/07/29 02:54:36 agriffis Exp $
+
+inherit eutils flag-o-matic gnuconfig
+
+# Official patches
+PLEVEL=""
+
+DESCRIPTION="The standard GNU Bourne again shell"
+HOMEPAGE="http://www.gnu.org/software/bash/bash.html"
+SRC_URI="ftp://ftp.cwru.edu/pub/bash/${P}.tar.gz
+	mirror://gnu/bash/${P}.tar.gz
+	mirror://gentoo/${P}-gentoo.diff.bz2
+	${PLEVEL//x/mirror://gnu/bash/bash-${PV}-patches/bash${PV/\.}-}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
+IUSE="nls build uclibc"
+
+DEPEND=">=sys-libs/ncurses-5.2-r2"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+
+	cd ${S}
+	epatch ${DISTDIR}/${P}-gentoo.diff.bz2
+
+	# Remove autoconf dependency
+	sed -i -e "/&& autoconf/d" Makefile.in
+
+	# Readline is slow with multibyte locale, bug #19762
+	# (No longer applies to bash-3.0)
+	#epatch ${FILESDIR}/${P}-multibyte-locale.patch
+
+	# Segfault on empty herestring
+	# (Fixed in bash-3.0 with STRLEN instead of strlen)
+	#epatch ${FILESDIR}/${P}-empty-herestring.patch
+
+	# Fix broken rbash functionality
+	# (Fixed in bash-3.0)
+	#epatch ${FILESDIR}/${P}-rbash.patch
+
+	# Fix parallel make, bug #41002.
+	# (Added to bash-3.0-gentoo.diff.bz2)
+	#epatch ${FILESDIR}/${P}-parallel-build.patch
+
+	# Revert trap behavior for the sake of autoconf-generated configure scripts.
+	# The problem here is that bash -c 'trap 0' works, but sh -c 'trap 0'
+	# doesn't work because the bash developers are trying to adhere to POSIX in
+	# that case.  Since all the configure scripts are #!/bin/sh, this breaks
+	# them
+	epatch ${FILESDIR}/${P}-posixtrap.patch
+
+	# 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
+
+	# 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
+
+	gnuconfig_update
+}
+
+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"
+
+	econf \
+		--disable-profiling \
+		--with-curses \
+		--without-gnu-malloc \
+		${myconf} || die
+
+	make || die
+}
+
+src_install() {
+	einstall || die
+
+	dodir /bin
+	mv ${D}/usr/bin/bash ${D}/bin
+	dosym bash /bin/sh
+	dosym bash /bin/rbash
+
+	use uclibc && rm -f ${D}/usr/bin/bashbug ${D}/usr/share/man*/bashbug*
+
+	insinto /etc/bash
+	doins ${FILESDIR}/bashrc
+
+	if use build; then
+		rm -rf ${D}/usr
+	else
+		doman doc/*.1
+		dodoc README NEWS AUTHORS CHANGES COMPAT Y2K
+		dodoc doc/FAQ doc/INTRO
+
+		dosym bash.info.gz /usr/share/info/bashref.info.gz
+	fi
+}
diff --git a/app-shells/bash/files/bash-3.0-posixtrap.patch b/app-shells/bash/files/bash-3.0-posixtrap.patch
new file mode 100644
index 000000000000..0e05c49a5fb8
--- /dev/null
+++ b/app-shells/bash/files/bash-3.0-posixtrap.patch
@@ -0,0 +1,21 @@
+--- bash-3.0/builtins/trap.def.noposix	2004-07-28 22:38:38.000000000 -0400
++++ bash-3.0/builtins/trap.def	2004-07-28 22:39:01.948314454 -0400
+@@ -122,12 +122,18 @@
+ 
+       operation = SET;
+       first_arg = list->word->word;
++#if 0
+       /* When in posix mode, the historical behavior of looking for a
+ 	 missing first argument is disabled.  To revert to the original
+ 	 signal handling disposition, use `-' as the first argument. */
+       if (posixly_correct == 0 && first_arg && *first_arg &&
+ 		(*first_arg != '-' || first_arg[1]) &&
+ 		signal_object_p (first_arg, opt) && list->next == 0)
++#else
++       if (first_arg && *first_arg &&
++ 		(*first_arg != '-' || first_arg[1]) &&
++ 		signal_object_p (first_arg, opt) && list->next == 0)
++#endif
+ 	operation = REVERT;
+       else
+ 	{
diff --git a/app-shells/bash/files/digest-bash-3.0-r1 b/app-shells/bash/files/digest-bash-3.0-r1
new file mode 100644
index 000000000000..b3fb57628169
--- /dev/null
+++ b/app-shells/bash/files/digest-bash-3.0-r1
@@ -0,0 +1,2 @@
+MD5 26c4d642e29b3533d8d754995bc277b3 bash-3.0.tar.gz 2418293
+MD5 220cdd45dc060fd41c2bd7c46e8a9064 bash-3.0-gentoo.diff.bz2 2423