From 85cef09200a3c368a385bba166d57025d552f6101651197481402376d8ea25fa Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 2 Apr 2008 17:12:06 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bash?expand=0&rev=18 --- bash-3.2-sigrestart.patch | 16 ++++++++++------ bash.changes | 6 ++++++ bash.spec | 23 +++++++++++++++-------- dot.profile | 4 +++- 4 files changed, 34 insertions(+), 15 deletions(-) diff --git a/bash-3.2-sigrestart.patch b/bash-3.2-sigrestart.patch index 8ea288b..2ea8993 100644 --- a/bash-3.2-sigrestart.patch +++ b/bash-3.2-sigrestart.patch @@ -1,5 +1,5 @@ --- jobs.c -+++ jobs.c 2008-01-08 19:10:15.575513024 +0100 ++++ jobs.c 2008-01-08 19:10:15.575513000 +0100 @@ -2344,7 +2344,11 @@ wait_for (pid) act.sa_handler = SIG_DFL; sigemptyset (&act.sa_mask); @@ -13,17 +13,21 @@ # endif queue_sigchld = 1; --- sig.c -+++ sig.c 2008-01-08 19:09:14.823789614 +0100 -@@ -586,6 +586,13 @@ set_signal_handler (sig, handler) ++++ sig.c 2008-04-02 12:42:23.742406622 +0200 +@@ -586,6 +586,17 @@ set_signal_handler (sig, handler) act.sa_flags |= SA_INTERRUPT; /* XXX */ else act.sa_flags |= SA_RESTART; /* XXX */ +#else +# if !defined(MUST_REINSTALL_SIGHANDLERS) -+ if (sig == SIGCHLD) -+ act.sa_flags |= SA_RESTART; /* XXX */ -+ if (sig == SIGWINCH) ++ if (sig != SIGALRM) + act.sa_flags |= SA_RESTART; /* XXX */ ++ if (handler == (trap_handler)) ++ act.sa_flags |= SA_NODEFER; /* XXX */ ++ if (handler == (termsig_sighandler)) ++ act.sa_flags |= SA_NODEFER; /* XXX */ ++ if (sig == SIGTSTP || sig == SIGTTOU || sig == SIGTTIN || sig == SIGCONT) ++ act.sa_flags |= SA_NODEFER; /* XXX */ +# endif #endif sigemptyset (&act.sa_mask); diff --git a/bash.changes b/bash.changes index f836f9a..5b0917f 100644 --- a/bash.changes +++ b/bash.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Apr 2 11:49:20 CEST 2008 - werner@suse.de + +- Allow to (re)send signals within trap handlers (bnc#345441) +- Clear exit status if not sourcing system profile (bnc#372061) + ------------------------------------------------------------------- Thu Feb 28 11:49:28 CET 2008 - dmueller@suse.de diff --git a/bash.spec b/bash.spec index b69f50c..b02c408 100644 --- a/bash.spec +++ b/bash.spec @@ -20,7 +20,7 @@ Group: System/Shells Recommends: bash-doc = %bash_vers AutoReqProv: on Version: 3.2 -Release: 88 +Release: 95 Summary: The GNU Bourne-Again Shell Url: http://www.gnu.org/software/bash/bash.html Source0: bash-%{bash_vers}.tar.bz2 @@ -70,12 +70,13 @@ Authors: Chet Ramey %package -n bash-doc +License: GPL v2 or later Summary: Documentation how to Use the GNU Bourne-Again Shell Group: Documentation/Man Provides: bash:%{_infodir}/bash.info.gz PreReq: %install_info_prereq Version: 3.2 -Release: 47 +Release: 54 AutoReqProv: on %description -n bash-doc @@ -90,11 +91,12 @@ Authors: Chet Ramey %package -n libreadline5 +License: GPL v2 or later Summary: The Readline Library Group: System/Libraries Provides: bash:/%{_lib}/libreadline.so.5 Version: 5.2 -Release: 47 +Release: 54 Recommends: readline-doc = %{version} Provides: readline = 5.2 Obsoletes: readline <= 5.2 @@ -113,11 +115,12 @@ Authors: Chet Ramey %package -n readline-devel +License: GPL v2 or later Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/C and C++ Provides: bash:%{_libdir}/libreadline.a Version: 5.2 -Release: 88 +Release: 95 Requires: libreadline5 = %{version} Requires: ncurses-devel Recommends: readline-doc = %{version} @@ -135,12 +138,13 @@ Authors: Chet Ramey %package -n readline-doc +License: GPL v2 or later Summary: Documentation how to Use and Programm with the Readline Library Group: System/Libraries Provides: readline:%{_infodir}/readline.info.gz PreReq: %install_info_prereq Version: 5.2 -Release: 47 +Release: 54 AutoReqProv: on %description -n readline-doc @@ -397,6 +401,9 @@ EOF %doc %{_defaultdocdir}/readline/ %changelog +* Wed Apr 02 2008 werner@suse.de +- Allow to (re)send signals within trap handlers (bnc#345441) +- Clear exit status if not sourcing system profile (bnc#372061) * Thu Feb 28 2008 dmueller@suse.de - remove invalid filerequires, the libreadline5 dependency is enough * Mon Jan 28 2008 schwab@suse.de @@ -682,7 +689,7 @@ EOF - readline-devel should require readline * Mon Jul 29 2002 werner@suse.de - Expansion of `~user/' is like `/' -* Sat Jul 27 2002 kukuk@suse.de +* Sun Jul 28 2002 kukuk@suse.de - Remove not used tetex from neededforbuild - Fix building of man2html (bash.html still broken) * Fri Jul 19 2002 werner@suse.de @@ -772,7 +779,7 @@ EOF - Upgrade to bash 2.04 and readline 4.1. * Sun May 21 2000 kukuk@suse.de - Use docdir -* Sat Apr 01 2000 bk@suse.de +* Sun Apr 02 2000 bk@suse.de - remove obviosly unneeded link /usr/lib/libreadline.so on s390 * Tue Mar 14 2000 werner@suse.de - Add locale patch to enable LC_NUMERIC handling @@ -812,7 +819,7 @@ EOF - update to bash 2.03, readline 4.0 * Wed Jan 13 1999 @suse.de - disabled `Broken pipe' messages -* Sun Dec 13 1998 bs@suse.de +* Mon Dec 14 1998 bs@suse.de - removed notify message - bash 2.0 is standard for a long time now. * Mon Dec 07 1998 florian@suse.de - remove SSH_CLIENT-kludge as this cannot detect all correct cases diff --git a/dot.profile b/dot.profile index dad12ff..9a919c9 100644 --- a/dot.profile +++ b/dot.profile @@ -5,11 +5,13 @@ # All other interactive shells will only read .bashrc; this is particularly # important for language settings, see below. -test -z "$PROFILEREAD" && . /etc/profile +test -z "$PROFILEREAD" && . /etc/profile || true # Most applications support several languages for their output. # To make use of this feature, simply uncomment one of the lines below or # add your own one (see /usr/share/locale/locale.alias for more codes) +# This overwrites the system default set in /etc/sysconfig/language +# in the variable RC_LANG. # #export LANG=de_DE.UTF-8 # uncomment this line for German output #export LANG=fr_FR.UTF-8 # uncomment this line for French output