Add fixes from upstream.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

6 files changed, 101 insertions, 7 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index 8d6cc8057795..826f202caaf1 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-shells/bash
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.198 2009/02/23 05:52:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.199 2009/02/24 05:01:02 vapier Exp $
+
+  24 Feb 2009; Mike Frysinger <vapier@gentoo.org>
+  +files/bash-4.0-exit-checkjobs.patch,
+  +files/bash-4.0-negative-return.patch,
+  +files/bash-4.0-save-current-token.patch, bash-4.0.ebuild:
+  Add fixes from upstream.
 
   23 Feb 2009; Mike Frysinger <vapier@gentoo.org>
   +files/bash-4.0-comsub-backslash-metacharacters.patch, bash-4.0.ebuild:
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index f99a0962e7f6..ba10f417f472 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -21,7 +21,10 @@ AUX bash-3.2-redisplay-cursor.patch 685 RMD160 80fd6fc3eefb4cb589132f8b462b79c3e
 AUX bash-3.2-session-leader.patch 2098 RMD160 b298743fb54162d0caa8d409bf1f7b6f796c65f5 SHA1 ff136654614731ec3252ee5f34235138f0bf381e SHA256 533861310e7cba05f315ff56af32aaca5e4bdf7c2a450d4e616bb14fdf4a1f3d
 AUX bash-3.2-ulimit.patch 449 RMD160 db5277031105cd4d2b7a6b92a8e74e532eb6f3db SHA1 cc634a2c188ac7661b9f4843f1b98f59d8f311a6 SHA256 d40709360f25ab355dc83e334b512d3dd80e435e241d1e69581fbc41504f8381
 AUX bash-4.0-comsub-backslash-metacharacters.patch 750 RMD160 f297b78a482a8b3b481aa67889609d98826a4619 SHA1 eaf09f94c7745e43cdc64799ab858e9fb3a12e60 SHA256 7ab73ffde1b86d4286b180c6c968ce717908b404a46322c4d1cdb82c398eb03c
+AUX bash-4.0-exit-checkjobs.patch 549 RMD160 11158eb2bb4cb8fb0ac53db23b2d4d4cf54f6dc6 SHA1 ff51cc138c5c174829931641a61c2f86fa96d4aa SHA256 7732484a8a014c7fa23f4aa44aeb53671c1967bf373e132de8435d0fe538024a
 AUX bash-4.0-ldflags-for-build.patch 512 RMD160 cebd92af1de1a97838248bbd5db0d6267ba826b9 SHA1 8967f82ba01bcb4913f914672d456f1d4b3682d6 SHA256 97b0ee283846e6530a0f025b1fe69054229a37b00180b82fcd44dc0c3381dc8a
+AUX bash-4.0-negative-return.patch 748 RMD160 ba602c6fb3caa055a09a72122c45e160ea51e323 SHA1 8fe1b27ad67e3e3b098b7ddeb6ded35594a9b106 SHA256 771f89825fc81ff035f1b03dfe1e65b7e58a0039c005067b0c37414b84ddbf2b
+AUX bash-4.0-save-current-token.patch 749 RMD160 cdedf40d43e2190e50f148e88d5f65cef9a5a594 SHA1 480d2cabfe4a17072c39691ad89c225a60c7e45c SHA256 af2e1262038308ce98929de59c4c7e4f811490956deb30fc4953e4bb9f702139
 AUX bash_logout 205 RMD160 fa6064b67bd02cf66dc490759442a0127770d420 SHA1 a6983665cc842bde96fbc8811be89cf8fda71a45 SHA256 15aaded954389c05d7de5d36c4887db61975ad52c87ad78baf1062ec8997289d
 AUX bashrc 2796 RMD160 7d88ed1dbe1f88c8752b2301376f4702fc178375 SHA1 783fcfd8c3273184db638f5e61da1d0921426d00 SHA256 de72a331ed65585fd70353d0d36d5d69e229b7db52c7cb97aeefd8f1b148d218
 AUX dot-bash_logout 127 RMD160 6092e24ba79924d0dd566657f97972237f8f5b68 SHA1 9e1e6e03b033fdfcf9f2098324bac5754c26ec69 SHA256 3bcb4958dad662fc2cbe77177236679f7a09b8bdb0be738102df4457394f4022
