diff --git a/bash-4.0-backport_bash41-003.patch b/bash-4.0-backport_bash41-003.patch new file mode 100644 index 0000000..253160f --- /dev/null +++ b/bash-4.0-backport_bash41-003.patch @@ -0,0 +1,12 @@ +diff -up bash-4.0/bashline.c.backport bash-4.0/bashline.c +--- bash-4.0/bashline.c.backport 2010-05-21 18:40:36.000000000 +0200 ++++ bash-4.0/bashline.c 2010-05-21 18:40:49.000000000 +0200 +@@ -1669,7 +1669,7 @@ globword: + a single match (multiple matches that end up reducing the number of + characters in the common prefix are bad) will ever be returned on + regular completion. */ +- if (glob_pattern_p (hint)) ++ if (globpat) + { + if (state == 0) + { diff --git a/bash.spec b/bash.spec index d181512..d1b24ec 100644 --- a/bash.spec +++ b/bash.spec @@ -5,7 +5,7 @@ Version: %{baseversion}%{patchlevel} Name: bash Summary: The GNU Bourne Again shell -Release: 3%{?dist} +Release: 4%{?dist} Group: System Environment/Shells License: GPLv2+ Url: http://www.gnu.org/software/bash @@ -81,6 +81,9 @@ Patch123: bash-4.0-nobits.patch # 530911, bash was segfaulting when TERM=eterm* and EMACS was unset Patch124: bash-4.0-emacs.patch +# 590627, backport bash41-003 patch +Patch125: bash-4.0-backport_bash41-003.patch + Requires(post): ncurses-libs BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -331,6 +334,9 @@ fi #%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt %changelog +* Fri May 21 2010 Roman Rakus - 4.0.35-4 +- Backport bash41-003 patch to fix completion bug (#590627) + * Tue Mar 30 2010 Roman Rakus - 4.0.35-3 - Corrected requires patch (#563301)