- Back out rmatch change introduced in 3.2 (bug #220087).
- Resolves: rhbz#220087
This commit is contained in:
parent
287525434e
commit
2af880f07f
11
bash-cond-rmatch.patch
Normal file
11
bash-cond-rmatch.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- bash-3.2/execute_cmd.c.cond_rmatch 2007-01-19 16:29:03.000000000 +0000
|
||||||
|
+++ bash-3.2/execute_cmd.c 2007-01-19 16:29:25.000000000 +0000
|
||||||
|
@@ -2560,7 +2560,7 @@
|
||||||
|
arg1 = cond_expand_word (cond->left->op, 0);
|
||||||
|
if (arg1 == 0)
|
||||||
|
arg1 = nullstr;
|
||||||
|
- arg2 = cond_expand_word (cond->right->op, patmatch||rmatch);
|
||||||
|
+ arg2 = cond_expand_word (cond->right->op, patmatch);
|
||||||
|
if (arg2 == 0)
|
||||||
|
arg2 = nullstr;
|
||||||
|
|
@ -1,7 +1,7 @@
|
|||||||
Version: 3.2
|
Version: 3.2
|
||||||
Name: bash
|
Name: bash
|
||||||
Summary: The GNU Bourne Again shell (bash) version %{version}.
|
Summary: The GNU Bourne Again shell (bash) version %{version}.
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
Group: System Environment/Shells
|
Group: System Environment/Shells
|
||||||
License: GPL
|
License: GPL
|
||||||
Url: http://www.gnu.org/software/bash
|
Url: http://www.gnu.org/software/bash
|
||||||
@ -34,6 +34,7 @@ Patch117: bash-2.05b-debuginfo.patch
|
|||||||
Patch118: bash-tty-tests.patch
|
Patch118: bash-tty-tests.patch
|
||||||
Patch126: bash-setlocale.patch
|
Patch126: bash-setlocale.patch
|
||||||
Patch130: bash-infotags.patch
|
Patch130: bash-infotags.patch
|
||||||
|
Patch131: bash-cond-rmatch.patch
|
||||||
Prefix: %{_prefix}
|
Prefix: %{_prefix}
|
||||||
Requires: mktemp
|
Requires: mktemp
|
||||||
Obsoletes: bash2 etcskel
|
Obsoletes: bash2 etcskel
|
||||||
@ -79,6 +80,7 @@ compliance over previous versions.
|
|||||||
%patch118 -p1 -b .tty-tests
|
%patch118 -p1 -b .tty-tests
|
||||||
%patch126 -p1 -b .setlocale
|
%patch126 -p1 -b .setlocale
|
||||||
%patch130 -p1 -b .infotags
|
%patch130 -p1 -b .infotags
|
||||||
|
%patch131 -p1 -b .cond-rmatch
|
||||||
|
|
||||||
echo %{version} > _distribution
|
echo %{version} > _distribution
|
||||||
echo %{release} > _patchlevel
|
echo %{release} > _patchlevel
|
||||||
@ -207,6 +209,9 @@ fi
|
|||||||
%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
|
%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jan 19 2007 Tim Waugh <twaugh@redhat.com> 3.2-3
|
||||||
|
- Back out rmatch change introduced in 3.2 (bug #220087).
|
||||||
|
|
||||||
* Tue Jan 16 2007 Miroslav Lichvar <mlichvar@redhat.com> 3.2-2
|
* Tue Jan 16 2007 Miroslav Lichvar <mlichvar@redhat.com> 3.2-2
|
||||||
- Link with ncurses.
|
- Link with ncurses.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user