From 8a8197ba7ac9310d7c574416d4249aaba9d02ea3e1475043631222f8a17834aa Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 2 Mar 2010 16:43:52 +0000 Subject: [PATCH 1/3] . OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=27 --- bash-4.1-intr.dif | 11 +++++++++++ run-tests | 14 ++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/bash-4.1-intr.dif b/bash-4.1-intr.dif index 6affafc..c646a12 100644 --- a/bash-4.1-intr.dif +++ b/bash-4.1-intr.dif @@ -145,3 +145,14 @@ } #ifdef USING_BASH_MALLOC +--- builtins/read.def ++++ builtins/read.def 2010-03-02 16:24:59.070362886 +0000 +@@ -387,6 +387,8 @@ read_builtin (list) + input_string. We want to run all the rest and use input_string, + so we have to remove it from the stack. */ + remove_unwind_protect (); ++ interrupt_immediately--; ++ terminate_immediately = 0; + run_unwind_frame ("read_builtin"); + input_string[i] = '\0'; /* make sure it's terminated */ + retval = 128+SIGALRM; diff --git a/run-tests b/run-tests index 81e9543..c4a2510 100644 --- a/run-tests +++ b/run-tests @@ -26,4 +26,18 @@ do esac done +trap 'rm -f $tmp' EXIT TERM INT QUIT +tmp=$(mktemp /tmp/hello.XXXXXXXX) || exit 1 +echo '#!/bin/sh' > $tmp +echo exit >> $tmp +chmod 755 $tmp +${THIS_SH} -c $tmp + +typeset -i count=500 +echo '#########################' +echo 'fork + /bin/sh -c runtime' +time while ((count-- > 0)) ; do + ${THIS_SH} -c $tmp +done +echo '#########################' exit 0 From 3c570a8132d3d17b03906993bc38cf4ccb8ead0c2b51aa93e587b57baa235159 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 4 Mar 2010 12:06:09 +0000 Subject: [PATCH 2/3] Accepting request 33734 from home:oertel:branches:Base:System Copy from home:oertel:branches:Base:System/bash via accept of submit request 33734 revision 2. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/33734 OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=28 --- bash-4.1-non_void.patch | 11 +++++++++++ bash.changes | 6 ++++++ bash.spec | 2 ++ 3 files changed, 19 insertions(+) create mode 100644 bash-4.1-non_void.patch diff --git a/bash-4.1-non_void.patch b/bash-4.1-non_void.patch new file mode 100644 index 0000000..c50b94f --- /dev/null +++ b/bash-4.1-non_void.patch @@ -0,0 +1,11 @@ +--- bashline.c 2010/03/01 23:44:28 1.1 ++++ bashline.c 2010/03/01 23:44:47 +@@ -3421,7 +3421,7 @@ + putx(c) + int c; + { +- putc (c, rl_outstream); ++ return putc (c, rl_outstream); + } + + static int diff --git a/bash.changes b/bash.changes index 025268a..1fd41db 100644 --- a/bash.changes +++ b/bash.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 2 00:45:53 CET 2010 - ro@suse.de + +- fix warning no return statement in function returning non-void + to fix build (in bashline.c) + ------------------------------------------------------------------- Wed Feb 24 09:55:03 CET 2010 - werner@suse.de diff --git a/bash.spec b/bash.spec index ab454e4..7591eb0 100644 --- a/bash.spec +++ b/bash.spec @@ -63,6 +63,7 @@ Patch24: readline-6.0-metamode.patch Patch30: readline-6.1-destdir.patch Patch40: bash-4.1-bash.bashrc.dif Patch41: bash-4.1-intr.dif +Patch42: bash-4.1-non_void.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc %global _incdir %{_includedir} @@ -306,6 +307,7 @@ unset p %patch24 -p0 -b .metamode %patch40 -p0 -b .bashrc %patch41 -p0 -b .intr +%patch42 -p0 -b .non_void %patch0 -p0 cd ../readline-%{rl_vers} for p in ../readline-%{rl_vers}-patches/*; do From 308639e7e70ceb8346a8c1dd6b2bdd1f0542137785cea5b70241d27b4bb11cff Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 4 Mar 2010 15:06:08 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/bash revision 52 OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=df13ffd5e72be11a27950d8b8d36bf10 --- bash.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/bash.spec b/bash.spec index 7591eb0..f973195 100644 --- a/bash.spec +++ b/bash.spec @@ -28,7 +28,7 @@ Recommends: bash-lang = %bash_vers Suggests: command-not-found AutoReqProv: on Version: 4.1 -Release: 2 +Release: 3 Summary: The GNU Bourne-Again Shell Url: http://www.gnu.org/software/bash/bash.html Source0: ftp://ftp.gnu.org/gnu/bash/bash-%{bash_vers}.tar.bz2 @@ -92,7 +92,7 @@ Group: Documentation/Man Provides: bash:%{_infodir}/bash.info.gz PreReq: %install_info_prereq Version: 4.1 -Release: 2 +Release: 3 AutoReqProv: on %if %suse_version > 1120 BuildArch: noarch @@ -115,7 +115,7 @@ License: GPLv2+ Summary: Include Files mandatory for Development of bash loadable builtins Group: Development/Languages/C and C++ Version: 4.1 -Release: 2 +Release: 3 AutoReqProv: on %description -n bash-devel @@ -135,7 +135,7 @@ License: GPLv2+ Summary: Loadable bash builtins Group: System/Shells Version: 4.1 -Release: 2 +Release: 3 AutoReqProv: on %description -n bash-loadables @@ -204,7 +204,7 @@ Summary: The Readline Library Group: System/Libraries Provides: bash:/%{_lib}/libreadline.so.%{rl_major} Version: 6.1 -Release: 2 +Release: 3 Recommends: readline-doc = %{version} # bug437293 %ifarch ppc64 @@ -233,7 +233,7 @@ Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/C and C++ Provides: bash:%{_libdir}/libreadline.a Version: 6.1 -Release: 2 +Release: 3 Requires: libreadline6 = %{version} Requires: ncurses-devel Recommends: readline-doc = %{version} @@ -262,7 +262,7 @@ Group: System/Libraries Provides: readline:%{_infodir}/readline.info.gz PreReq: %install_info_prereq Version: 6.1 -Release: 2 +Release: 3 AutoReqProv: on %if %suse_version > 1120 BuildArch: noarch