From: Chet Ramey <chet.ramey@case.edu>
Date: Fri, 20 Jan 2017 20:38:49 +0000 (-0500)
Subject: Bash-4.4 patch 11
X-Git-Tag: bash-5.0-alpha~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=76bb456d8fcd870cd31b7bf9d90798cd97cee2ab;p=thirdparty%2Fbash.git

Bash-4.4 patch 11
---

diff --git a/patchlevel.h b/patchlevel.h
index 8002af709..772676c81 100644
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -25,6 +25,6 @@
    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
    looks for to find the patch level (for the sccs version string). */
 
-#define PATCHLEVEL 10
+#define PATCHLEVEL 11
 
 #endif /* _PATCHLEVEL_H_ */
diff --git a/sig.c b/sig.c
index ad0163133..e5bb73997 100644
--- a/sig.c
+++ b/sig.c
@@ -585,7 +585,8 @@ termsig_handler (sig)
 #if defined (JOB_CONTROL)
   if (sig == SIGHUP && (interactive || (subshell_environment & (SUBSHELL_COMSUB|SUBSHELL_PROCSUB))))
     hangup_all_jobs ();
-  end_job_control ();
+  if ((subshell_environment & (SUBSHELL_COMSUB|SUBSHELL_PROCSUB)) == 0)
+    end_job_control ();
 #endif /* JOB_CONTROL */
 
 #if defined (PROCESS_SUBSTITUTION)