Fix from upstream for bad initial linewrapping #118205 by Derek Dolney.

Package-Manager: portage-2.1_pre3-r1

5 files changed, 229 insertions, 7 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index b267ca616823..92586d64b813 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.83 2006/01/10 00:01:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.84 2006/01/14 04:54:50 vapier Exp $
+
+*bash-3.1_p5-r1 (14 Jan 2006)
+
+  14 Jan 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/readline-5.1-terminal-autowrap.patch, +bash-3.1_p5-r1.ebuild:
+  Fix from upstream for bad initial linewrapping #118205 by Derek Dolney.
 
 *bash-3.1_p5 (10 Jan 2006)
 
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 65cf3a35b64f..b7f59d6e12b9 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -1,13 +1,13 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 5e1d80fe2a24c8ef35d8960b21e00c76 ChangeLog 17038
+MD5 3c0bd99f7998ac619eeb7c955fc7e044 ChangeLog 17265
 MD5 3da49e27281cbe16582393239ba5b29b bash-2.05b-r11.ebuild 3715
 MD5 27a795f52631ec69ef83b28d72e449dc bash-3.0-r11.ebuild 5143
 MD5 30fb11f3c3ffeebf09fa3ae90dd0d351 bash-3.0-r12.ebuild 5407
 MD5 f999a51dcdf23cdb6597ea549b58c170 bash-3.0-r13.ebuild 4957
 MD5 bd1598b6968b46dff8ca11cbc604beb0 bash-3.0-r14.ebuild 4838
-MD5 da9719003223b4183d02312ca5b0470d bash-3.1_p5.ebuild 4474
+MD5 1ea8a79b4f40b401c554e0de9fc43d25 bash-3.1_p5-r1.ebuild 4544
 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
@@ -58,15 +58,16 @@ MD5 13a88fae79fed8f76999ec8fdca2f085 files/digest-bash-3.0-r11 976
 MD5 13a88fae79fed8f76999ec8fdca2f085 files/digest-bash-3.0-r12 976
 MD5 e1aef7c77cc56da08cb6e99e26dee2cc files/digest-bash-3.0-r13 909
 MD5 e1aef7c77cc56da08cb6e99e26dee2cc files/digest-bash-3.0-r14 909
-MD5 743015551242211965a67843a6d4a7e3 files/digest-bash-3.1_p5 383
+MD5 743015551242211965a67843a6d4a7e3 files/digest-bash-3.1_p5-r1 383
 MD5 7d8a8ef90c1818a0cd66808ac2740638 files/dot-bash_logout 127
 MD5 d76b9aa6b733175df21c2bb6afe8900d files/dot-bash_profile 193
 MD5 6dcc418c7812b5f8ebf2f6562eb2e57c files/dot-bashrc 983
