diff --git a/bash-3.2-memleak.patch b/bash-3.2-memleak.patch deleted file mode 100644 index fdc7dc4..0000000 --- a/bash-3.2-memleak.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- - builtins/read.def | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -Index: builtins/read.def -=================================================================== ---- builtins/read.def.orig 2007-11-10 01:20:45.000000000 +0100 -+++ builtins/read.def 2007-11-10 02:03:38.000000000 +0100 -@@ -134,7 +134,7 @@ read_builtin (list) - intmax_t intval; - char c; - char *input_string, *orig_input_string, *ifs_chars, *prompt, *arrayname; -- char *e, *t, *t1, *ps2; -+ char *e, *t, *t1, *t2, *ps2; - struct stat tsb; - SHELL_VAR *var; - #if defined (ARRAY_VARS) -@@ -677,12 +677,14 @@ add_char: - if (*input_string) - { - t1 = input_string; -- t = get_word_from_string (&input_string, ifs_chars, &e); -+ t2 = get_word_from_string (&input_string, ifs_chars, &e); - if (*input_string == 0) -- input_string = t; -+ input_string = t2; - else - input_string = strip_trailing_ifs_whitespace (t1, ifs_chars, saw_escape); - } -+ else -+ t2 = NULL; - #endif - - if (saw_escape) -@@ -696,6 +698,7 @@ add_char: - stupidly_hack_special_variables (list->word->word); - if (var) - VUNSETATTR (var, att_invisible); -+ FREE (t2); - xfree (orig_input_string); - - return (retval); diff --git a/bash-3.2-patches.tar.bz2 b/bash-3.2-patches.tar.bz2 index 93ad2b6..f3118c1 100644 --- a/bash-3.2-patches.tar.bz2 +++ b/bash-3.2-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:38f963ec817a2ac01128a7a675b9e1c81d8578b634c4b1055a8a40e81214a71e -size 21883 +oid sha256:14debe8922df425ad1240cacf00691a59d7f37e6b4f0d6aef571e45753920838 +size 25615 diff --git a/bash.changes b/bash.changes index a9ac879..54545e2 100644 --- a/bash.changes +++ b/bash.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 6 18:29:10 CEST 2008 - schwab@suse.de + +- Add bash patches 34-39. + ------------------------------------------------------------------- Mon Apr 28 03:42:11 CEST 2008 - matz@suse.de diff --git a/bash.spec b/bash.spec index e3ec69e..3eeddf8 100644 --- a/bash.spec +++ b/bash.spec @@ -20,7 +20,7 @@ Group: System/Shells Recommends: bash-doc = %bash_vers AutoReqProv: on Version: 3.2 -Release: 103 +Release: 106 Summary: The GNU Bourne-Again Shell Url: http://www.gnu.org/software/bash/bash.html Source0: bash-%{bash_vers}.tar.bz2 @@ -44,7 +44,6 @@ Patch9: bash-3.1-extended_quote.patch Patch10: bash-3.2-printf.patch Patch11: bash-3.1-loadables.dif Patch12: bash-3.2-valgrind.patch -Patch13: bash-3.2-memleak.patch Patch14: bash-3.2-sigrestart.patch Patch15: bash-3.2-longjmp.dif Patch20: readline-%{rl_vers}.dif @@ -77,7 +76,7 @@ Group: Documentation/Man Provides: bash:%{_infodir}/bash.info.gz PreReq: %install_info_prereq Version: 3.2 -Release: 62 +Release: 65 AutoReqProv: on %description -n bash-doc @@ -97,7 +96,7 @@ Summary: The Readline Library Group: System/Libraries Provides: bash:/%{_lib}/libreadline.so.5 Version: 5.2 -Release: 62 +Release: 65 Recommends: readline-doc = %{version} Provides: readline = 5.2 Obsoletes: readline <= 5.2 @@ -121,7 +120,7 @@ Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/C and C++ Provides: bash:%{_libdir}/libreadline.a Version: 5.2 -Release: 103 +Release: 106 Requires: libreadline5 = %{version} Requires: ncurses-devel Recommends: readline-doc = %{version} @@ -145,7 +144,7 @@ Group: System/Libraries Provides: readline:%{_infodir}/readline.info.gz PreReq: %install_info_prereq Version: 5.2 -Release: 62 +Release: 65 AutoReqProv: on %description -n readline-doc @@ -179,7 +178,6 @@ unset p %patch10 -p0 -b .printf %patch11 -p0 -b .plugins %patch12 -p0 -b .valgrind -%patch13 -p0 -b .memleak %patch14 -p0 -b .sigrestart %patch15 -p0 -b .longjmp %patch21 -p0 -b .zerotty @@ -423,6 +421,8 @@ EOF %doc %{_defaultdocdir}/readline/ %changelog +* Tue May 06 2008 schwab@suse.de +- Add bash patches 34-39. * Mon Apr 28 2008 matz@suse.de - Fix last patch. * Thu Apr 24 2008 werner@suse.de