Merge branch 'next'

[people/pmueller/ipfire-2.x.git] / src / patches / bash / bash43-007

diff --git a/src/patches/bash/bash43-007 b/src/patches/bash/bash43-007
deleted file mode 100644 (file)
index 0d62c9e..0000000
--- a/src/patches/bash/bash43-007
+++ /dev/null
@@ -1,50 +0,0 @@
-                            BASH PATCH REPORT
-                            =================
-
-Bash-Release:  4.3
-Patch-ID:      bash43-007
-
-Bug-Reported-by:       geir.hauge@gmail.com
-Bug-Reference-ID:      <20140318093650.B181C1C5B0B@gina.itea.ntnu.no>
-Bug-Reference-URL:     http://lists.gnu.org/archive/html/bug-bash/2014-03/msg00095.html
-
-Bug-Description:
-
-Using compound assignments for associative arrays like
-
-assoc=( [x]= [y]=bar )
-
-left the value corresponding to the key `x' NULL.  This caused subsequent
-lookups to interpret it as unset.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3/arrayfunc.c    2013-08-02 16:19:59.000000000 -0400
---- arrayfunc.c        2014-03-18 11:08:15.000000000 -0400
-***************
-*** 598,601 ****
---- 598,606 ----
-       {
-         val = expand_assignment_string_to_string (val, 0);
-+        if (val == 0)
-+          {
-+            val = (char *)xmalloc (1);
-+            val[0] = '\0';    /* like do_assignment_internal */
-+          }
-         free_val = 1;
-       }
-*** ../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 6
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 7
-  
-  #endif /* _PATCHLEVEL_H_ */