Hello community, here is the log from the commit of package bash checked in at Sun May 21 18:59:22 CEST 2006. -------- --- bash/bash.changes 2006-04-03 12:45:25.000000000 +0200 +++ bash/bash.changes 2006-05-15 17:57:55.000000000 +0200 @@ -1,0 +2,7 @@ +Mon May 15 17:16:37 CEST 2006 - werner@suse.de + +- Update bash 3.1 to patch level 17 + * Allow array subscripts to be sourounded by double quotes +- Run test suite with nearly all scripts + +------------------------------------------------------------------- New: ---- run-tests ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bash.spec ++++++ --- /var/tmp/diff_new_pack.tSyP8y/_old 2006-05-21 18:59:13.000000000 +0200 +++ /var/tmp/diff_new_pack.tSyP8y/_new 2006-05-21 18:59:13.000000000 +0200 @@ -16,7 +16,7 @@ Requires: readline >= 5.1 Autoreqprov: on Version: 3.1 -Release: 18 +Release: 24 %define bash_vers 3.1 %define rl_vers 5.1 Summary: The GNU Bourne-Again Shell @@ -25,6 +25,7 @@ Source1: readline-%{rl_vers}.tar.bz2 Source2: bash-%{bash_vers}-patches.tar.bz2 Source3: readline-%{rl_vers}-patches.tar.bz2 +Source4: run-tests Patch0: bash-%{bash_vers}.dif Patch1: bash-2.03-manual.patch Patch2: bash-2.05a-security.patch @@ -63,7 +64,7 @@ Group: System/Libraries Provides: bash:/lib/libreadline.so.5 Version: 5.1 -Release: 18 +Release: 24 Autoreqprov: on %description -n readline @@ -83,7 +84,7 @@ Group: Development/Libraries/C and C++ Provides: bash:/usr/lib/libreadline.a Version: 5.1 -Release: 18 +Release: 24 Requires: readline = %{version}-%{release} Autoreqprov: on @@ -209,7 +210,7 @@ $READLINE %if %do_profiling make CFLAGS="$CFLAGS "%cflags_profile_generate - make TESTSCRIPT=run-minimal check + env -i TERM=$TERM make TESTSCRIPT=%{SOURCE4} check make clean make CFLAGS="$CFLAGS "%cflags_profile_feedback %else @@ -310,6 +311,10 @@ %doc %{_mandir}/man3/readline.3.gz %changelog -n bash +* Mon May 15 2006 - werner@suse.de +- Update bash 3.1 to patch level 17 + * Allow array subscripts to be sourounded by double quotes +- Run test suite with nearly all scripts * Mon Apr 03 2006 - werner@suse.de - Update bash 3.1 to patch level 16 * Bash will dump core when attempting to perform globbing in ++++++ bash-3.1-patches.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bash-3.1-patches/bash31-017 new/bash-3.1-patches/bash31-017 --- old/bash-3.1-patches/bash31-017 1970-01-01 01:00:00.000000000 +0100 +++ new/bash-3.1-patches/bash31-017 2006-04-12 17:26:55.000000000 +0200 @@ -0,0 +1,131 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 3.1 +Patch-ID: bash31-017 + +Bug-Reported-by: syphir@syphir.sytes.net +Bug-Reference-ID: <442421F5.3010105@syphir.sytes.net> +Bug-Reference-URL: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=358831 + +Bug-Description: + +Array expansion fails with an arithmetic syntax error when the subscript +appears within double quotes. For example: ${a["4"]}. + +Patch: + +*** ../bash-3.1-patched/subst.c Wed Apr 12 08:47:08 2006 +--- subst.c Wed Apr 12 08:49:02 2006 +*************** +*** 2576,2579 **** +--- 2576,2586 ---- + } + ++ char * ++ expand_arith_string (string, quoted) ++ char *string; ++ { ++ return (expand_string_if_necessary (string, quoted, expand_string)); ++ } ++ + #if defined (COND_COMMAND) + /* Just remove backslashes in STRING. Returns a new string. */ +*************** +*** 5249,5253 **** + t = (char *)0; + +! temp1 = expand_string_if_necessary (substr, Q_DOUBLE_QUOTES, expand_string); + *e1p = evalexp (temp1, &expok); + free (temp1); +--- 5256,5260 ---- + t = (char *)0; + +! temp1 = expand_arith_string (substr, Q_DOUBLE_QUOTES); + *e1p = evalexp (temp1, &expok); + free (temp1); +*************** +*** 5294,5298 **** + t++; + temp2 = savestring (t); +! temp1 = expand_string_if_necessary (temp2, Q_DOUBLE_QUOTES, expand_string); + free (temp2); + t[-1] = ':'; +--- 5301,5305 ---- + t++; + temp2 = savestring (t); +! temp1 = expand_arith_string (temp2, Q_DOUBLE_QUOTES); + free (temp2); + t[-1] = ':'; +*************** +*** 6436,6440 **** + + /* Expand variables found inside the expression. */ +! temp1 = expand_string_if_necessary (temp2, Q_DOUBLE_QUOTES, expand_string); + free (temp2); + +--- 6443,6447 ---- + + /* Expand variables found inside the expression. */ +! temp1 = expand_arith_string (temp2, Q_DOUBLE_QUOTES); + free (temp2); + +*************** +*** 6478,6482 **** + + /* Do initial variable expansion. */ +! temp1 = expand_string_if_necessary (temp, Q_DOUBLE_QUOTES, expand_string); + + goto arithsub; +--- 6485,6489 ---- + + /* Do initial variable expansion. */ +! temp1 = expand_arith_string (temp, Q_DOUBLE_QUOTES); + + goto arithsub; +*** ../bash-3.1-patched/subst.h Sun Nov 7 15:12:28 2004 +--- subst.h Mon Mar 27 09:10:38 2006 +*************** +*** 152,155 **** +--- 152,158 ---- + extern char *expand_assignment_string_to_string __P((char *, int)); + ++ /* Expand an arithmetic expression string */ ++ extern char *expand_arith_string __P((char *, int)); ++ + /* De-quoted quoted characters in STRING. */ + extern char *dequote_string __P((char *)); +*** ../bash-3.1-patched/arrayfunc.c Mon Jul 4 20:25:58 2005 +--- arrayfunc.c Mon Mar 27 09:10:47 2006 +*************** +*** 593,601 **** + strncpy (exp, s, len - 1); + exp[len - 1] = '\0'; +! #if 0 +! t = expand_string_to_string (exp, 0); +! #else +! t = expand_string_to_string (exp, Q_DOUBLE_QUOTES); +! #endif + this_command_name = (char *)NULL; + val = evalexp (t, &expok); +--- 591,595 ---- + strncpy (exp, s, len - 1); + exp[len - 1] = '\0'; +! t = expand_arith_string (exp, 0); + this_command_name = (char *)NULL; + val = evalexp (t, &expok); +*** ../bash-3.1/patchlevel.h Wed Jul 20 13:58:20 2005 +--- patchlevel.h Wed Dec 7 13:48:42 2005 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 16 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 17 + + #endif /* _PATCHLEVEL_H_ */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root@suse.de