[bash/f19] Update to patchlevel 46

[Ondrej Oprala]

commit fdefbec64a00839e6fcd6350cb4cec5887715ff6
Author: Ondrej Oprala <ooprala at redhat.com>
Date:   Tue Apr 1 09:36:50 2014 +0200

    Update to patchlevel 46

 bash.spec  |    7 ++++++-
 bash42-046 |   55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 1 deletions(-)
---
diff --git a/bash.spec b/bash.spec
index d9124c9..497f55c 100644
--- a/bash.spec
+++ b/bash.spec
@@ -1,5 +1,5 @@
 #% define beta_tag rc2
-%define patchleveltag .45
+%define patchleveltag .46
 %define baseversion 4.2
 %bcond_without tests
 
@@ -65,6 +65,7 @@ Patch042: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-042
 Patch043: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-043
 Patch044: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-044
 Patch045: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-045
+Patch046: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-046
 
 # Other patches
 Patch101: bash-2.02-security.patch
@@ -188,6 +189,7 @@ This package contains documentation files for %{name}.
 %patch043 -p0 -b .043
 %patch044 -p0 -b .044
 %patch045 -p0 -b .045
+%patch046 -p0 -b .046
 
 # Other patches
 %patch101 -p1 -b .security
@@ -408,6 +410,9 @@ end
 #%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Tue Apr 01 2014 Ondrej Oprala <ooprala at redhat.com> - 4.2.46-1
+- Patchlevel 46
+
 * Mon Mar 11 2013 Roman Rakus <rrakus at redhat.com> - 4.2.45-1
 - Patchlevel 45
 
diff --git a/bash42-046 b/bash42-046
new file mode 100644
index 0000000..03a489e
--- /dev/null
+++ b/bash42-046
@@ -0,0 +1,55 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.2
+Patch-ID:	bash42-046
+
+Bug-Reported-by:	"Theodoros V. Kalamatianos" <thkala at gmail.com>
+Bug-Reference-ID:	<20140112011131.GE17667 at infinity.metashade.com>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2014-01/msg00044.html
+
+Bug-Description:
+
+Bash-4.2 patch 32 introduced a problem with "$@" and arrays expanding empty
+positional parameters or array elements when using substring expansion,
+pattern substitution, or case modfication.  The empty parameters or array
+elements are removed instead of expanding to empty strings ("").
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/subst.c	2012-12-31 11:52:56.000000000 -0500
+--- subst.c	2014-03-31 14:19:56.000000000 -0400
+***************
+*** 7243,7247 ****
+        ret = alloc_word_desc ();
+        ret->word = temp1;
+!       if (temp1 && QUOTED_NULL (temp1) && (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)))
+  	ret->flags |= W_QUOTED|W_HASQUOTEDNULL;
+        return ret;
+--- 7243,7253 ----
+        ret = alloc_word_desc ();
+        ret->word = temp1;
+!       /* We test quoted_dollar_atp because we want variants with double-quoted
+! 	 "$@" to take a different code path. In fact, we make sure at the end
+! 	 of expand_word_internal that we're only looking at these flags if
+! 	 quoted_dollar_at == 0. */
+!       if (temp1 && 
+!           (quoted_dollar_atp == 0 || *quoted_dollar_atp == 0) &&
+! 	  QUOTED_NULL (temp1) && (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)))
+  	ret->flags |= W_QUOTED|W_HASQUOTEDNULL;
+        return ret;
+*** ../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 45
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 46
+  
+  #endif /* _PATCHLEVEL_H_ */