Add patch 014 to fix brace expansion #67075

7 files changed, 62 insertions, 189 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index d639bea7d255..23691578e75b 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,12 @@
 # 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.55 2004/09/29 20:09:22 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.56 2004/10/14 00:11:17 agriffis Exp $
+
+*bash-3.0-r7 (13 Oct 2004)
+
+  13 Oct 2004; Aron Griffis <agriffis@gentoo.org> +files/bash30-014,
+  -bash-3.0-r5.ebuild, -bash-3.0-r6.ebuild, +bash-3.0-r7.ebuild:
+  Add patch 014 to fix brace expansion #67075
 
 *bash-2.05b-r11 (29 Sep 2004)
 
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 4b7b6ead6028..2f9b74727d55 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -1,34 +1,27 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ad11192a436c59acc05fb317397f9114 ChangeLog 11598
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 6d389a481ddb0ba754db1fa6ad2986cc bash-3.0-r5.ebuild 5001
-MD5 0308d34140806e94e459da940dedf638 bash-2.05b-r9.ebuild 3524
 MD5 7d3a5febfc90c5de4acdf04fdc2ba25c bash-3.0-r6.ebuild 3927
+MD5 0308d34140806e94e459da940dedf638 bash-2.05b-r9.ebuild 3524
 MD5 fe0daeb3f024d7b48db4a71a02f92168 bash-2.05b-r11.ebuild 3734
-MD5 edf95b873162f4548435c379e4998b4e files/bash-2.05b-empty-herestring.patch 836
-MD5 90ba92c981c1d26e45d88ecd23a1fbf5 files/bash-2.05b-multibyte-locale.patch 1897
+MD5 6d389a481ddb0ba754db1fa6ad2986cc bash-3.0-r5.ebuild 5001
+MD5 20f4329fdf31cd0dae1de4070d45b7ea bash-3.0-r7.ebuild 4034
+MD5 ad11192a436c59acc05fb317397f9114 ChangeLog 11598
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 3d73159ab671b57a3f488c044e1a1f47 files/bash-2.05b-setlocale.patch 694
+MD5 4a3ebcb995491c2730d156b314cbab0b files/bash-3.0-etc-inputrc.patch 1223
 MD5 3b905c7c9341c9009bd68f14c047815e files/bash-2.05b-rbash.patch 804
-MD5 582fb9ed0ca44627978ce6836a5000dc files/config-top.h.diff 487
-MD5 4383b25cd54b24b9f459e338f06d096c files/bash-2.05b-parallel-build.patch 459
+MD5 694b8b1e47e4743e78ee5f7515f76542 files/bash-3.0-posixtrap.patch 789
 MD5 8b60985cf48da400708c055ba06888dc files/bashrc 1574
-MD5 4a3ebcb995491c2730d156b314cbab0b files/bash-3.0-etc-inputrc.patch 1223
-MD5 28c9d7407d5332c29dddb656a4a1f1ce files/bash-3.0-invisible.patch 705
+MD5 4383b25cd54b24b9f459e338f06d096c files/bash-2.05b-parallel-build.patch 459
+MD5 582fb9ed0ca44627978ce6836a5000dc files/config-top.h.diff 487
+MD5 96238e7d942d091ca71574ba7392e847 files/bash-3.0-array-stripping.patch 294
 MD5 0392b634a7a02302d24ccc4a4b349423 files/bash-3.0-local-array.patch 275
-MD5 1894aaae72806c410d851d046d13dd32 files/digest-bash-2.05b-r9 461
-MD5 694b8b1e47e4743e78ee5f7515f76542 files/bash-3.0-posixtrap.patch 789
 MD5 30a9ff1b688e79f59376a47d882f3419 files/digest-bash-3.0-r5 128
-MD5 96238e7d942d091ca71574ba7392e847 files/bash-3.0-array-stripping.patch 294
-MD5 ca64aff9caa582e07e0b34ed87d60d80 files/bash-2.05b-jobs.patch 876
-MD5 05f32594822720a84f58197c1535fc82 files/bash-3.0-jobs.patch 1064
 MD5 1fbe0324b1b5778d693d82cddcabeb9e files/digest-bash-3.0-r6 817
