Revbump so bash cleans up readline and its terminal state in all cases. Removed old

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

4 files changed, 58 insertions, 24 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index a32040819ed0..b40c84a4f77b 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-shells/bash
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.379 2014/08/30 07:47:03 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.380 2014/09/09 15:59:39 polynomial-c Exp $
+
+*bash-4.3_p24-r1 (09 Sep 2014)
+
+  09 Sep 2014; Lars Wendler <polynomial-c@gentoo.org> -bash-4.3_p22-r1.ebuild,
+  +bash-4.3_p24-r1.ebuild, -files/bash-4.3-indirect-array-element.patch,
+  +files/bash-4.3-term-cleanup.patch:
+  Revbump so bash cleans up readline and its terminal state in all cases.
+  Removed old.
 
   30 Aug 2014; Lars Wendler <polynomial-c@gentoo.org> files/bashrc:
   Added KDE's konsole to the list of valid terms for PROMPT_COMMAND.
diff --git a/app-shells/bash/bash-4.3_p22-r1.ebuild b/app-shells/bash/bash-4.3_p24-r1.ebuild
index 22be599c7c5f..ff9b4ef88c94 100644
--- a/app-shells/bash/bash-4.3_p22-r1.ebuild
+++ b/app-shells/bash/bash-4.3_p24-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.3_p22-r1.ebuild,v 1.1 2014/08/12 21:36:34 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.3_p24-r1.ebuild,v 1.1 2014/09/09 15:59:39 polynomial-c Exp $
 
 EAPI="4"
 
@@ -85,8 +85,8 @@ src_prepare() {
 
 	epatch "${FILESDIR}"/${PN}-4.3-compat-lvl.patch
 	epatch "${FILESDIR}"/${PN}-4.3-parse-time-keyword.patch
-	epatch "${FILESDIR}"/${PN}-4.3-indirect-array-element.patch
 	epatch "${FILESDIR}"/${PN}-4.3-append-process-segfault.patch
+	epatch "${FILESDIR}"/${PN}-4.3-term-cleanup.patch
 
 	epatch_user
 }
diff --git a/app-shells/bash/files/bash-4.3-indirect-array-element.patch b/app-shells/bash/files/bash-4.3-indirect-array-element.patch
deleted file mode 100644
index 547d00cf914b..000000000000
--- a/app-shells/bash/files/bash-4.3-indirect-array-element.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-*** ../bash-4.3-patched/subst.c	2014-06-03 09:32:44.000000000 -0400
---- subst.c	2014-07-23 09:58:19.000000000 -0400
-***************
-*** 7369,7373 ****
-  
-    if (want_indir)
-!     tdesc = parameter_brace_expand_indir (name + 1, var_is_special, quoted, quoted_dollar_atp, contains_dollar_at);
-    else
-      tdesc = parameter_brace_expand_word (name, var_is_special, quoted, PF_IGNUNBOUND|(pflags&(PF_NOSPLIT2|PF_ASSIGNRHS)), &ind);
---- 7445,7455 ----
-  
-    if (want_indir)
-!     {
-!       tdesc = parameter_brace_expand_indir (name + 1, var_is_special, quoted, quoted_dollar_atp, contains_dollar_at);
-!       /* Turn off the W_ARRAYIND flag because there is no way for this function
-! 	 to return the index we're supposed to be using. */
-!       if (tdesc && tdesc->flags)
-! 	tdesc->flags &= ~W_ARRAYIND;
-!     }
-    else
-      tdesc = parameter_brace_expand_word (name, var_is_special, quoted, PF_IGNUNBOUND|(pflags&(PF_NOSPLIT2|PF_ASSIGNRHS)), &ind);
diff --git a/app-shells/bash/files/bash-4.3-term-cleanup.patch b/app-shells/bash/files/bash-4.3-term-cleanup.patch
new file mode 100644
index 000000000000..be7a5def76d5
--- /dev/null
+++ b/app-shells/bash/files/bash-4.3-term-cleanup.patch
@@ -0,0 +1,47 @@
+http://lists.gnu.org/archive/html/bug-bash/2014-09/msg00031.html
+
+*** ../bash-4.3-patched/bashline.c	2014-05-14 09:22:39.000000000 -0400
+--- bashline.c	2014-09-08 11:28:56.000000000 -0400
+***************
+*** 203,206 ****
+--- 203,207 ----
+  extern int array_needs_making;
+  extern int posixly_correct, no_symbolic_links;
++ extern int sigalrm_seen;
+  extern char *current_prompt_string, *ps1_prompt;
+  extern STRING_INT_ALIST word_token_alist[];
+***************
+*** 4209,4214 ****
+    /* If we're going to longjmp to top_level, make sure we clean up readline.
+       check_signals will call QUIT, which will eventually longjmp to top_level,
+!      calling run_interrupt_trap along the way. */
+!   if (interrupt_state)
+      rl_cleanup_after_signal ();
+    bashline_reset_event_hook ();
+--- 4262,4268 ----
+    /* If we're going to longjmp to top_level, make sure we clean up readline.
+       check_signals will call QUIT, which will eventually longjmp to top_level,
+!      calling run_interrupt_trap along the way.  The check for sigalrm_seen is
+!      to clean up the read builtin's state. */
+!   if (terminating_signal || interrupt_state || sigalrm_seen)
+      rl_cleanup_after_signal ();
+    bashline_reset_event_hook ();
+*** ../bash-4.3-patched/sig.c	2014-01-10 15:06:06.000000000 -0500
+--- sig.c	2014-09-08 11:26:33.000000000 -0400
+***************
+*** 533,538 ****
+    /* Set the event hook so readline will call it after the signal handlers
+       finish executing, so if this interrupted character input we can get
+!      quick response. */
+!   if (interactive_shell && interactive && no_line_editing == 0)
+      bashline_set_event_hook ();
+  #endif
+--- 533,540 ----
+    /* Set the event hook so readline will call it after the signal handlers
+       finish executing, so if this interrupted character input we can get
+!      quick response.  If readline is active or has modified the terminal we
+!      need to set this no matter what the signal is, though the check for
+!      RL_STATE_TERMPREPPED is possibly redundant. */
+!   if (RL_ISSTATE (RL_STATE_SIGHANDLER) || RL_ISSTATE (RL_STATE_TERMPREPPED))
+      bashline_set_event_hook ();
+  #endif