@@ -100,13 +103,13 @@ EBUILD bash-3.1_p17.ebuild 4601 RMD160 7d674942ae8ebcb662faa45a9efacb236bd6202e
 EBUILD bash-3.2_p39.ebuild 6143 RMD160 acff4775fc375029b7179b754869ff9dd9713bee SHA1 2d92ca85e9974a51873c1d13c76b09586cabf6dd SHA256 42fb91e1feaf1abc4324fd6a81a44b7dec96e6c687cc6e6316738942b7487a7f
 EBUILD bash-3.2_p48-r1.ebuild 6317 RMD160 e2694adbfe0ddf791ebea84ceb209e09032aace2 SHA1 6f6ce2f6a314df47b00f51d8302d13b4aa097806 SHA256 93393e678e15197ff4548c59d98f19c3e9492dda4fef75d3d90541d5e314991e
 EBUILD bash-3.2_p48.ebuild 6156 RMD160 3c317539d13997bfed5d217e4c56874a9879628e SHA1 242d433f223b325a5452d2dfec2118e7803cb131 SHA256 5c7031eed9f766a687805dce50eb598f156a517e558d8620a9349095aa6ba8cb
-EBUILD bash-4.0.ebuild 5667 RMD160 62cf119696e31da4cd56b1899754591d7fff094f SHA1 3c2999b602d4502513523bbf5f7a5d05d469c224 SHA256 ba6e81393979890ae0a6b827a63f93971270801fa2c48d2c864593b0da714f06
-MISC ChangeLog 32124 RMD160 8ca93841b511f864ec75204043b8daf4bbed6649 SHA1 4a7f18cd8be35e4803c1fa619cce4e7fc9105ccb SHA256 bc4734dd758baf59ef2e59868f2fa8e0882ba86e8ae8e6077cd784d9d026905e
+EBUILD bash-4.0.ebuild 5834 RMD160 e82a784dc8360fe8f9ccc79d15cd49466ce8d77d SHA1 5da37fb718b2d79bda07443bf3976fdaa813781f SHA256 bcbce7e0cc34dd2f1598b9c877e1b26b6cea68f9550e174e3d290dd7aae3ba77
+MISC ChangeLog 32344 RMD160 1c76766708b15030feb5fdddb8b16c11daff3683 SHA1 6d30f9de179ce025b53e6c5effc229fca71b1dd6 SHA256 f57222b3a1aff01654f8526e9104f9fd301ed35cf4b90555e8b136b35e4a46f2
 MISC metadata.xml 468 RMD160 9f720f1227381137311440f58d93250f29969786 SHA1 34bdfd1f0ed219ed79850647615a3b2603a4e079 SHA256 152d66c4d8f40627855ad3b4613e0ab88ff4bbf4333542eae52d411bdeb66e5f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkmiOYYACgkQn/5bYzqsSmEERgCZAVMxeZADVwZip+UG/T/gHge8
-/cEAoINF5kg9Qd3HSTQyWsxl95Kzjxb/
-=tG7d
+iEYEARECAAYFAkmjfxMACgkQn/5bYzqsSmEb3wCfS8W2Px4FwLKnieFTkyAwkDtT
+yg0AoLJzOROKCKt+51HmaHTLlaoQUlXi
+=EsqP
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash/bash-4.0.ebuild b/app-shells/bash/bash-4.0.ebuild
index ac70404422da..e336f75fa4c4 100644
--- a/app-shells/bash/bash-4.0.ebuild
+++ b/app-shells/bash/bash-4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.0.ebuild,v 1.3 2009/02/23 05:52:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.0.ebuild,v 1.4 2009/02/24 05:01:02 vapier Exp $
 
 EAPI="1"
 
