diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2011-12-01 09:56:54 +0100 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2011-12-01 09:56:54 +0100 |
| commit | c3b72c6cd7b82e70cf61f4eac59f176444eaebf1 (patch) | |
| tree | fe27a5f40b77b826a0bbe7bc2587e4592f74e6c5 /package/bash/bash-4.2-007.patch | |
| parent | c29253ef2e2a473e597637b7ada9fb268dfa8767 (diff) | |
| parent | e3c6b3853ef054efe3ab9800392aec7aa7656dd3 (diff) | |
Merge branch 'next'
And kickoff 2012.02 cycle.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/bash/bash-4.2-007.patch')
| -rw-r--r-- | package/bash/bash-4.2-007.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/package/bash/bash-4.2-007.patch b/package/bash/bash-4.2-007.patch new file mode 100644 index 000000000..6fca89662 --- /dev/null +++ b/package/bash/bash-4.2-007.patch @@ -0,0 +1,46 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-007 + +Bug-Reported-by: Matthias Klose <doko@debian.org> +Bug-Reference-ID: <4D6FD2AC.1010500@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_ */ |