psss / rpms / bash

Forked from rpms/bash 6 years ago
Clone
ed01fac
From 76bb456d8fcd870cd31b7bf9d90798cd97cee2ab Mon Sep 17 00:00:00 2001
ed01fac
From: Chet Ramey <chet.ramey@case.edu>
ed01fac
Date: Fri, 20 Jan 2017 15:38:49 -0500
ed01fac
Subject: [PATCH] Bash-4.4 patch 11
ed01fac
ed01fac
---
ed01fac
 patchlevel.h | 2 +-
ed01fac
 sig.c        | 3 ++-
ed01fac
 2 files changed, 3 insertions(+), 2 deletions(-)
ed01fac
ed01fac
diff --git a/patchlevel.h b/patchlevel.h
ed01fac
index 8002af7..772676c 100644
ed01fac
--- a/patchlevel.h
ed01fac
+++ b/patchlevel.h
ed01fac
@@ -25,6 +25,6 @@
ed01fac
    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
ed01fac
    looks for to find the patch level (for the sccs version string). */
ed01fac
 
ed01fac
-#define PATCHLEVEL 10
ed01fac
+#define PATCHLEVEL 11
ed01fac
 
ed01fac
 #endif /* _PATCHLEVEL_H_ */
ed01fac
diff --git a/sig.c b/sig.c
ed01fac
index ad01631..e5bb739 100644
ed01fac
--- a/sig.c
ed01fac
+++ b/sig.c
ed01fac
@@ -585,7 +585,8 @@ termsig_handler (sig)
ed01fac
 #if defined (JOB_CONTROL)
ed01fac
   if (sig == SIGHUP && (interactive || (subshell_environment & (SUBSHELL_COMSUB|SUBSHELL_PROCSUB))))
ed01fac
     hangup_all_jobs ();
ed01fac
-  end_job_control ();
ed01fac
+  if ((subshell_environment & (SUBSHELL_COMSUB|SUBSHELL_PROCSUB)) == 0)
ed01fac
+    end_job_control ();
ed01fac
 #endif /* JOB_CONTROL */
ed01fac
 
ed01fac
 #if defined (PROCESS_SUBSTITUTION)
ed01fac
-- 
ed01fac
2.9.3
ed01fac