Accepting request 34438 from Base:System

Copy from Base:System/bash based on submit request 34438 from user WernerFink

OBS-URL: https://build.opensuse.org/request/show/34438
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bash?expand=0&rev=53
This commit is contained in:
OBS User autobuild 2010-03-12 16:15:49 +00:00 committed by Git OBS Bridge
commit b3dd9b6684
3 changed files with 31 additions and 7 deletions

16
bash-4.1-completion.dif Normal file
View File

@ -0,0 +1,16 @@
--- bashline.c
+++ bashline.c 2010-03-09 14:11:27.612626475 +0000
@@ -1700,6 +1700,13 @@ globword:
return ((char *)NULL);
}
+ if (GLOB_FAILED (glob_matches) || glob_matches == 0)
+ {
+ glob_ignore_case = old_glob_ignore_case;
+ glob_matches = (char **)NULL;
+ return ((char *)NULL);
+ }
+
while (val = glob_matches[local_index++])
{
if (executable_or_directory (val))

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Mar 9 15:34:05 CET 2010 - werner@suse.de
- Add patch from bash-bug list to avoid crahs on some strange
TAB completions
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 2 00:45:53 CET 2010 - ro@suse.de Tue Mar 2 00:45:53 CET 2010 - ro@suse.de

View File

@ -28,7 +28,7 @@ Recommends: bash-lang = %bash_vers
Suggests: command-not-found Suggests: command-not-found
AutoReqProv: on AutoReqProv: on
Version: 4.1 Version: 4.1
Release: 3 Release: 4
Summary: The GNU Bourne-Again Shell Summary: The GNU Bourne-Again Shell
Url: http://www.gnu.org/software/bash/bash.html Url: http://www.gnu.org/software/bash/bash.html
Source0: ftp://ftp.gnu.org/gnu/bash/bash-%{bash_vers}.tar.bz2 Source0: ftp://ftp.gnu.org/gnu/bash/bash-%{bash_vers}.tar.bz2
@ -51,6 +51,7 @@ Patch8: bash-4.0-async-bnc523667.dif
Patch9: bash-4.0-extended_quote.patch Patch9: bash-4.0-extended_quote.patch
Patch10: bash-3.2-printf.patch Patch10: bash-3.2-printf.patch
Patch11: bash-4.0-loadables.dif Patch11: bash-4.0-loadables.dif
Patch12: bash-4.1-completion.dif
Patch14: bash-3.2-sigrestart.patch Patch14: bash-3.2-sigrestart.patch
Patch15: bash-3.2-longjmp.dif Patch15: bash-3.2-longjmp.dif
Patch16: bash-4.0-setlocale.dif Patch16: bash-4.0-setlocale.dif
@ -92,7 +93,7 @@ Group: Documentation/Man
Provides: bash:%{_infodir}/bash.info.gz Provides: bash:%{_infodir}/bash.info.gz
PreReq: %install_info_prereq PreReq: %install_info_prereq
Version: 4.1 Version: 4.1
Release: 3 Release: 4
AutoReqProv: on AutoReqProv: on
%if %suse_version > 1120 %if %suse_version > 1120
BuildArch: noarch BuildArch: noarch
@ -115,7 +116,7 @@ License: GPLv2+
Summary: Include Files mandatory for Development of bash loadable builtins Summary: Include Files mandatory for Development of bash loadable builtins
Group: Development/Languages/C and C++ Group: Development/Languages/C and C++
Version: 4.1 Version: 4.1
Release: 3 Release: 4
AutoReqProv: on AutoReqProv: on
%description -n bash-devel %description -n bash-devel
@ -135,7 +136,7 @@ License: GPLv2+
Summary: Loadable bash builtins Summary: Loadable bash builtins
Group: System/Shells Group: System/Shells
Version: 4.1 Version: 4.1
Release: 3 Release: 4
AutoReqProv: on AutoReqProv: on
%description -n bash-loadables %description -n bash-loadables
@ -204,7 +205,7 @@ Summary: The Readline Library
Group: System/Libraries Group: System/Libraries
Provides: bash:/%{_lib}/libreadline.so.%{rl_major} Provides: bash:/%{_lib}/libreadline.so.%{rl_major}
Version: 6.1 Version: 6.1
Release: 3 Release: 4
Recommends: readline-doc = %{version} Recommends: readline-doc = %{version}
# bug437293 # bug437293
%ifarch ppc64 %ifarch ppc64
@ -233,7 +234,7 @@ Summary: Include Files and Libraries mandatory for Development
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Provides: bash:%{_libdir}/libreadline.a Provides: bash:%{_libdir}/libreadline.a
Version: 6.1 Version: 6.1
Release: 3 Release: 4
Requires: libreadline6 = %{version} Requires: libreadline6 = %{version}
Requires: ncurses-devel Requires: ncurses-devel
Recommends: readline-doc = %{version} Recommends: readline-doc = %{version}
@ -262,7 +263,7 @@ Group: System/Libraries
Provides: readline:%{_infodir}/readline.info.gz Provides: readline:%{_infodir}/readline.info.gz
PreReq: %install_info_prereq PreReq: %install_info_prereq
Version: 6.1 Version: 6.1
Release: 3 Release: 4
AutoReqProv: on AutoReqProv: on
%if %suse_version > 1120 %if %suse_version > 1120
BuildArch: noarch BuildArch: noarch
@ -297,6 +298,7 @@ unset p
%patch9 -p0 -b .extended_quote %patch9 -p0 -b .extended_quote
%patch10 -p0 -b .printf %patch10 -p0 -b .printf
%patch11 -p0 -b .plugins %patch11 -p0 -b .plugins
%patch12 -p0 -b .completion
%patch14 -p0 -b .sigrestart %patch14 -p0 -b .sigrestart
%patch15 -p0 -b .longjmp %patch15 -p0 -b .longjmp
%patch16 -p0 -b .setlocale %patch16 -p0 -b .setlocale