Author: arekm Date: Wed Oct 28 19:53:40 2009 GMT Module: packages Tag: HEAD ---- Log message: - up to 4.0.35
---- Files affected: packages/bash: bash.spec (1.201 -> 1.202) , bash40-034 (NONE -> 1.1) (NEW), bash40-035 (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/bash/bash.spec diff -u packages/bash/bash.spec:1.201 packages/bash/bash.spec:1.202 --- packages/bash/bash.spec:1.201 Thu Sep 17 23:29:20 2009 +++ packages/bash/bash.spec Wed Oct 28 20:53:34 2009 @@ -6,7 +6,7 @@ %bcond_without tests # do not perform "make test" # %define ver 4.0 -%define patchlevel 33 +%define patchlevel 35 %define rel 1 Summary: GNU Bourne Again Shell (bash) Summary(fr.UTF-8): Le shell Bourne Again de GNU @@ -316,6 +316,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.202 2009/10/28 19:53:34 arekm +- up to 4.0.35 + Revision 1.201 2009/09/17 21:29:20 arekm - up to 4.0.33 ================================================================ Index: packages/bash/bash40-034 diff -u /dev/null packages/bash/bash40-034:1.1 --- /dev/null Wed Oct 28 20:53:40 2009 +++ packages/bash/bash40-034 Wed Oct 28 20:53:34 2009 @@ -0,0 +1,59 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.0 +Patch-ID: bash40-034 + +Bug-Reported-by: Anders Kaseorg <[email protected]> +Bug-Reference-ID: <[email protected]> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-09/msg00043.html + +Bug-Description: + +When using the globstar option, bash incorrectly interprets wildcarded path +components between a **/ and the last / as matching any path, even if the +constructed path does not match any files. + +Patch: + +*** ../bash-4.0-patched/lib/glob/glob.c 2009-07-22 23:18:50.000000000 -0400 +--- lib/glob/glob.c 2009-09-18 17:53:25.000000000 -0400 +*************** +*** 920,928 **** + char **temp_results; + + /* Scan directory even on a NULL filename. That way, `*h/' + returns only directories ending in `h', instead of all + files ending in `h' with a `/' appended. */ + dname = directories[i]; +! dflags = flags & ~GX_MARKDIRS; + if ((flags & GX_GLOBSTAR) && filename[0] == '*' && filename[1] == '*' && filename[2] == '\0') + dflags |= GX_ALLDIRS|GX_ADDCURDIR; +--- 927,938 ---- + char **temp_results; + ++ /* XXX -- we've recursively scanned any directories resulting from ++ a `**', so turn off the flag. We turn it on again below if ++ filename is `**' */ + /* Scan directory even on a NULL filename. That way, `*h/' + returns only directories ending in `h', instead of all + files ending in `h' with a `/' appended. */ + dname = directories[i]; +! dflags = flags & ~(GX_MARKDIRS|GX_ALLDIRS|GX_ADDCURDIR); + if ((flags & GX_GLOBSTAR) && filename[0] == '*' && filename[1] == '*' && filename[2] == '\0') + dflags |= GX_ALLDIRS|GX_ADDCURDIR; +*** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500 +--- patchlevel.h 2009-02-22 16:11:31.000000000 -0500 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 33 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 34 + + #endif /* _PATCHLEVEL_H_ */ ================================================================ Index: packages/bash/bash40-035 diff -u /dev/null packages/bash/bash40-035:1.1 --- /dev/null Wed Oct 28 20:53:40 2009 +++ packages/bash/bash40-035 Wed Oct 28 20:53:34 2009 @@ -0,0 +1,62 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.0 +Patch-ID: bash40-035 + +Bug-Reported-by: Freddy Vulto <[email protected]> +Bug-Reference-ID: <[email protected]> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-09/msg00044.html + +Bug-Description: + +Bash-4.0 incorrectly treated single and double quotes as delimiters rather +than introducing quoted strings when splitting the line into words for +programmable completion functions. + +Patch: + +*** ../bash-4.0-patched/pcomplete.c 2009-03-08 21:24:31.000000000 -0400 +--- pcomplete.c 2009-09-26 16:30:16.000000000 -0400 +*************** +*** 1176,1186 **** + WORD_LIST *ret; + char *delims; + +! #if 0 +! delims = "()<>;&| \t\n"; /* shell metacharacters break words */ +! #else +! delims = rl_completer_word_break_characters; +! #endif + ret = split_at_delims (line, llen, delims, sentinel, nwp, cwp); + return (ret); + } +--- 1176,1188 ---- + WORD_LIST *ret; + char *delims; ++ int i, j; + +! delims = xmalloc (strlen (rl_completer_word_break_characters) + 1); +! for (i = j = 0; rl_completer_word_break_characters[i]; i++) +! if (rl_completer_word_break_characters[i] != '\'' && rl_completer_word_break_characters[i] != '"') +! delims[j++] = rl_completer_word_break_characters[i]; +! delims[j] = '\0'; + ret = split_at_delims (line, llen, delims, sentinel, nwp, cwp); ++ free (delims); + return (ret); + } +*** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500 +--- patchlevel.h 2009-02-22 16:11:31.000000000 -0500 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 34 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 35 + + #endif /* _PATCHLEVEL_H_ */ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bash/bash.spec?r1=1.201&r2=1.202&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
