Roman Rakus a34730
diff -up bash-4.1/sig.h.signal bash-4.1/sig.h
Roman Rakus a34730
--- bash-4.1/sig.h.signal	2009-01-04 20:32:41.000000000 +0100
Roman Rakus a34730
+++ bash-4.1/sig.h	2012-08-28 11:19:14.920224571 +0200
Roman Rakus a34730
@@ -96,6 +96,8 @@ do { \
Roman Rakus a34730
   sigprocmask (SIG_BLOCK, &nvar, &ovar); \
Roman Rakus a34730
 } while (0)
Roman Rakus a34730
 
Roman Rakus a34730
+#define UNBLOCK_SIGNAL(ovar) sigprocmask (SIG_SETMASK, &ovar, (sigset_t *)NULL)
Roman Rakus a34730
+
Roman Rakus a34730
 #if defined (HAVE_POSIX_SIGNALS)
Roman Rakus a34730
 #  define BLOCK_CHILD(nvar, ovar) \
Roman Rakus a34730
 	BLOCK_SIGNAL (SIGCHLD, nvar, ovar)
Roman Rakus a34730
diff -up bash-4.1/trap.c.signal bash-4.1/trap.c
Roman Rakus a34730
--- bash-4.1/trap.c.signal	2009-10-10 23:21:44.000000000 +0200
Roman Rakus a34730
+++ bash-4.1/trap.c	2012-08-28 10:58:14.746345797 +0200
Roman Rakus a34730
@@ -516,6 +516,8 @@ set_signal (sig, string)
Roman Rakus a34730
      int sig;
Roman Rakus a34730
      char *string;
Roman Rakus a34730
 {
Roman Rakus a34730
+  sigset_t set, oset;
Roman Rakus a34730
+
Roman Rakus a34730
   if (SPECIAL_TRAP (sig))
Roman Rakus a34730
     {
Roman Rakus a34730
       change_signal (sig, savestring (string));
Roman Rakus a34730
@@ -546,9 +548,10 @@ set_signal (sig, string)
Roman Rakus a34730
      environment in which it is safe to do so. */
Roman Rakus a34730
   if ((sigmodes[sig] & SIG_NO_TRAP) == 0)
Roman Rakus a34730
     {
Roman Rakus a34730
-      set_signal_handler (sig, SIG_IGN);
Roman Rakus a34730
+      BLOCK_SIGNAL (sig, set, oset);
Roman Rakus a34730
       change_signal (sig, savestring (string));
Roman Rakus a34730
       set_signal_handler (sig, trap_handler);
Roman Rakus a34730
+      UNBLOCK_SIGNAL (oset);
Roman Rakus a34730
     }
Roman Rakus a34730
   else
Roman Rakus a34730
     change_signal (sig, savestring (string));