Hello community, here is the log from the commit of package bash for openSUSE:Factory checked in at Wed Jun 22 10:46:35 CEST 2011.
-------- --- bash/bash.changes 2011-03-22 13:17:49.000000000 +0100 +++ /mounts/work_src_done/STABLE/bash/bash.changes 2011-06-21 19:03:05.000000000 +0200 @@ -1,0 +2,23 @@ +Tue Jun 21 18:58:56 CEST 2011 - wer...@suse.de + +- Add fix from upstream mailing list to avoid crash + +------------------------------------------------------------------- +Fri Jun 17 11:43:00 UTC 2011 - co...@novell.com + +- use original source URLs + +------------------------------------------------------------------- +Thu Jun 16 15:03:04 CEST 2011 - wer...@suse.de + +- Fix the fix for bug bnc#681286 to be able to avoid both a not + expanding glob as well as the infinit loop in multi byte locale + +------------------------------------------------------------------- +Thu May 12 12:04:28 CEST 2011 - wer...@suse.de + +- Update bash 4.2 to patch level 10 +- Add patch from upstream to avoid loosing quoted-nulls +- Add modified patch to avod endless loop in UTF-8 locale + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- bash-4.2.tar.bz2 readline-6.2.tar.bz2 New: ---- _service:download_files:bash-4.2.tar.gz _service:download_files:readline-6.2.tar.gz bash-4.2.tar.gz readline-6.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bash.spec ++++++ --- /var/tmp/diff_new_pack.MHtiet/_old 2011-06-22 10:46:23.000000000 +0200 +++ /var/tmp/diff_new_pack.MHtiet/_new 2011-06-22 10:46:23.000000000 +0200 @@ -37,11 +37,11 @@ %endif AutoReqProv: on Version: 4.2 -Release: 4 +Release: 5 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 -Source1: ftp://ftp.gnu.org/gnu/readline/readline-%{rl_vers}.tar.bz2 +Source0: ftp://ftp.gnu.org/gnu/bash/bash-%{bash_vers}.tar.gz +Source1: ftp://ftp.gnu.org/gnu/readline/readline-%{rl_vers}.tar.gz Source2: bash-%{bash_vers}-patches.tar.bz2 Source3: readline-%{rl_vers}-patches.tar.bz2 Source4: run-tests @@ -106,7 +106,7 @@ Provides: bash:%{_infodir}/bash.info.gz PreReq: %install_info_prereq Version: 4.2 -Release: 4 +Release: 5 AutoReqProv: on %if %suse_version > 1120 BuildArch: noarch @@ -142,7 +142,7 @@ Summary: Include Files mandatory for Development of bash loadable builtins Group: Development/Languages/C and C++ Version: 4.2 -Release: 4 +Release: 5 AutoReqProv: on %description -n bash-devel @@ -162,7 +162,7 @@ Summary: Loadable bash builtins Group: System/Shells Version: 4.2 -Release: 4 +Release: 5 AutoReqProv: on %description -n bash-loadables @@ -231,7 +231,7 @@ Group: System/Libraries Provides: bash:/%{_lib}/libreadline.so.%{rl_major} Version: 6.2 -Release: 4 +Release: 5 %if %suse_version > 1020 Recommends: readline-doc = %{version} %endif @@ -262,7 +262,7 @@ Group: Development/Libraries/C and C++ Provides: bash:%{_libdir}/libreadline.a Version: 6.2 -Release: 4 +Release: 5 Requires: libreadline6 = %{version} Requires: ncurses-devel %if %suse_version > 1020 @@ -293,7 +293,7 @@ Provides: readline:%{_infodir}/readline.info.gz PreReq: %install_info_prereq Version: 6.2 -Release: 4 +Release: 5 AutoReqProv: on %if %suse_version > 1120 BuildArch: noarch ++++++ bash-4.2-patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bash-4.2-patches/bash-4.2-quoted-nulls.patch new/bash-4.2-patches/bash-4.2-quoted-nulls.patch --- old/bash-4.2-patches/bash-4.2-quoted-nulls.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/bash-4.2-patches/bash-4.2-quoted-nulls.patch 2011-05-12 10:59:19.000000000 +0200 @@ -0,0 +1,18 @@ +*** ../bash-4.2-patched/subst.c 2011-03-06 14:11:11.000000000 -0500 +--- subst.c 2011-05-11 11:23:33.000000000 -0400 +*************** +*** 3707,3711 **** + } + else if (string[i] == CTLNUL) +! i++; + + prev_i = i; +--- 3710,3717 ---- + } + else if (string[i] == CTLNUL) +! { +! i++; +! continue; +! } + + prev_i = i; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bash-4.2-patches/bash-4.2-read-assoc-array.patch new/bash-4.2-patches/bash-4.2-read-assoc-array.patch --- old/bash-4.2-patches/bash-4.2-read-assoc-array.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/bash-4.2-patches/bash-4.2-read-assoc-array.patch 2011-06-21 18:54:47.000000000 +0200 @@ -0,0 +1,40 @@ +*** ../bash-4.2-patched/builtins/read.def 2011-01-04 11:43:36.000000000 -0500 +--- builtins/read.def 2011-06-21 10:31:02.000000000 -0400 +*************** +*** 456,460 **** + add_unwind_protect (xfree, input_string); + interrupt_immediately++; +- terminate_immediately++; + + unbuffered_read = (nchars > 0) || (delim != '\n') || input_is_pipe; +--- 456,459 ---- +*************** +*** 513,516 **** +--- 512,516 ---- + if (retval <= 0) + { ++ CHECK_TERMSIG; + eof = 1; + break; +*************** +*** 623,627 **** + + interrupt_immediately--; +- terminate_immediately--; + + #if defined (ARRAY_VARS) +--- 623,626 ---- +*************** +*** 643,646 **** +--- 642,651 ---- + return EXECUTION_FAILURE; /* readonly or noassign */ + } ++ if (assoc_p (var)) ++ { ++ builtin_error (_("%s: cannot convert associative to indexed array"), arrayname); ++ xfree (input_string); ++ return EXECUTION_FAILURE; /* existing associative array */ ++ } + array_flush (array_cell (var)); + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bash-4.2-patches/bash-4.2-xdupmbstowcs2.patch new/bash-4.2-patches/bash-4.2-xdupmbstowcs2.patch --- old/bash-4.2-patches/bash-4.2-xdupmbstowcs2.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/bash-4.2-patches/bash-4.2-xdupmbstowcs2.patch 2011-06-16 15:02:11.000000000 +0200 @@ -0,0 +1,61 @@ +--- lib/glob/glob.c ++++ lib/glob/glob.c 2011-06-16 14:37:49.223929065 +0200 +@@ -258,7 +258,7 @@ + { + mbstate_t ps; + size_t len, n; +- wchar_t *wpathname; ++ wchar_t *wpathname = (wchar_t*)0; + int i, j; + wchar_t *orig_wpathname; + +--- lib/glob/xmbsrtowcs.c ++++ lib/glob/xmbsrtowcs.c 2011-06-16 14:38:29.719925447 +0200 +@@ -176,11 +176,21 @@ + /* Conversion failed. */ + if (wcslength == (size_t)-1) + { +- free (wsbuf); ++ if (wsbuf) ++ free (wsbuf); + *destp = NULL; + return (size_t)-1; + } + ++ /* Conversion failed. */ ++ if (wcslength == 0) ++ { ++ if (wsbuf) ++ free (wsbuf); ++ *destp = NULL; ++ return (size_t)-2; ++ } ++ + /* Resize the buffer if it is not large enough. */ + if (wsbuf_size < wcnum+wcslength+1) /* 1 for the L'\0' or the potential L'\\' */ + { +@@ -191,7 +201,8 @@ + wstmp = (wchar_t *) realloc (wsbuf, wsbuf_size * sizeof (wchar_t)); + if (wstmp == NULL) + { +- free (wsbuf); ++ if (wsbuf) ++ free (wsbuf); + *destp = NULL; + return (size_t)-1; + } +@@ -260,7 +265,13 @@ + + #if HAVE_MBSNRTOWCS + if (indicesp == NULL) +- return (xdupmbstowcs2 (destp, src)); ++ { ++ size_t ret = (xdupmbstowcs2 (destp, src)); ++ if (ret == (size_t)-1) ++ return ret; ++ if (ret != (size_t)-2) ++ return ret; ++ } + #endif + + memset (&state, '\0', sizeof(mbstate_t)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bash-4.2-patches/bash42-009 new/bash-4.2-patches/bash42-009 --- old/bash-4.2-patches/bash42-009 1970-01-01 01:00:00.000000000 +0100 +++ new/bash-4.2-patches/bash42-009 2011-05-03 18:07:03.000000000 +0200 @@ -0,0 +1,82 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-009 + +Bug-Reported-by: <pi...@piumalab.org> +Bug-Reference-ID: <4daac0db.7060...@piumalab.org> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-04/msg00075.html + +Bug-Description: + +Under certain circumstances, running `fc -l' two times in succession with a +relative history offset at the end of the history will result in an incorrect +calculation of the last history entry and a seg fault. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/builtins/fc.def 2010-05-30 18:25:38.000000000 -0400 +--- builtins/fc.def 2011-04-19 15:46:17.000000000 -0400 +*************** +*** 305,309 **** + + /* XXX */ +! if (saved_command_line_count > 0 && i == last_hist && hlist[last_hist] == 0) + while (last_hist >= 0 && hlist[last_hist] == 0) + last_hist--; +--- 305,309 ---- + + /* XXX */ +! if (i == last_hist && hlist[last_hist] == 0) + while (last_hist >= 0 && hlist[last_hist] == 0) + last_hist--; +*************** +*** 476,480 **** + { + int sign, n, clen, rh; +! register int i, j; + register char *s; + +--- 476,480 ---- + { + int sign, n, clen, rh; +! register int i, j, last_hist; + register char *s; + +*************** +*** 496,500 **** + calculation as if it were on. */ + rh = remember_on_history || ((subshell_environment & SUBSHELL_COMSUB) && enable_history_list); +! i -= rh + hist_last_line_added; + + /* No specification defaults to most recent command. */ +--- 496,508 ---- + calculation as if it were on. */ + rh = remember_on_history || ((subshell_environment & SUBSHELL_COMSUB) && enable_history_list); +! last_hist = i - rh - hist_last_line_added; +! +! if (i == last_hist && hlist[last_hist] == 0) +! while (last_hist >= 0 && hlist[last_hist] == 0) +! last_hist--; +! if (last_hist < 0) +! return (-1); +! +! i = last_hist; + + /* No specification defaults to most recent command. */ +*** ../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 8 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 9 + + #endif /* _PATCHLEVEL_H_ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bash-4.2-patches/bash42-010 new/bash-4.2-patches/bash42-010 --- old/bash-4.2-patches/bash42-010 1970-01-01 01:00:00.000000000 +0100 +++ new/bash-4.2-patches/bash42-010 2011-05-03 18:07:15.000000000 +0200 @@ -0,0 +1,61 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-010 + +Bug-Reported-by: Mike Frysinger <vap...@gentoo.org> +Bug-Reference-ID: <201104122356.20160.vap...@gentoo.org> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-04/msg00058.html + +Bug-Description: + +Bash did not correctly print/reproduce here documents attached to commands +inside compound commands such as arithmetic for loops and user-specified +subshells. This affected the execution of such commands inside a shell +function when the function definition is saved and later restored using +`.' or `eval'. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/print_cmd.c 2010-05-30 18:34:08.000000000 -0400 +--- print_cmd.c 2011-04-14 10:43:18.000000000 -0400 +*************** +*** 316,319 **** +--- 317,321 ---- + skip_this_indent++; + make_command_string_internal (command->value.Subshell->command); ++ PRINT_DEFERRED_HEREDOCS (""); + cprintf (" )"); + break; +*************** +*** 593,596 **** +--- 606,610 ---- + indentation += indentation_amount; + make_command_string_internal (arith_for_command->action); ++ PRINT_DEFERRED_HEREDOCS (""); + semicolon (); + indentation -= indentation_amount; +*************** +*** 654,657 **** +--- 668,672 ---- + + make_command_string_internal (group_command->command); ++ PRINT_DEFERRED_HEREDOCS (""); + + if (inside_function_def) +*** ../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 9 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 10 + + #endif /* _PATCHLEVEL_H_ */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