@@ -69,6 +69,9 @@ src_unpack() {
 		epatch "${FILESDIR}"/${PN}-4.0-ldflags-for-build.patch #211947
 		epatch "${FILESDIR}"/${PN}-3.2-process-subst.patch
 		epatch "${FILESDIR}"/${PN}-4.0-comsub-backslash-metacharacters.patch
+		epatch "${FILESDIR}"/${PN}-4.0-save-current-token.patch
+		epatch "${FILESDIR}"/${PN}-4.0-exit-checkjobs.patch
+		epatch "${FILESDIR}"/${PN}-4.0-negative-return.patch
 		# Log bash commands to syslog #91327
 		if use bashlogger ; then
 			ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
diff --git a/app-shells/bash/files/bash-4.0-exit-checkjobs.patch b/app-shells/bash/files/bash-4.0-exit-checkjobs.patch
new file mode 100644
index 000000000000..419a13e51cd3
--- /dev/null
+++ b/app-shells/bash/files/bash-4.0-exit-checkjobs.patch
@@ -0,0 +1,17 @@
+http://lists.gnu.org/archive/html/bug-bash/2009-02/msg00176.html
+
+*** ../bash-4.0/builtins/exit.def	2009-01-04 14:32:22.000000000 -0500
+--- builtins/exit.def	2009-02-23 22:56:58.000000000 -0500
+***************
+*** 114,118 ****
+  	if (jobs[i] && STOPPED (i))
+  	  stopmsg = JSTOPPED;
+! 	else if (check_jobs_at_exit && stopmsg == 0 && RUNNING (i))
+  	  stopmsg = JRUNNING;
+  
+--- 114,118 ----
+  	if (jobs[i] && STOPPED (i))
+  	  stopmsg = JSTOPPED;
+! 	else if (check_jobs_at_exit && stopmsg == 0 && jobs[i] && RUNNING (i))
+  	  stopmsg = JRUNNING;
+  
diff --git a/app-shells/bash/files/bash-4.0-negative-return.patch b/app-shells/bash/files/bash-4.0-negative-return.patch
new file mode 100644
index 000000000000..32affa18c179
--- /dev/null
+++ b/app-shells/bash/files/bash-4.0-negative-return.patch
@@ -0,0 +1,33 @@
+http://lists.gnu.org/archive/html/bug-bash/2009-02/msg00158.html
+
+make `return` accept negative values again
+
+hack by me (vapier@gentoo.org) ... i'm not familiar with bash source code, so
+i imagine this isn't the best way to do it ...
+
+--- bash/builtins/return.def
++++ bash/builtins/return.def
+@@ -60,9 +60,23 @@
+ return_builtin (list)
+      WORD_LIST *list;
+ {
++	int neg = 0;
++	if (list && list->word && list->word->word) {
++		char *word = list->word->word;
++		if (*word == '-') {
++			while (*word++)
++				if (!isdigit(*word))
++					break;
++			if (!*word)
++				neg = 1;
++		}
++	}
++
++	if (!neg) {
+   if (no_options (list))
+     return (EX_USAGE);
+   list = loptend;	/* skip over possible `--' */
++	}
+ 
+   return_catch_value = get_exitstat (list);
+ 
diff --git a/app-shells/bash/files/bash-4.0-save-current-token.patch b/app-shells/bash/files/bash-4.0-save-current-token.patch
new file mode 100644
index 000000000000..506e56858ea0
--- /dev/null
+++ b/app-shells/bash/files/bash-4.0-save-current-token.patch
@@ -0,0 +1,32 @@
+http://lists.gnu.org/archive/html/bug-bash/2009-02/msg00177.html
+
+*** ../bash-4.0/parse.y	2009-01-08 08:29:12.000000000 -0500
+--- parse.y	2009-02-23 22:40:55.000000000 -0500
+***************
+*** 1616,1623 ****
+    int *ret;
+  
+!   ret = (int *)xmalloc (3 * sizeof (int));
+    ret[0] = last_read_token;
+    ret[1] = token_before_that;
+    ret[2] = two_tokens_ago;
+    return ret;
+  }
+--- 1616,1624 ----
+    int *ret;
+  
+!   ret = (int *)xmalloc (4 * sizeof (int));
+    ret[0] = last_read_token;
+    ret[1] = token_before_that;
+    ret[2] = two_tokens_ago;
++   ret[3] = current_token;
+    return ret;
+  }
+***************
+*** 1632,1635 ****
+--- 1633,1637 ----
+    token_before_that = ts[1];
+    two_tokens_ago = ts[2];
++   current_token = ts[3];
+  }
+