23728052 bash 4.3 has a number of new patches upstream
authorStefan Teleman <stefan.teleman@oracle.com>
Mon, 01 Aug 2016 13:35:48 -0700
changeset 6536 2fd312fc3224
parent 6534 7944bbb85989
child 6537 26eef25e017a
23728052 bash 4.3 has a number of new patches upstream
components/bash/patches/bash43-043.patch
components/bash/patches/bash43-044.patch
components/bash/patches/bash43-045.patch
components/bash/patches/bash43-046.patch
components/bash/test/results-i386.master
components/bash/test/results-sparc.master
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bash/patches/bash43-043.patch	Mon Aug 01 13:35:48 2016 -0700
@@ -0,0 +1,59 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.3
+Patch-ID:	bash43-043
+
+Bug-Reported-by:	lolilolicon <[email protected]>
+Bug-Reference-ID:	<[email protected]om>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2014-08/msg00040.html
+
+Bug-Description:
+
+When the lastpipe option is enabled, the last component can contain nested
+pipelines and cause a segmentation fault under certain circumestances.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.3-patched/execute_cmd.c	2014-07-30 10:26:52.000000000 -0400
+--- execute_cmd.c	2014-08-15 08:55:24.000000000 -0400
+***************
+*** 2406,2412 ****
+      {
+  #if defined (JOB_CONTROL)
+!       append_process (savestring (the_printed_command), dollar_dollar_pid, exec_result, lastpipe_jid);
+! #endif
+        lstdin = wait_for (lastpid);
+  #if defined (JOB_CONTROL)
+        /* If wait_for removes the job from the jobs table, use result of last
+--- 2433,2447 ----
+      {
+  #if defined (JOB_CONTROL)
+!       if (INVALID_JOB (lastpipe_jid) == 0)
+!         {
+!           append_process (savestring (the_printed_command_except_trap), dollar_dollar_pid, exec_result, lastpipe_jid);
+!           lstdin = wait_for (lastpid);
+!         }
+!       else
+!         lstdin = wait_for_single_pid (lastpid);		/* checks bgpids list */
+! #else
+        lstdin = wait_for (lastpid);
++ #endif
++ 
+  #if defined (JOB_CONTROL)
+        /* If wait_for removes the job from the jobs table, use result of last
+*** ../bash-4.3/patchlevel.h	2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h	2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 42
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 43
+  
+  #endif /* _PATCHLEVEL_H_ */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bash/patches/bash43-044.patch	Mon Aug 01 13:35:48 2016 -0700
@@ -0,0 +1,48 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.3
+Patch-ID:	bash43-044
+
+Bug-Reported-by:	Ondrej Oprala <[email protected]>
+Bug-Reference-ID:	<[email protected]>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2014-06/msg00046.html
+
+Bug-Description:
+
+A typo prevents the `compat42' shopt option from working as intended.
+
+Patch (apply with `patch -p0'):
+
+diff -rC 2 bash-4.3.42/builtins/shopt.def bash-4.3.43/builtins/shopt.def
+*** bash-4.3.42/builtins/shopt.def	2013-02-27 09:43:20.000000000 -0500
+--- builtins/shopt.def	2015-10-16 11:25:28.000000000 -0400
+***************
+*** 161,165 ****
+    { "compat40", &shopt_compat40, set_compatibility_level },
+    { "compat41", &shopt_compat41, set_compatibility_level },
+!   { "compat42", &shopt_compat41, set_compatibility_level },
+  #if defined (READLINE)
+    { "complete_fullquote", &complete_fullquote, (shopt_set_func_t *)NULL},
+--- 161,165 ----
+    { "compat40", &shopt_compat40, set_compatibility_level },
+    { "compat41", &shopt_compat41, set_compatibility_level },
+!   { "compat42", &shopt_compat42, set_compatibility_level },
+  #if defined (READLINE)
+    { "complete_fullquote", &complete_fullquote, (shopt_set_func_t *)NULL},
+
+*** ../bash-4.3/patchlevel.h	2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h	2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 43
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 44
+  
+  #endif /* _PATCHLEVEL_H_ */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bash/patches/bash43-045.patch	Mon Aug 01 13:35:48 2016 -0700
@@ -0,0 +1,52 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.3
+Patch-ID:	bash43-045
+
+Bug-Reported-by:	Basin Ilya <[email protected]>
+Bug-Reference-ID:	<[email protected]>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2015-10/msg00141.html
+
+Bug-Description:
+
+If a file open attempted as part of a redirection fails because it is interrupted
+by a signal, the shell needs to process any pending traps to allow the redirection
+to be canceled.
+
+Patch (apply with `patch -p0'):
+
+*** bash-20150109/redir.c	2014-12-03 10:47:38.000000000 -0500
+--- redir.c	2015-01-16 10:15:47.000000000 -0500
+***************
+*** 672,676 ****
+  	  e = errno;
+  	  if (fd < 0 && e == EINTR)
+! 	    QUIT;
+  	  errno = e;
+  	}
+--- 672,679 ----
+  	  e = errno;
+  	  if (fd < 0 && e == EINTR)
+! 	    {
+! 	      QUIT;
+! 	      run_pending_traps ();
+! 	    }
+  	  errno = e;
+  	}
+
+*** ../bash-4.3/patchlevel.h	2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h	2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 44
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 45
+  
+  #endif /* _PATCHLEVEL_H_ */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bash/patches/bash43-046.patch	Mon Aug 01 13:35:48 2016 -0700
@@ -0,0 +1,55 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.3
+Patch-ID:	bash43-046
+
+Bug-Reported-by:	Sergey Tselikh <[email protected]>
+Bug-Reference-ID:	<[email protected]>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2015-08/msg00080.html
+
+Bug-Description:
+
+An incorrect conversion from an indexed to associative array can result in a
+core dump.
+
+Patch (apply with `patch -p0'):
+
+*** /fs2/chet/bash/bash-20150813/subst.c	2015-08-13 11:32:54.000000000 -0400
+--- subst.c	2015-08-18 10:13:59.000000000 -0400
+***************
+*** 9562,9566 ****
+  	  opts[opti] = '\0';
+  	  if (opti > 0)
+! 	    make_internal_declare (tlist->word->word, opts);
+  
+  	  t = do_word_assignment (tlist->word, 0);
+--- 9562,9573 ----
+  	  opts[opti] = '\0';
+  	  if (opti > 0)
+! 	    {
+! 	      t = make_internal_declare (tlist->word->word, opts);
+! 	      if (t != EXECUTION_SUCCESS)
+! 		{
+! 		  last_command_exit_value = t;
+! 		  exp_jump_to_top_level (DISCARD);
+! 		}
+! 	    }
+  
+  	  t = do_word_assignment (tlist->word, 0);
+
+*** ../bash-4.3/patchlevel.h	2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h	2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 45
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 46
+  
+  #endif /* _PATCHLEVEL_H_ */
--- a/components/bash/test/results-i386.master	Tue Jul 26 07:06:37 2016 -0700
+++ b/components/bash/test/results-i386.master	Mon Aug 01 13:35:48 2016 -0700
@@ -1,10 +1,10 @@
 	  ***********************************************************
 	  *                                                         *
-	  * GNU bash, version 4.3.42(1)-release (x86_64-pc-solaris2.12)
+	  * GNU bash, version 4.3.46(1)-release (x86_64-pc-solaris2.12)
 	  *                                                         *
 	  ***********************************************************
-version: 4.3.42(1)-release
-versinfo: 4 3 42 1 release x86_64-pc-solaris2.12
+version: 4.3.46(1)-release
+versinfo: 4 3 46 1 release x86_64-pc-solaris2.12
 HOSTTYPE = x86_64
 OSTYPE = solaris2.12
 MACHTYPE = x86_64-pc-solaris2.12
--- a/components/bash/test/results-sparc.master	Tue Jul 26 07:06:37 2016 -0700
+++ b/components/bash/test/results-sparc.master	Mon Aug 01 13:35:48 2016 -0700
@@ -1,10 +1,10 @@
 	  ***********************************************************
 	  *                                                         *
-	  * GNU bash, version 4.3.42(1)-release (sparc-sun-solaris2.12)
+	  * GNU bash, version 4.3.46(1)-release (sparc-sun-solaris2.12)
 	  *                                                         *
 	  ***********************************************************
-version: 4.3.42(1)-release
-versinfo: 4 3 42 1 release sparc-sun-solaris2.12
+version: 4.3.46(1)-release
+versinfo: 4 3 46 1 release sparc-sun-solaris2.12
 HOSTTYPE = sparc
 OSTYPE = solaris2.12
 MACHTYPE = sparc-sun-solaris2.12