diff --git a/bash.spec b/bash.spec index 242eac9..dd7af4b 100644 --- a/bash.spec +++ b/bash.spec @@ -1,5 +1,5 @@ #% define beta_tag rc2 -%define patchleveltag .5 +%define patchleveltag .6 %define baseversion 4.2 %bcond_without tests @@ -25,6 +25,7 @@ Patch002: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-002 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 # Other patches Patch101: bash-2.02-security.patch @@ -92,6 +93,7 @@ This package contains documentation files for %{name}. %patch003 -p0 -b .003 %patch004 -p0 -b .004 %patch005 -p0 -b .005 +%patch006 -p0 -b .006 # Other patches %patch101 -p1 -b .security @@ -293,6 +295,9 @@ fi #%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt %changelog +* Wed Mar 02 2011 Roman Rakus - 4.2.6-1 +- Patchlevel 6 + * Tue Mar 01 2011 Roman Rakus - 4.2.5-1 - Patchlevel 5 - Static analyzis show some issues in some patches diff --git a/bash42-006 b/bash42-006 new file mode 100644 index 0000000..be6e49c --- /dev/null +++ b/bash42-006 @@ -0,0 +1,46 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-006 + +Bug-Reported-by: Allan McRae +Bug-Reference-ID: <4D6D0D0B.50908@archlinux.org> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00001.html + +Bug-Description: + +A problem with bash42-005 caused it to dump core if TZ was unset. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/variables.c 2011-02-25 12:07:41.000000000 -0500 +--- variables.c 2011-03-01 10:13:04.000000000 -0500 +*************** +*** 3661,3665 **** + + v = find_variable (name); +! if (exported_p (v)) + { + array_needs_making = 1; +--- 3661,3665 ---- + + v = find_variable (name); +! if (v && exported_p (v)) + { + array_needs_making = 1; +*** ../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 5 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 6 + + #endif /* _PATCHLEVEL_H_ */