diff --git a/bash-4.1-array.dif b/bash-4.1-array.dif index 6c5b3b8a..044dafb6 100644 --- a/bash-4.1-array.dif +++ b/bash-4.1-array.dif @@ -16,3 +16,27 @@ And the obvious patch: else bind_array_variable (name, 0, value, aflags); } +Roman Rakus writes: +> Repeated in the bash-4.0.38 and bash-4.1.7 by the script; +> #!/bin/bash +> +> typeset -Ai s +> y='*' +> z='[' +> s[$y]=1 +> s[$z]=2 +> (( s[$z] = s[$z] + ${s[$y]} )) +> (( s[$y] = s[$y] + ${s[$z]} )) +> [[ ${s[$y]} = 4 ]] && echo "ok" + +--- variables.c ++++ variables.c 2010-07-29 15:03:48.671425922 +0000 +@@ -2398,7 +2398,7 @@ bind_int_variable (lhs, rhs) + #endif + v = bind_variable (lhs, rhs, 0); + +- if (isint) ++ if (isint && v) + VSETATTR (v, att_integer); + + return (v); diff --git a/bash.changes b/bash.changes index 93e6ab3e..682f3f5c 100644 --- a/bash.changes +++ b/bash.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 29 17:06:51 CEST 2010 - werner@suse.de + +- Add fix from mailing list to avoid crash + ------------------------------------------------------------------- Mon Jul 19 09:54:50 CEST 2010 - werner@suse.de diff --git a/bash.spec b/bash.spec index 629eda9c..8f769e05 100644 --- a/bash.spec +++ b/bash.spec @@ -36,7 +36,7 @@ Suggests: bash-doc = %bash_vers %endif AutoReqProv: on Version: 4.1 -Release: 7 +Release: 12 Summary: The GNU Bourne-Again Shell Url: http://www.gnu.org/software/bash/bash.html Source0: ftp://ftp.gnu.org/gnu/bash/bash-%{bash_vers}.tar.bz2 @@ -104,7 +104,7 @@ Group: Documentation/Man Provides: bash:%{_infodir}/bash.info.gz PreReq: %install_info_prereq Version: 4.1 -Release: 7 +Release: 12 AutoReqProv: on %if %suse_version > 1120 BuildArch: noarch @@ -140,7 +140,7 @@ License: GPLv2+ Summary: Include Files mandatory for Development of bash loadable builtins Group: Development/Languages/C and C++ Version: 4.1 -Release: 7 +Release: 12 AutoReqProv: on %description -n bash-devel @@ -160,7 +160,7 @@ License: GPLv2+ Summary: Loadable bash builtins Group: System/Shells Version: 4.1 -Release: 7 +Release: 12 AutoReqProv: on %description -n bash-loadables @@ -229,7 +229,7 @@ Summary: The Readline Library Group: System/Libraries Provides: bash:/%{_lib}/libreadline.so.%{rl_major} Version: 6.1 -Release: 7 +Release: 12 %if %suse_version > 1020 Recommends: readline-doc = %{version} %endif @@ -260,7 +260,7 @@ Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/C and C++ Provides: bash:%{_libdir}/libreadline.a Version: 6.1 -Release: 7 +Release: 12 Requires: libreadline6 = %{version} Requires: ncurses-devel %if %suse_version > 1020 @@ -291,7 +291,7 @@ Group: System/Libraries Provides: readline:%{_infodir}/readline.info.gz PreReq: %install_info_prereq Version: 6.1 -Release: 7 +Release: 12 AutoReqProv: on %if %suse_version > 1120 BuildArch: noarch