-MD5 3d73159ab671b57a3f488c044e1a1f47 files/bash-2.05b-setlocale.patch 694
+MD5 1fbe0324b1b5778d693d82cddcabeb9e files/digest-bash-3.0-r7 817
+MD5 28c9d7407d5332c29dddb656a4a1f1ce files/bash-3.0-invisible.patch 705
 MD5 1894aaae72806c410d851d046d13dd32 files/digest-bash-2.05b-r11 461
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBa0IQHTu7gpaalycRAh/PAJ44d+gYwuAIA0qcRYJvX20njRdHKQCeJOBF
-IQOrqgNO3lQ2x9B+wlieCEA=
-=FKca
------END PGP SIGNATURE-----
+MD5 1894aaae72806c410d851d046d13dd32 files/digest-bash-2.05b-r9 461
+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 90ba92c981c1d26e45d88ecd23a1fbf5 files/bash-2.05b-multibyte-locale.patch 1897
+MD5 05f32594822720a84f58197c1535fc82 files/bash-3.0-jobs.patch 1064
diff --git a/app-shells/bash/bash-3.0-r5.ebuild b/app-shells/bash/bash-3.0-r5.ebuild
deleted file mode 100644
index 3693186c3660..000000000000
--- a/app-shells/bash/bash-3.0-r5.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# 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-r5.ebuild,v 1.9 2004/10/12 02:31:30 vapier Exp $
-
-inherit eutils flag-o-matic gnuconfig gcc
-
-# Official patches
-PLEVEL=""
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="http://cnswww.cns.cwru.edu/~chet/bash/bashtop.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 ~sparc"
-IUSE="nls build uclibc"
-
-# 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
-
-	# 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
-
-	# Patch display.c so that only invisible characters actually on the first
-	# line are counted in it.  (This patch doesn't fix everything and Chet says
-	# he has a better patch... so watch for it in bash-3.0.1)
-	epatch ${FILESDIR}/${P}-invisible.patch
-
-	# 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
-
-	# Chet Ramey (upstream maintainer) provided this patch in
-	# http://news.gmane.org/gmane.comp.shells.bash.bugs/cutoff=4115
-	# to fix bug 58961 (segfault on local arrays)
-	epatch ${FILESDIR}/${P}-local-array.patch
-
-	# Chet Ramey (upstream maintainer) provided this patch to solve
-	# bug 60127 (bash 3 breaks array stripping)
-	epatch ${FILESDIR}/${P}-array-stripping.patch
-
-	# Fix using bash with post-20040808 glibc ebuilds (from fedora)
-	epatch ${FILESDIR}/${P}-jobs.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
-
-	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 ! $(gcc-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
-	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/bash-3.0-r6.ebuild b/app-shells/bash/bash-3.0-r7.ebuild
index ee78168ac80d..baa173b799ee 100644
--- a/app-shells/bash/bash-3.0-r6.ebuild
+++ b/app-shells/bash/bash-3.0-r7.ebuild
@@ -1,6 +1,6 @@
 # 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-r6.ebuild,v 1.4 2004/10/12 02:31:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.0-r7.ebuild,v 1.1 2004/10/14 00:11:18 agriffis Exp $
 
 inherit eutils flag-o-matic gnuconfig gcc
 
@@ -46,6 +46,9 @@ src_unpack() {
 		epatch ${DISTDIR}/${PN}${PV/\.}-$(printf '%03d' ${i})
 	done
 
+	# This is another "official" patch that hasn't gotten on the ftp site yet
+	epatch ${FILESDIR}/bash30-014
+
 	# 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
diff --git a/app-shells/bash/files/bash30-014 b/app-shells/bash/files/bash30-014
new file mode 100644
index 000000000000..58c69c41d815
--- /dev/null
+++ b/app-shells/bash/files/bash30-014
@@ -0,0 +1,32 @@
+> Machine Type: i686-pc-linux-gnu
+> 
+> Bash Version: 3.0
+> Patch Level: 13
+> Release Status: release
+> 
+> Description:
+> 	Brace expansion is broken in some cases when it follows quoted
+> 	text.
+
+*** ../bash-3.0-patched/braces.c	Wed Sep  8 11:07:53 2004
+--- braces.c	Fri Sep 17 18:42:36 2004
+***************
+*** 403,407 ****
+  	  pass_next = 1;
+  	  i++;
+! 	  level++;
+  	  continue;
+  	}
+--- 403,408 ----
+  	  pass_next = 1;
+  	  i++;
+! 	  if (quoted == 0)
+! 	    level++;
+  	  continue;
+  	}
+
+-- 
+``The lyf so short, the craft so long to lerne.'' - Chaucer
+( ``Discere est Dolere'' -- chet )
+						Live...Laugh...Love
+Chet Ramey, ITS, CWRU    chet@po.cwru.edu    http://tiswww.tis.cwru.edu/~chet/
diff --git a/app-shells/bash/files/digest-bash-3.0-r5 b/app-shells/bash/files/digest-bash-3.0-r5
deleted file mode 100644
index b3fb57628169..000000000000
--- a/app-shells/bash/files/digest-bash-3.0-r5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 26c4d642e29b3533d8d754995bc277b3 bash-3.0.tar.gz 2418293
-MD5 220cdd45dc060fd41c2bd7c46e8a9064 bash-3.0-gentoo.diff.bz2 2423
diff --git a/app-shells/bash/files/digest-bash-3.0-r6 b/app-shells/bash/files/digest-bash-3.0-r7
index fdbf5fad7d9e..fdbf5fad7d9e 100644
--- a/app-shells/bash/files/digest-bash-3.0-r6
+++ b/app-shells/bash/files/digest-bash-3.0-r7