[bash/f15/master] Patchlevel 7

[Roman Rakus]

commit 904362cfc7369ca0bd877d4898d17c995f504d78
Author: Roman Rakus <rrakus at redhat.com>
Date:   Mon Mar 7 13:47:50 2011 +0100

    Patchlevel 7
    
    Signed-off-by: Roman Rakus <rrakus at redhat.com>

 bash.spec  |    8 ++++++--
 bash42-007 |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 2 deletions(-)
---
diff --git a/bash.spec b/bash.spec
index 376ffeb..53ec517 100644
--- a/bash.spec
+++ b/bash.spec
@@ -1,5 +1,5 @@
 #% define beta_tag rc2
-%define patchleveltag .6
+%define patchleveltag .7
 %define baseversion 4.2
 %bcond_without tests
 
@@ -26,7 +26,7 @@ Patch003: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-003
 Patch004: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-004
 Patch005: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-005
 Patch006: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-006
-
+Patch007: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-007
 
 # Other patches
 Patch101: bash-2.02-security.patch
@@ -94,6 +94,7 @@ This package contains documentation files for %{name}.
 %patch004 -p0 -b .004
 %patch005 -p0 -b .005
 %patch006 -p0 -b .006
+%patch007 -p0 -b .007
 
 # Other patches
 %patch101 -p1 -b .security
@@ -295,6 +296,9 @@ fi
 #%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Mon Mar 07 2011 Roman Rakus <rrakus at redhat.com> - 4.2.7-1
+- Patchlevel 7
+
 * Wed Mar 02 2011 Roman Rakus <rrakus at redhat.com> - 4.2.6-1
 - Patchlevel 6
 
diff --git a/bash42-007 b/bash42-007
new file mode 100644
index 0000000..d16156e
--- /dev/null
+++ b/bash42-007
@@ -0,0 +1,46 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.2
+Patch-ID:	bash42-007
+
+Bug-Reported-by:	Matthias Klose <doko at debian.org>
+Bug-Reference-ID:	<4D6FD2AC.1010500 at debian.org>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00015.html
+
+Bug-Description:
+
+When used in contexts where word splitting and quote removal were not
+performed, such as case statement word expansion, empty strings
+(either literal or resulting from quoted variables that were unset or
+null) were not expanded correctly, resulting in failure.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/subst.c	2011-02-25 12:03:58.000000000 -0500
+--- subst.c	2011-03-03 14:08:23.000000000 -0500
+***************
+*** 4609,4614 ****
+--- 4611,4617 ----
+    if (ifs_firstc == 0)
+  #endif
+      word->flags |= W_NOSPLIT;
++   word->flags |= W_NOSPLIT2;
+    result = call_expand_word_internal (word, quoted, 0, (int *)NULL, (int *)NULL);
+    expand_no_split_dollar_star = 0;
+  
+*** ../bash-4.2-patched/patchlevel.h	Sat Jun 12 20:14:48 2010
+--- patchlevel.h	Thu Feb 24 21:41:34 2011
+***************
+*** 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_ */