diff --git a/bash-4.0-parenthese.dif b/bash-4.0-parenthese.dif deleted file mode 100644 index f64966e..0000000 --- a/bash-4.0-parenthese.dif +++ /dev/null @@ -1,14 +0,0 @@ ---- parse.y -+++ parse.y 2009-03-04 13:05:43.128904662 +0000 -@@ -3420,6 +3420,11 @@ eof_error: - RESIZE_MALLOCED_BUFFER (ret, retind, 2, retsize, 64); - if MBTEST(ch == CTLESC || ch == CTLNUL) - ret[retind++] = CTLESC; -+ else if MBTEST(ch == close && (tflags & LEX_INCASE) == 0) -+{ -+ count--; -+/*itrace("parse_comsub:%d: found close: count = %d", line_number, count);*/ -+} - ret[retind++] = ch; - continue; - } diff --git a/bash-4.0-patches.tar.bz2 b/bash-4.0-patches.tar.bz2 index 84c997b..17fa87c 100644 --- a/bash-4.0-patches.tar.bz2 +++ b/bash-4.0-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8576ac72c83ab0e295f1b2101a79251e808cc505a7ce0dce4f99ce24a7935d44 -size 128 +oid sha256:edcca232666f913366fb75f95c08c1a4275c29de0e464dae77fa8bec72bc8314 +size 3959 diff --git a/bash.changes b/bash.changes index 3d09b61..082c78e 100644 --- a/bash.changes +++ b/bash.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 4 17:36:35 CET 2009 - werner@suse.de + +- Use patches from bug-bash@gnu.org to make it work + ------------------------------------------------------------------- Wed Mar 4 15:05:40 CET 2009 - werner@suse.de diff --git a/bash.spec b/bash.spec index 64675df..8128843 100644 --- a/bash.spec +++ b/bash.spec @@ -27,7 +27,7 @@ Recommends: bash-doc = %bash_vers Suggests: command-not-found AutoReqProv: on Version: 4.0 -Release: 4 +Release: 6 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 @@ -53,7 +53,6 @@ Patch14: bash-3.2-sigrestart.patch Patch15: bash-3.2-longjmp.dif Patch16: bash-4.0-setlocale.dif Patch17: bash-4.0-complete.dif -Patch18: bash-4.0-parenthese.dif Patch20: readline-%{rl_vers}.dif Patch21: readline-4.3-input.dif Patch22: readline-6.0-wrap.patch @@ -86,7 +85,7 @@ Group: Documentation/Man Provides: bash:%{_infodir}/bash.info.gz PreReq: %install_info_prereq Version: 4.0 -Release: 4 +Release: 6 AutoReqProv: on %description -n bash-doc @@ -106,7 +105,7 @@ Summary: The Readline Library Group: System/Libraries Provides: bash:/%{_lib}/libreadline.so.%{rl_major} Version: 6.0 -Release: 4 +Release: 6 Recommends: readline-doc = %{version} # bug437293 %ifarch ppc64 @@ -135,7 +134,7 @@ Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/C and C++ Provides: bash:%{_libdir}/libreadline.a Version: 6.0 -Release: 4 +Release: 6 Requires: libreadline6 = %{version} Requires: ncurses-devel Recommends: readline-doc = %{version} @@ -164,7 +163,7 @@ Group: System/Libraries Provides: readline:%{_infodir}/readline.info.gz PreReq: %install_info_prereq Version: 6.0 -Release: 4 +Release: 6 AutoReqProv: on %description -n readline-doc @@ -200,7 +199,6 @@ unset p %patch15 -p0 -b .longjmp %patch16 -p0 -b .setlocale %patch17 -p0 -b .complete -#%patch18 -p0 -b .parenthese %patch21 -p0 -b .zerotty %patch22 -p0 -b .wrap %patch23 -p0 -b .conf @@ -510,6 +508,8 @@ ldd -u -r %{buildroot}%{_libdir}/libreadline.so || true %changelog * Wed Mar 04 2009 werner@suse.de +- Use patches from bug-bash@gnu.org to make it work +* Wed Mar 04 2009 werner@suse.de - Patch for bnc#481817 does not work in any case * Wed Mar 04 2009 werner@suse.de - My last patch for bnc#470548 send to bug-bash@gnu.org was not