From ffc22734e19bff80227e801b7a9b9b08bb12083f Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Dec 06 2016 15:39:11 +0000
Subject: import bash-4.2.46-21.el7_3


---

diff --git a/SOURCES/bash-4.3-trapped-signals.patch b/SOURCES/bash-4.3-trapped-signals.patch
new file mode 100644
index 0000000..2c4333a
--- /dev/null
+++ b/SOURCES/bash-4.3-trapped-signals.patch
@@ -0,0 +1,24 @@
+diff --git a/jobs.c b/jobs.c
+index 37edece..31395fe 100644
+--- a/jobs.c
++++ b/jobs.c
+@@ -2244,10 +2244,14 @@ wait_sigint_handler (sig)
+ 	  signal_is_trapped (SIGINT) &&
+ 	  ((sigint_handler = trap_to_sighandler (SIGINT)) == trap_handler))
+ 	{
+-	  interrupt_immediately = 0;
+ 	  trap_handler (SIGINT);	/* set pending_traps[SIGINT] */
+ 	  wait_signal_received = SIGINT;
+-	  longjmp (wait_intr_buf, 1);
++	  if (interrupt_immediately)
++	    {
++	      interrupt_immediately = 0;
++	      longjmp (wait_intr_buf, 1);
++	    }
++	  SIGRETURN (0);
+ 	}
+       
+       ADDINTERRUPT;
+-- 
+2.5.5
+
diff --git a/SPECS/bash.spec b/SPECS/bash.spec
index b36f374..922b2b6 100644
--- a/SPECS/bash.spec
+++ b/SPECS/bash.spec
@@ -6,7 +6,7 @@
 Version: %{baseversion}%{patchleveltag}
 Name: bash
 Summary: The GNU Bourne Again shell
-Release: 20%{?dist}
+Release: 21%{?dist}
 Group: System Environment/Shells
 License: GPLv3+
 Url: http://www.gnu.org/software/bash
@@ -162,9 +162,12 @@ Patch141: bash-4.2-case-in-command-subst.patch
 #1237213 - export when fnname contains hyphens
 Patch142: bash-4.2-enable-hyphened-fn-export.patch
 
-#1355771
+#1326302
 Patch143: fix-shopt-lastpipe-mode-crash.patch
 
+#1384521
+Patch144: bash-4.3-trapped-signals.patch
+
 BuildRequires: texinfo bison
 BuildRequires: ncurses-devel
 BuildRequires: autoconf, gettext
@@ -286,6 +289,7 @@ This package contains documentation files for %{name}.
 %patch141 -p1 -b .command-subst
 %patch142 -p0 -b .export
 %patch143 -p1 -b .fix-shopt-lastpipe-mode
+%patch144 -p1 -b .trapped-signals
 
 echo %{version} > _distribution
 echo %{release} > _patchlevel
@@ -478,9 +482,13 @@ end
 #%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Wed Oct 12 2016 Siteshwar Vashisht <svashisht@redhat.com> - 4.2.46-21
+- Fix a crash in trap signal handling
+  Resolves: #1384521
+
 * Tue Jul 12 2016 Siteshwar Vashisht <svashisht@redhat.com> - 4.2.46-20
 - Fix a crash when lastpipe mode is enabled
-  Resolves: #1355771
+  Resolves: #1326302
 
 * Wed Jul 08 2015 Ondrej Oprala <ooprala@redhat.com> - 4.2.46-19
 - Add a necessary declaration to common.h