From 221354901758eb64e985823d3ba8f77a23360e5e85697df1ac83fa828ec159a2 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 28 May 2013 15:28:20 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=151 --- bash-4.2-sigrestart.patch | 2 +- bash.changes | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bash-4.2-sigrestart.patch b/bash-4.2-sigrestart.patch index d2db4b8..58a4874 100644 --- a/bash-4.2-sigrestart.patch +++ b/bash-4.2-sigrestart.patch @@ -19,7 +19,7 @@ if (sig == SIGCHLD) act.sa_flags |= SA_RESTART; /* XXX */ +#if !defined(MUST_REINSTALL_SIGHANDLERS) -+ if (sig != SIGALRM) ++ if (sig != SIGALRM && handler != (termsig_sighandler)) + act.sa_flags |= SA_RESTART; /* XXX */ + if (handler == (trap_handler)) + act.sa_flags |= SA_NODEFER; /* XXX */ diff --git a/bash.changes b/bash.changes index 533405a..dc5ec68 100644 --- a/bash.changes +++ b/bash.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 28 15:17:36 UTC 2013 - werner@suse.de + +- Do not restart the sighandler after a trap is reset (bnc#820149) + ------------------------------------------------------------------- Thu Mar 21 11:51:54 UTC 2013 - werner@suse.de