OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bash?expand=0&rev=32

bash-4.0-complete.dif

@@ -0,0 +1,10 @@
+--- pcomplete.c
++++ pcomplete.c	2009-03-04 11:58:05.296254166 +0000
+@@ -1032,6 +1032,7 @@ gen_shell_function_matches (cs, text, li
+   cmdlist = build_arg_list (funcname, text, lwords, cw);
+ 
+   pps = &ps;
++  save_parser_state (pps);
+   begin_unwind_frame ("gen-shell-function-matches");
+   add_unwind_protect (restore_parser_state, (char *)pps);
+   add_unwind_protect (dispose_words, (char *)cmdlist);

bash-4.0-parenthese.dif

@@ -0,0 +1,14 @@
+--- 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;
+ 	}

bash.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Mar  4 13:10:02 CET 2009 - werner@suse.de
+
+- My last patch for bnc#470548 send to bug-bash@gnu.org was not
+  fully applied and this had caused a memory corruption on tab
+  completion.
+- Enable the parser to find closing parenthesis at the end of
+  an argument of a command even if backslash is used (bnc#481817)
+- Correct link of shared libraries of devel readline package
+
 -------------------------------------------------------------------
 Fri Feb 27 17:39:08 CET 2009 - werner@suse.de
 

bash.spec

@@ -27,7 +27,7 @@ Recommends:     bash-doc = %bash_vers
 Suggests:       command-not-found
 AutoReqProv:    on
 Version:        4.0
-Release:        2
+Release:        3
 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
@@ -52,6 +52,8 @@ Patch11:        bash-4.0-loadables.dif
 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
@@ -84,7 +86,7 @@ Group:          Documentation/Man
 Provides:       bash:%{_infodir}/bash.info.gz
 PreReq:         %install_info_prereq
 Version:        4.0
-Release:        2
+Release:        3
 AutoReqProv:    on
 
 %description -n bash-doc
@@ -104,7 +106,7 @@ Summary:        The Readline Library
 Group:          System/Libraries
 Provides:       bash:/%{_lib}/libreadline.so.%{rl_major}
 Version:        6.0
-Release:        2
+Release:        3
 Recommends:     readline-doc = %{version}
 # bug437293
 %ifarch ppc64
@@ -133,7 +135,7 @@ Summary:        Include Files and Libraries mandatory for Development
 Group:          Development/Libraries/C and C++
 Provides:       bash:%{_libdir}/libreadline.a
 Version:        6.0
-Release:        2
+Release:        3
 Requires:       libreadline6 = %{version}
 Requires:       ncurses-devel
 Recommends:     readline-doc = %{version}
@@ -162,7 +164,7 @@ Group:          System/Libraries
 Provides:       readline:%{_infodir}/readline.info.gz
 PreReq:         %install_info_prereq
 Version:        6.0
-Release:        2
+Release:        3
 AutoReqProv:    on
 
 %description -n readline-doc
@@ -197,6 +199,8 @@ unset p
 %patch14 -p0 -b .sigrestart
 %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
@@ -377,10 +381,12 @@ cd ../readline-%{rl_vers}
   mkdir -p %{buildroot}%{_defaultdocdir}/bash
   chmod 0755 %{buildroot}/%{_lib}/libhistory.so.%{rl_vers}
   chmod 0755 %{buildroot}/%{_lib}/libreadline.so.%{rl_vers}
-  rm -f %{buildroot}/%{_lib}/libhistory.so.%{rl_vers}*old
+  rm -vf %{buildroot}/%{_lib}/libhistory.so.%{rl_vers}*old
-  rm -f %{buildroot}/%{_lib}/libreadline.so.%{rl_vers}*old
+  rm -vf %{buildroot}/%{_lib}/libreadline.so.%{rl_vers}*old
-  rm -f %{buildroot}/%{_lib}/libhistory.so
+  rm -vf %{buildroot}/%{_lib}/libhistory.so
-  rm -f %{buildroot}/%{_lib}/libreadline.so
+  rm -vf %{buildroot}/%{_lib}/libreadline.so
+  ln -sf /%{_lib}/libhistory.so.%{rl_vers}  %{buildroot}/%{_libdir}/libhistory.so
+  ln -sf /%{_lib}/libreadline.so.%{rl_vers} %{buildroot}/%{_libdir}/libreadline.so
 cd ../bash-%{bash_vers}
   make install DESTDIR=%{buildroot}
   mkdir -p %{buildroot}/bin
@@ -503,6 +509,13 @@ ldd -u -r %{buildroot}%{_libdir}/libreadline.so || true
 %doc %{_defaultdocdir}/readline/
 
 %changelog
+* Wed Mar 04 2009 werner@suse.de
+- My last patch for bnc#470548 send to bug-bash@gnu.org was not
+  fully applied and this had caused a memory corruption on tab
+  completion.
+- Enable the parser to find closing parenthesis at the end of
+  an argument of a command even if backslash is used (bnc#481817)
+- Correct link of shared libraries of devel readline package
 * Fri Feb 27 2009 werner@suse.de
 - Update bash 4.0 to patch level 0
 - Update readline 6.0 to patch level 0