Hello community, here is the log from the commit of package bash checked in at Mon Nov 13 16:39:52 CET 2006. -------- --- bash/bash.changes 2006-10-11 12:08:14.000000000 +0200 +++ /mounts/work_src_done/STABLE/bash/bash.changes 2006-11-13 16:27:52.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Nov 13 16:26:03 CET 2006 - werner@suse.de + +- Make backquote parser compatible with bash 2.05b, bash 3.00.16, + and bash 3.2.0 (#213127) + +------------------------------------------------------------------- New: ---- bash-3.1-backquote.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bash.spec ++++++ --- /var/tmp/diff_new_pack.ePm29d/_old 2006-11-13 16:35:52.000000000 +0100 +++ /var/tmp/diff_new_pack.ePm29d/_new 2006-11-13 16:35:52.000000000 +0100 @@ -11,12 +11,12 @@ # norootforbuild Name: bash -License: GPL +License: GNU General Public License (GPL) - all versions Group: System/Shells Requires: readline >= 5.1 Autoreqprov: on Version: 3.1 -Release: 39 +Release: 48 %define bash_vers 3.1 %define rl_vers 5.1 Summary: The GNU Bourne-Again Shell @@ -40,6 +40,7 @@ Patch11: bash-3.1-wcschr.dif Patch12: bash-3.1-printf.patch Patch13: bash-3.1-loadables.dif +Patch14: bash-3.1-backquote.patch Patch20: readline-%{rl_vers}.dif Patch21: readline-4.3-input.dif Patch22: readline-5.0-wrap.patch @@ -67,7 +68,7 @@ Group: System/Libraries Provides: bash:/lib/libreadline.so.5 Version: 5.1 -Release: 39 +Release: 48 Autoreqprov: on %description -n readline @@ -87,7 +88,7 @@ Group: Development/Libraries/C and C++ Provides: bash:/usr/lib/libreadline.a Version: 5.1 -Release: 39 +Release: 48 Requires: readline = %{version}-%{release}, %{_libdir}/libncurses.so Autoreqprov: on @@ -122,6 +123,7 @@ %patch11 -p0 -b .wcschr %patch12 -p0 -b .printf %patch13 -p0 -b .plugins +%patch14 -p0 -b .backquote for p in ../readline-%{rl_vers}-patches/*; do case "${p##*/}" in readline51-00[234]) @@ -332,6 +334,9 @@ %doc %{_mandir}/man3/readline.3.gz %changelog -n bash +* Mon Nov 13 2006 - werner@suse.de +- Make backquote parser compatible with bash 2.05b, bash 3.00.16, + and bash 3.2.0 (#213127) * Wed Sep 27 2006 - werner@suse.de - Use PIE to make a shared bash binary - Make the bash modules build for testing ++++++ bash-3.1-backquote.patch ++++++ --- parse.y +++ parse.y 2006-11-13 15:08:14.000000000 +0000 @@ -2819,8 +2819,10 @@ { if MBTEST((flags & P_ALLOWESC) && ch == '\\') pass_next_character++; +#if 0 else if MBTEST((flags & P_BACKQUOTE) && ch == '\\') backq_backslash++; +#endif continue; } @@ -2903,6 +2905,7 @@ } FREE (nestret); } +#if 0 else if MBTEST(qc == '`' && (ch == '"' || ch == '\'') && in_comment == 0) { /* Add P_BACKQUOTE so backslash quotes the next character and @@ -2912,7 +2915,8 @@ nestret = parse_matched_pair (0, ch, ch, &nestlen, rflags|P_BACKQUOTE); goto add_nestret; } - else if MBTEST(was_dollar && (ch == '(' || ch == '{' || ch == '[')) /* ) } ] */ +#endif + else if MBTEST(open != '`' && was_dollar && (ch == '(' || ch == '{' || ch == '[')) /* ) } ] */ /* check for $(), $[], or ${} inside quoted string. */ { if (open == ch) /* undo previous increment */ ++++++ bash-3.1.dif ++++++ --- /var/tmp/diff_new_pack.ePm29d/_old 2006-11-13 16:35:52.000000000 +0100 +++ /var/tmp/diff_new_pack.ePm29d/_new 2006-11-13 16:35:52.000000000 +0100 @@ -1,6 +1,7 @@ --- .pkgextract +++ .pkgextract 2006-03-27 14:15:25.000000000 +0200 -@@ -0,0 +1,14 @@ +@@ -0,0 +1,16 @@ ++tar Oxfj ../bash-3.1-patches.tar.bz2 | patch -p0 -s +patch -p0 -s --suffix=".manual" < ../bash-2.03-manual.patch +patch -p0 -s --suffix=".security" < ../bash-2.05a-security.patch +patch -p0 -s --suffix=".2.4.4" < ../bash-2.05-2.4.4.patch @@ -11,6 +12,7 @@ +patch -p0 -s --suffix=".decl" < ../bash-3.0-decl.patch +patch -p1 -s --suffix=".random2" < ../bash-3.1-random.patch +patch -p0 -s --suffix=".wcschr" < ../bash-3.1-wcschr.dif ++patch -p0 -s --suffix=".backquote"< ../bash-3.1-backquote.patch +patch -p0 -s --suffix=".zerotty" < ../readline-4.3-input.dif +patch -p0 -s --suffix=".wrap" < ../readline-5.0-wrap.patch +patch -p0 -s --suffix=".conf" < ../readline-5.0-conf.patch ++++++ readline-5.1.dif ++++++ --- /var/tmp/diff_new_pack.ePm29d/_old 2006-11-13 16:35:53.000000000 +0100 +++ /var/tmp/diff_new_pack.ePm29d/_new 2006-11-13 16:35:53.000000000 +0100 @@ -1,6 +1,7 @@ --- .pkgextract +++ .pkgextract 2005-12-09 17:09:26.000000000 +0100 -@@ -0,0 +1,5 @@ +@@ -0,0 +1,6 @@ ++tar Oxfj ../readline-5.1-patches.tar.bz2 | patch -p0 -s +patch -p2 -s --suffix=".zerotty" < ../readline-4.3-input.dif +patch -p2 -s --suffix=".wrap" < ../readline-5.0-wrap.patch +patch -p2 -s --suffix=".conf" < ../readline-5.0-conf.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@suse.de