testing/bash
SHA256
3
0
Fork 0
forked from pool/bash
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bash?expand=0&rev=21

Browse Source
This commit is contained in:
OBS User unknown 2008-04-28 13:52:28 +00:00 committed by Git OBS Bridge
parent ec17651333
commit 113e6dc03a
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bash-3.2-longjmp.dif
View File

@ -1,5 +1,5 @@
--- execute_cmd.c --- execute_cmd.c.mm 2008-04-22 14:03:07.000000000 +0000
+++ execute_cmd.c 2008-04-25 12:49:28.000000000 +0000 +++ execute_cmd.c 2008-04-28 01:38:19.000000000 +0000
@@ -24,6 +24,7 @@ @@ -24,6 +24,7 @@
#endif /* _AIX && RISC6000 && !__GNUC__ */ #endif /* _AIX && RISC6000 && !__GNUC__ */
@ -8,7 +8,7 @@
#include "chartypes.h" #include "chartypes.h"
#include "bashtypes.h" #include "bashtypes.h"
#if !defined (_MINIX) && defined (HAVE_SYS_FILE_H) #if !defined (_MINIX) && defined (HAVE_SYS_FILE_H)
@@ -4014,6 +4014,20 @@ shell_execve (command, args, env) @@ -4013,6 +4014,23 @@ shell_execve (command, args, env)
/* We have committed to attempting to execute the contents of this file /* We have committed to attempting to execute the contents of this file
as shell commands. */ as shell commands. */
@ -16,6 +16,9 @@
+ larray = strvec_len(args) + 1; + larray = strvec_len(args) + 1;
+ args = strvec_resize(args, larray + 1); + args = strvec_resize(args, larray + 1);
+ +
+ for (i = larray - 1; i; i--)
+ args[i] = args[i - 1];
+
+ args[0] = savestring(_PATH_BSHELL); + args[0] = savestring(_PATH_BSHELL);
+ args[1] = command; + args[1] = command;
+ args[larray] = (char *)0; + args[larray] = (char *)0;
@ -29,7 +32,7 @@
initialize_subshell (); initialize_subshell ();
set_sigint_handler (); set_sigint_handler ();
@@ -4070,6 +4070,8 @@ shell_execve (command, args, env) @@ -4055,6 +4073,8 @@ shell_execve (command, args, env)
longjmp (subshell_top_level, 1); longjmp (subshell_top_level, 1);
/*NOTREACHED*/ /*NOTREACHED*/

5
bash.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Apr 28 03:42:11 CEST 2008 - matz@suse.de
- Fix last patch.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Apr 24 15:59:20 CEST 2008 - werner@suse.de Thu Apr 24 15:59:20 CEST 2008 - werner@suse.de

12
bash.spec
View File

@ -20,7 +20,7 @@ Group: System/Shells
Recommends: bash-doc = %bash_vers Recommends: bash-doc = %bash_vers
AutoReqProv: on AutoReqProv: on
Version: 3.2 Version: 3.2
Release: 101 Release: 103
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: bash-%{bash_vers}.tar.bz2 Source0: bash-%{bash_vers}.tar.bz2
@ -77,7 +77,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: 3.2 Version: 3.2
Release: 60 Release: 62
AutoReqProv: on AutoReqProv: on
%description -n bash-doc %description -n bash-doc
@ -97,7 +97,7 @@ Summary: The Readline Library
Group: System/Libraries Group: System/Libraries
Provides: bash:/%{_lib}/libreadline.so.5 Provides: bash:/%{_lib}/libreadline.so.5
Version: 5.2 Version: 5.2
Release: 60 Release: 62
Recommends: readline-doc = %{version} Recommends: readline-doc = %{version}
Provides: readline = 5.2 Provides: readline = 5.2
Obsoletes: readline <= 5.2 Obsoletes: readline <= 5.2
@ -121,7 +121,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: 5.2 Version: 5.2
Release: 101 Release: 103
Requires: libreadline5 = %{version} Requires: libreadline5 = %{version}
Requires: ncurses-devel Requires: ncurses-devel
Recommends: readline-doc = %{version} Recommends: readline-doc = %{version}
@ -145,7 +145,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: 5.2 Version: 5.2
Release: 60 Release: 62
AutoReqProv: on AutoReqProv: on
%description -n readline-doc %description -n readline-doc
@ -423,6 +423,8 @@ EOF
%doc %{_defaultdocdir}/readline/ %doc %{_defaultdocdir}/readline/
%changelog %changelog
* Mon Apr 28 2008 matz@suse.de
- Fix last patch.
* Thu Apr 24 2008 werner@suse.de * Thu Apr 24 2008 werner@suse.de
- Add workaround for bnc#382214 - Add workaround for bnc#382214
* Thu Apr 10 2008 ro@suse.de * Thu Apr 10 2008 ro@suse.de