nalika / rpms / bash

Forked from rpms/bash 2 years ago
Clone

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

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