[bash/f21] Array name expansion - apply upstream quickfix

[Ondrej Oprala]

commit 16396a9e145ac0600d9087f8ea449093dc226370
Author: Ondrej Oprala <ooprala at redhat.com>
Date:   Thu Jul 24 09:29:26 2014 +0200

    Array name expansion - apply upstream quickfix

 bash-4.3-array-element.patch |   21 +++++++++++++++++++++
 bash.spec                    |    8 +++++++-
 2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/bash-4.3-array-element.patch b/bash-4.3-array-element.patch
new file mode 100644
index 0000000..a2d8cea
--- /dev/null
+++ b/bash-4.3-array-element.patch
@@ -0,0 +1,21 @@
+*** bash-4.3-patched/subst.c	2014-06-03 09:32:44.000000000 -0400
+--- bash-4.3/subst.c	2014-07-23 09:58:19.000000000 -0400
+***************
+*** 7369,7373 ****
+  
+    if (want_indir)
+!     tdesc = parameter_brace_expand_indir (name + 1, var_is_special, quoted, quoted_dollar_atp, contains_dollar_at);
+    else
+      tdesc = parameter_brace_expand_word (name, var_is_special, quoted, PF_IGNUNBOUND|(pflags&(PF_NOSPLIT2|PF_ASSIGNRHS)), &ind);
+--- 7445,7455 ----
+  
+    if (want_indir)
+!     {
+!       tdesc = parameter_brace_expand_indir (name + 1, var_is_special, quoted, quoted_dollar_atp, contains_dollar_at);
+!       /* Turn off the W_ARRAYIND flag because there is no way for this function
+! 	 to return the index we're supposed to be using. */
+!       if (tdesc && tdesc->flags)
+! 	tdesc->flags &= ~W_ARRAYIND;
+!     }
+    else
+      tdesc = parameter_brace_expand_word (name, var_is_special, quoted, PF_IGNUNBOUND|(pflags&(PF_NOSPLIT2|PF_ASSIGNRHS)), &ind);
diff --git a/bash.spec b/bash.spec
index f98c5ea..268fbde 100644
--- a/bash.spec
+++ b/bash.spec
@@ -7,7 +7,7 @@
 Version: %{baseversion}%{patchleveltag}
 Name: bash
 Summary: The GNU Bourne Again shell
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: System Environment/Shells
 License: GPLv3+
 Url: http://www.gnu.org/software/bash
@@ -89,6 +89,8 @@ Patch127: bash-4.2-trap.patch
 # 1112710 - mention ulimit -c and -f POSIX block size
 Patch128: bash-4.3-man-ulimit.patch
 
+Patch129: bash-4.3-array-element.patch
+
 BuildRequires: texinfo bison
 BuildRequires: ncurses-devel
 BuildRequires: autoconf, gettext
@@ -160,6 +162,7 @@ This package contains documentation files for %{name}.
 %patch123 -p1
 %patch125 -p1 -b .size_type
 %patch128 -p1 -b .ulimit
+%patch129 -p1 -b .element
 
 echo %{version} > _distribution
 echo %{release} > _patchlevel
@@ -355,6 +358,9 @@ end
 %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Thu Jul 24 2014 Ondrej Oprala <ooprala at redhat.com> - 4.3.18-5
+- Array name expansion - apply upstream quickfix
+
 * Mon Jul 21 2014 Ondrej Oprala <ooprala at redhat.com> - 4.3.18-4
 - Mention ulimit -c and -f block size in POSIX mode