rcolebaugh / rpms / bash

Forked from rpms/bash 2 years ago
Clone

Blame SOURCES/bash-4.4-patch-11.patch

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