diff --git a/007-expand-string-unsplit b/007-expand-string-unsplit new file mode 100644 index 0000000..75235c9 --- /dev/null +++ b/007-expand-string-unsplit @@ -0,0 +1,13 @@ +*** ../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; + + diff --git a/bash.spec b/bash.spec index dd7af4b..5f9a346 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,6 +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 +95,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 +297,9 @@ fi #%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt %changelog +* Mon Mar 07 2011 Roman Rakus - 4.2.7-1 +- Patchlevel 7 + * Wed Mar 02 2011 Roman Rakus - 4.2.6-1 - Patchlevel 6