rpms/bash/devel bash.spec,1.112,1.113 bash31-010,1.1,1.2
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Mar 23 09:56:53 UTC 2006
Author: twaugh
Update of /cvs/dist/rpms/bash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11284
Modified Files:
bash.spec bash31-010
Log Message:
* Thu Mar 23 2006 Tim Waugh <twaugh at redhat.com>
- Patchlevel 14.
Index: bash.spec
===================================================================
RCS file: /cvs/dist/rpms/bash/devel/bash.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- bash.spec 2 Mar 2006 09:18:55 -0000 1.112
+++ bash.spec 23 Mar 2006 09:56:51 -0000 1.113
@@ -21,6 +21,10 @@
Patch8: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-008
Patch9: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-009
Patch10: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-010
+Patch11: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-011
+Patch12: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-012
+Patch13: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-013
+Patch14: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-014
# Other patches
Patch100: bash-2.03-paths.patch
Patch101: bash-2.02-security.patch
@@ -69,6 +73,10 @@
%patch8 -p0 -b .008
%patch9 -p0 -b .009
%patch10 -p0 -b .010
+%patch11 -p0 -b .011
+%patch12 -p0 -b .012
+%patch13 -p0 -b .013
+%patch14 -p0 -b .014
# Other patches
%patch100 -p1 -b .paths
@@ -220,6 +228,9 @@
%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
%changelog
+* Thu Mar 23 2006 Tim Waugh <twaugh at redhat.com>
+- Patchlevel 14.
+
* Thu Mar 2 2006 Tim Waugh <twaugh at redhat.com> 3.1-9
- Fixed duplicate documentation of ulimit '-x' option introduced by
ulimit patch (bug #183596).
Index: bash31-010
===================================================================
RCS file: /cvs/dist/rpms/bash/devel/bash31-010,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bash31-010 21 Feb 2006 10:36:42 -0000 1.1
+++ bash31-010 23 Mar 2006 09:56:51 -0000 1.2
@@ -16,27 +16,137 @@
processed. This patch restores a measure of backwards compatibility while
the question of POSIX conformance and ultimately correct behavior is discussed.
+THIS IS AN UPDATED PATCH. USE THIS COMMAND TO REVERSE THE EFFECTS OF
+THE ORIGINAL PATCH. THE CURRENT DIRECTORY MUST BE THE BASH-3.1 SOURCE
+DIRECTORY.
+
+patch -p0 -R < bash31-010.orig
+
+Then apply this patch as usual.
+
Patch:
*** ../bash-3.1/parse.y Fri Nov 11 23:14:18 2005
---- parse.y Wed Jan 25 14:55:18 2006
+--- parse.y Thu Feb 23 08:21:12 2006
+***************
+*** 2716,2721 ****
+--- 2723,2729 ----
+ #define P_ALLOWESC 0x02
+ #define P_DQUOTE 0x04
+ #define P_COMMAND 0x08 /* parsing a command, so look for comments */
++ #define P_BACKQUOTE 0x10 /* parsing a backquoted command substitution */
+
+ static char matched_pair_error;
+ static char *
+***************
+*** 2725,2736 ****
+ int *lenp, flags;
+ {
+ int count, ch, was_dollar, in_comment, check_comment;
+! int pass_next_character, nestlen, ttranslen, start_lineno;
+ char *ret, *nestret, *ttrans;
+ int retind, retsize, rflags;
+
+ count = 1;
+! pass_next_character = was_dollar = in_comment = 0;
+ check_comment = (flags & P_COMMAND) && qc != '\'' && qc != '"' && (flags & P_DQUOTE) == 0;
+
+ /* RFLAGS is the set of flags we want to pass to recursive calls. */
+--- 2733,2744 ----
+ int *lenp, flags;
+ {
+ int count, ch, was_dollar, in_comment, check_comment;
+! int pass_next_character, backq_backslash, nestlen, ttranslen, start_lineno;
+ char *ret, *nestret, *ttrans;
+ int retind, retsize, rflags;
+
+ count = 1;
+! pass_next_character = backq_backslash = was_dollar = in_comment = 0;
+ check_comment = (flags & P_COMMAND) && qc != '\'' && qc != '"' && (flags & P_DQUOTE) == 0;
+
+ /* RFLAGS is the set of flags we want to pass to recursive calls. */
+***************
+*** 2742,2752 ****
+ start_lineno = line_number;
+ while (count)
+ {
+! #if 0
+! ch = shell_getc ((qc != '\'' || (flags & P_ALLOWESC)) && pass_next_character == 0);
+! #else
+! ch = shell_getc (qc != '\'' && pass_next_character == 0);
+! #endif
+ if (ch == EOF)
+ {
+ free (ret);
+--- 2750,2757 ----
+ start_lineno = line_number;
+ while (count)
+ {
+! ch = shell_getc (qc != '\'' && pass_next_character == 0 && backq_backslash == 0);
+!
+ if (ch == EOF)
+ {
+ free (ret);
***************
-*** 2899,2903 ****
+*** 2771,2779 ****
+ continue;
+ }
+ /* Not exactly right yet */
+! else if (check_comment && in_comment == 0 && ch == '#' && (retind == 0 || ret[retind-1] == '\n' || whitespace (ret[retind -1])))
+ in_comment = 1;
+
+ if (pass_next_character) /* last char was backslash */
+ {
+ pass_next_character = 0;
+--- 2776,2791 ----
+ continue;
+ }
+ /* Not exactly right yet */
+! else if MBTEST(check_comment && in_comment == 0 && ch == '#' && (retind == 0 || ret[retind-1] == '\n' || whitespace (ret[retind - 1])))
+ in_comment = 1;
+
++ /* last char was backslash inside backquoted command substitution */
++ if (backq_backslash)
++ {
++ backq_backslash = 0;
++ /* Placeholder for adding special characters */
++ }
++
+ if (pass_next_character) /* last char was backslash */
+ {
+ pass_next_character = 0;
+***************
+*** 2814,2819 ****
+--- 2824,2831 ----
+ {
+ if MBTEST((flags & P_ALLOWESC) && ch == '\\')
+ pass_next_character++;
++ else if MBTEST((flags & P_BACKQUOTE) && ch == '\\')
++ backq_backslash++;
+ continue;
+ }
+
+***************
+*** 2898,2904 ****
+ }
else if MBTEST(qc == '`' && (ch == '"' || ch == '\'') && in_comment == 0)
{
! nestret = parse_matched_pair (0, ch, ch, &nestlen, rflags);
goto add_nestret;
}
---- 2901,2909 ----
+ else if MBTEST(was_dollar && (ch == '(' || ch == '{' || ch == '[')) /* ) } ] */
+--- 2910,2920 ----
+ }
else if MBTEST(qc == '`' && (ch == '"' || ch == '\'') && in_comment == 0)
{
-! /* Add P_ALLOWESC so backslash quotes the next character and
+! /* Add P_BACKQUOTE so backslash quotes the next character and
! shell_getc does the right thing with \<newline>. We do this for
! a measure of backwards compatibility -- it's not strictly the
! right POSIX thing. */
-! nestret = parse_matched_pair (0, ch, ch, &nestlen, rflags|P_ALLOWESC);
+! nestret = parse_matched_pair (0, ch, ch, &nestlen, rflags|P_BACKQUOTE);
goto add_nestret;
}
+ else if MBTEST(was_dollar && (ch == '(' || ch == '{' || ch == '[')) /* ) } ] */
*** ../bash-3.1/patchlevel.h Wed Jul 20 13:58:20 2005
--- patchlevel.h Wed Dec 7 13:48:42 2005
***************
More information about the fedora-cvs-commits
mailing list