Add fix from upstream for read timeouts.

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

4 files changed, 45 insertions, 7 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index b4e57eab04dc..193d599aa809 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,10 @@
 # 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.208 2009/02/27 00:43:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.209 2009/03/03 19:58:53 vapier Exp $
+
+  03 Mar 2009; Mike Frysinger <vapier@gentoo.org>
+  +files/bash-4.0-read-timeout-reset.patch, bash-4.0.ebuild:
+  Add fix from upstream for read timeouts.
 
   27 Feb 2009; Mike Frysinger <vapier@gentoo.org>
   +files/bash-4.0-comsub-herestring.patch, bash-4.0.ebuild:
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 9171359770a9..62c66305fa27 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -29,6 +29,7 @@ AUX bash-4.0-ldflags-for-build.patch 512 RMD160 cebd92af1de1a97838248bbd5db0d626
 AUX bash-4.0-negative-return.patch 748 RMD160 ba602c6fb3caa055a09a72122c45e160ea51e323 SHA1 8fe1b27ad67e3e3b098b7ddeb6ded35594a9b106 SHA256 771f89825fc81ff035f1b03dfe1e65b7e58a0039c005067b0c37414b84ddbf2b
 AUX bash-4.0-pcomplete-save-parser-state.patch 398 RMD160 ef9a279d06a0079cfd125b97f5d6ecb3b8dfe650 SHA1 a8b55818701c8530749ab428ed8e5b4870af8770 SHA256 55fff1801912eb7c0f7c8199ee82f40c7c11ad75e36811ca127ed0ff01e51a58
 AUX bash-4.0-pipeline-reserved-word.patch 317 RMD160 fcc48428006c3568e710ca34d358b75c1a619baf SHA1 0db8babe5b2d08a3248ecb907aeb10e8e127ebd4 SHA256 add2b514bbe25bc366b97a6e969cbeae9f730ac39a63058876eb059840aedeba
+AUX bash-4.0-read-timeout-reset.patch 1065 RMD160 647aa192ad95b1f81981f3862ac6e06b71eb4f06 SHA1 3a028aea90eecf234256e1627e972837dc53c111 SHA256 9406eb0e04167dee681393acc2060cdb9060e8aa67c9be9200e16783342d9853
 AUX bash-4.0-reset-parser-current-token.patch 366 RMD160 1404b8630475b1e74cea4263fbba0dd24db986fc SHA1 09ac2b6a96b96b239969abd0f2e8821088868377 SHA256 3436ac9a07b685a84c8c396c2db19326b975e5649c3596577a012cab96bd58f5
 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
@@ -109,13 +110,13 @@ EBUILD bash-3.1_p17.ebuild 4601 RMD160 7d674942ae8ebcb662faa45a9efacb236bd6202e
 EBUILD bash-3.2_p39.ebuild 5950 RMD160 22536f34ab6d2eb7d2475c1e4e4cdaacc451df4b SHA1 4cfc39d407627fd7d6d446a0e9b3ed6ce35a2b5f SHA256 c9503776590b2b117773e4000d6aa6e0c73e2b0f32589dcfddab146109e9ea7c
 EBUILD bash-3.2_p48-r1.ebuild 6124 RMD160 c3b16af5c8d019cb58c57a45ad5be2b9d93b4f2a SHA1 3e8e9ce6957f67abce65678f501883b4cf3b8ad4 SHA256 2895b32812a63c6208bb2a11ef60911751e09dbd42db39dae2d2acd90f9faba6
 EBUILD bash-3.2_p48.ebuild 5961 RMD160 9ab905aeac020d82d8369a4853ac208afd4f7b17 SHA1 382b66ff687601decb3bbed25bf0465a2f7fbe93 SHA256 8794b417a6be993a370d2ca7a6bacfef66bb003e06ea410bdedf5b0a33666f65
