Add some fixes from upstream.

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

2 files changed, 95 insertions, 0 deletions

diff --git a/app-shells/bash/files/bash-4.0-debug-trap-jobs.patch b/app-shells/bash/files/bash-4.0-debug-trap-jobs.patch
new file mode 100644
index 000000000000..facae42aa85e
--- /dev/null
+++ b/app-shells/bash/files/bash-4.0-debug-trap-jobs.patch
@@ -0,0 +1,44 @@
+*** ../bash-4.0-patched/jobs.c	2009-01-29 17:09:49.000000000 -0500
+--- jobs.c	2009-04-11 15:14:27.000000000 -0400
+***************
+*** 443,447 ****
+    the_pipeline = saved_pipeline;
+    already_making_children = saved_already_making_children;
+!   if (discard)
+      discard_pipeline (old_pipeline);
+  }
+--- 443,447 ----
+    the_pipeline = saved_pipeline;
+    already_making_children = saved_already_making_children;
+!   if (discard && old_pipeline)
+      discard_pipeline (old_pipeline);
+  }
+*** ../bash-4.0-patched/trap.c	2009-01-16 17:07:53.000000000 -0500
+--- trap.c	2009-04-11 15:11:58.000000000 -0400
+***************
+*** 799,802 ****
+--- 799,803 ----
+  {
+    int trap_exit_value;
++   pid_t save_pgrp;
+  
+    /* XXX - question:  should the DEBUG trap inherit the RETURN trap? */
+***************
+*** 804,808 ****
+--- 805,820 ----
+    if ((sigmodes[DEBUG_TRAP] & SIG_TRAPPED) && ((sigmodes[DEBUG_TRAP] & SIG_IGNORED) == 0) && ((sigmodes[DEBUG_TRAP] & SIG_INPROGRESS) == 0))
+      {
++ #if defined (JOB_CONTROL)
++       save_pgrp = pipeline_pgrp;
++       pipeline_pgrp = shell_pgrp;
++       save_pipeline (1);
++       stop_making_children ();
++ #endif
+        trap_exit_value = _run_trap_internal (DEBUG_TRAP, "debug trap");
++ #if defined (JOB_CONTROL)
++       pipeline_pgrp = save_pgrp;
++       restore_pipeline (1);
++       notify_and_cleanup ();
++ #endif
+        
+  #if defined (DEBUGGER)
diff --git a/app-shells/bash/files/bash-4.0-redisplay-sigwinch.patch b/app-shells/bash/files/bash-4.0-redisplay-sigwinch.patch
new file mode 100644
index 000000000000..e90e5552ea88
--- /dev/null
+++ b/app-shells/bash/files/bash-4.0-redisplay-sigwinch.patch
@@ -0,0 +1,51 @@
+*** ../bash-4.0-patched/lib/readline/readline.h	2009-01-04 14:32:33.000000000 -0500
+--- lib/readline/readline.h	2009-04-13 08:47:00.000000000 -0400
+***************
+*** 815,820 ****
+  #define RL_STATE_MULTIKEY	0x200000	/* reading multiple-key command */
+  #define RL_STATE_VICMDONCE	0x400000	/* entered vi command mode at least once */
+  
+! #define RL_STATE_DONE		0x800000	/* done; accepted line */
+  
+  #define RL_SETSTATE(x)		(rl_readline_state |= (x))
+--- 815,821 ----
+  #define RL_STATE_MULTIKEY	0x200000	/* reading multiple-key command */
+  #define RL_STATE_VICMDONCE	0x400000	/* entered vi command mode at least once */
++ #define RL_STATE_REDISPLAYING	0x800000	/* updating terminal display */
+  
+! #define RL_STATE_DONE		0x1000000	/* done; accepted line */
+  
+  #define RL_SETSTATE(x)		(rl_readline_state |= (x))
+*** ../bash-4.0-patched/lib/readline/display.c	2009-01-04 14:32:32.000000000 -0500
+--- lib/readline/display.c	2009-04-13 08:29:54.000000000 -0400
+***************
+*** 513,516 ****
+--- 513,517 ----
+       data structures. */
+    _rl_block_sigint ();  
++   RL_SETSTATE (RL_STATE_REDISPLAYING);
+  
+    if (!rl_display_prompt)
+***************
+*** 1237,1240 ****
+--- 1238,1242 ----
+    }
+  
++   RL_UNSETSTATE (RL_STATE_REDISPLAYING);
+    _rl_release_sigint ();
+  }
+*** ../bash-4.0-patched/lib/readline/terminal.c	2009-01-04 14:32:34.000000000 -0500
+--- lib/readline/terminal.c	2009-04-13 08:43:00.000000000 -0400
+***************
+*** 356,360 ****
+        if (CUSTOM_REDISPLAY_FUNC ())
+  	rl_forced_update_display ();
+!       else
+  	_rl_redisplay_after_sigwinch ();
+      }
+--- 356,360 ----
+        if (CUSTOM_REDISPLAY_FUNC ())
+  	rl_forced_update_display ();
+!       else if (RL_ISSTATE(RL_STATE_REDISPLAYING) == 0)
+  	_rl_redisplay_after_sigwinch ();
+      }