+MD5 67fff374a8f2eb3a4428d01a4d9d026d files/readline-5.1-terminal-autowrap.patch 1628
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDwvm12+ySkm8kpY0RAgKyAJ9wBpgDhOq6b/3Z4Jbfr0ukjuRypACfTHP2
-BBta7Acc9iozXI/ZhviQepw=
-=WPLE
+iD8DBQFDyISD2+ySkm8kpY0RAsk2AJ4+rRYZgX30EEqNTC7SXD4/jV34ZgCgsBDS
+qrB4VVsasLQ7vwUODbHkBq8=
+=Ko6R
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash/bash-3.1_p5-r1.ebuild b/app-shells/bash/bash-3.1_p5-r1.ebuild
new file mode 100644
index 000000000000..2f66554353a1
--- /dev/null
+++ b/app-shells/bash/bash-3.1_p5-r1.ebuild
@@ -0,0 +1,149 @@
+# 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.1_p5-r1.ebuild,v 1.1 2006/01/14 04:54:50 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.1
+READLINE_PLEVEL=1
+
+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/${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}
+		printf 'mirror://gnu/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"
+IUSE="afs nls build bashlogger unicode"
+
+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
+	epatch "${FILESDIR}"/readline-5.1-terminal-autowrap.patch #118205
+	cd ../..
+
+	# Fall back to /etc/inputrc
+	epatch "${FILESDIR}"/${PN}-3.0-etc-inputrc.patch
+	# Add more ulimit options (from Fedora)
+	epatch "${FILESDIR}"/${MY_P}-ulimit.patch
+	# Fix a memleak in read_builtin (from Fedora)
+	epatch "${FILESDIR}"/${PN}-3.0-read-memleak.patch
+	# Don't barf on handled signals in scripts
+	epatch "${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch
+#	# Fix generation of signals list when cross-compiling
+#	epatch "${FILESDIR}"/${PN}-3.0-cross-signals.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}"/${PN}-3.1-bash-logger.patch
+	fi
+
+	epatch "${FILESDIR}"/${PN}-3.0-configs.patch
+
+	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.
+	#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
+	export bash_cv_termcap_lib=libcurses
+	myconf="${myconf} --with-ncurses"
+
+	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
+
+	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/digest-bash-3.1_p5-r1 b/app-shells/bash/files/digest-bash-3.1_p5-r1
new file mode 100644
index 000000000000..f894d8d19a53
--- /dev/null
+++ b/app-shells/bash/files/digest-bash-3.1_p5-r1
@@ -0,0 +1,7 @@
+MD5 ef5304c4b22aaa5088972c792ed45d72 bash-3.1.tar.gz 2533934
+MD5 c0d33bdfed6e4e6a9ae9200b77cd5c99 bash31-001 2708
+MD5 0c9be3bad344d04b79c4eac9eb39624c bash31-002 7169
+MD5 04750485f335972f7a980a1bfe048dba bash31-003 1324
+MD5 0c2856794ab16a4c224223c1964140c2 bash31-004 1470
+MD5 943233d7227071fa040c8b9eb016fa0c bash31-005 1322
+MD5 63faf622820ca0828131c8b5aeac1e6a readline51-001 2042
diff --git a/app-shells/bash/files/readline-5.1-terminal-autowrap.patch b/app-shells/bash/files/readline-5.1-terminal-autowrap.patch
new file mode 100644
index 000000000000..c25c3bdbff49
--- /dev/null
+++ b/app-shells/bash/files/readline-5.1-terminal-autowrap.patch
@@ -0,0 +1,59 @@
+http://bugs.gentoo.org/118205
+http://lists.gnu.org/archive/html/bug-bash/2006-01/msg00045.html
+
+Date: Fri, 13 Jan 2006 23:44:49 -0500
+From: Chet Ramey <chet.ramey@case.edu>
+To: Mike Frysinger <vapier@gentoo.org>
+Subject: Re: off by one in wrapping long lines in bash-3.1
+
+Mike Frysinger wrote:
+> On Friday 13 January 2006 23:12, Chet Ramey wrote:
+>> You have `checkwinsize' set, don't you.
+> 
+> yes, that is something i enable on all my machines
+
+Well, that's it, then.  Here's a fix.
+
+Chet
+
+-- 
+``The lyf so short, the craft so long to lerne.'' - Chaucer
+( ``Discere est Dolere'' -- chet )
+						Live Strong.
+Chet Ramey, ITS, CWRU    chet@case.edu    http://cnswww.cns.cwru.edu/~chet/
+
+--------------090207020201070609090304
+Content-Type: text/plain; x-mac-type="0"; x-mac-creator="0";
+ name="terminal.c.patch"
+Content-Transfer-Encoding: 7bit
+Content-Disposition: inline;
+ filename="terminal.c.patch"
+
+*** ../bash-3.1-patched/lib/readline/terminal.c	Sat Nov 12 20:46:54 2005
+--- lib/readline/terminal.c	Fri Jan 13 23:23:44 2006
+***************
+*** 123,127 ****
+  
+  /* Non-zero means the terminal can auto-wrap lines. */
+! int _rl_term_autowrap;
+  
+  /* Non-zero means that this terminal has a meta key. */
+--- 123,127 ----
+  
+  /* Non-zero means the terminal can auto-wrap lines. */
+! int _rl_term_autowrap = -1;
+  
+  /* Non-zero means that this terminal has a meta key. */
+***************
+*** 275,278 ****
+--- 275,281 ----
+       int rows, cols;
+  {
++   if (_rl_term_autowrap == -1)
++     _rl_init_terminal_io (rl_terminal_name);
++ 
+    if (rows > 0)
+      _rl_screenheight = rows;
+
+--------------090207020201070609090304--
+