-EBUILD bash-4.0.ebuild 5922 RMD160 c6ba00db9bb7e21df617efc336883c4f0ed113e6 SHA1 d6ee9fa99cf257109549dbb7a43569a6f893e286 SHA256 59923c2aa526ec73aee461eedf5763fe40641334071e04d77f28d192ad168d89
-MISC ChangeLog 33846 RMD160 57f4b102f23d16d2c7e39dda66cecff3b23e8b73 SHA1 b4e09818f606b67705b99e71e228c6b14bd649cd SHA256 5a8a90a11782906f0c23a8f9bb395999a515bbfcc379024bd71731bd96927144
+EBUILD bash-4.0.ebuild 5975 RMD160 ca66bd2ec6bf114e981db3a7145cb29e034fc00a SHA1 69ce515be22059fa118374e0f7bcbda53504d5d3 SHA256 3c74764c383b053a1a1c40acd30ceada3914384d847ef2a2d35b63448e40a4a6
+MISC ChangeLog 34001 RMD160 ff1001769bd74fcd2472f4fb054b8ed50e1298ae SHA1 269d82d36695ccf9fabac9523015a65470cab163 SHA256 1952163187d1b458e27aff5937e6728a880fe6a1b80cb93fc468bb290bf6e28b
 MISC metadata.xml 468 RMD160 9f720f1227381137311440f58d93250f29969786 SHA1 34bdfd1f0ed219ed79850647615a3b2603a4e079 SHA256 152d66c4d8f40627855ad3b4613e0ab88ff4bbf4333542eae52d411bdeb66e5f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkmnN0AACgkQn/5bYzqsSmFTTACgrWQWmqspauXS6YMBJCeY0G0k
-dswAoJcosQRq7bbXfcoRHuBFPwekBemu
-=YMT/
+iEYEARECAAYFAkmtjAIACgkQn/5bYzqsSmHj0gCcCYwSwbrDU6yXcHqQrPwVFyLn
+HzoAmwQgIR27dAaKLlgd0fpAkRZ4Ysw6
+=ItFE
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash/bash-4.0.ebuild b/app-shells/bash/bash-4.0.ebuild
index 84aaf94949b1..6a5236a03ec5 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.12 2009/02/27 00:43:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.0.ebuild,v 1.13 2009/03/03 19:58:53 vapier Exp $
 
 EAPI="1"
 
@@ -76,6 +76,7 @@ src_unpack() {
 		epatch "${FILESDIR}"/${P}-pipeline-reserved-word.patch
 		epatch "${FILESDIR}"/${P}-associative-array-subscripts.patch
 		epatch "${FILESDIR}"/${P}-comsub-herestring.patch
+		epatch "${FILESDIR}"/${P}-read-timeout-reset.patch
 		epatch "${FILESDIR}"/${PN}-4.0-negative-return.patch
 		# Log bash commands to syslog #91327
 		if use bashlogger ; then
diff --git a/app-shells/bash/files/bash-4.0-read-timeout-reset.patch b/app-shells/bash/files/bash-4.0-read-timeout-reset.patch
new file mode 100644
index 000000000000..7f3def339277
--- /dev/null
+++ b/app-shells/bash/files/bash-4.0-read-timeout-reset.patch
@@ -0,0 +1,32 @@
+http://lists.gnu.org/archive/html/bug-bash/2009-02/msg00255.html
+http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00008.html
+
+*** ../bash-4.0/builtins/read.def	2009-01-15 23:11:21.000000000 -0500
+--- builtins/read.def	2009-03-02 10:15:39.000000000 -0500
+***************
+*** 370,381 ****
+        if (code)
+  	{
+! #if 0
+  	  run_unwind_frame ("read_builtin");
+- 	  return (EXECUTION_FAILURE);
+- #else
+  	  input_string[i] = '\0';	/* make sure it's terminated */
+! 	  retval = 128+SIGALRM;;
+  	  goto assign_vars;
+- #endif
+  	}
+        old_alrm = set_signal_handler (SIGALRM, sigalrm);
+--- 370,381 ----
+        if (code)
+  	{
+! 	  /* Tricky.  The top of the unwind-protect stack is the free of
+! 	     input_string.  We want to run all the rest and use input_string,
+! 	     so we have to remove it from the stack. */
+! 	  remove_unwind_protect ();
+  	  run_unwind_frame ("read_builtin");
+  	  input_string[i] = '\0';	/* make sure it's terminated */
+! 	  retval = 128+SIGALRM;
+  	  goto assign_vars;
+  	}
+        old_alrm = set_signal_handler (SIGALRM, sigalrm);