rcolebaugh / rpms / bash

Forked from rpms/bash a year ago
Clone

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

50ece2
From f459cbd8be37b28be1dc90315e0ab51d7f211301 Mon Sep 17 00:00:00 2001
50ece2
From: Chet Ramey <chet.ramey@case.edu>
50ece2
Date: Mon, 14 Nov 2016 14:27:55 -0500
50ece2
Subject: [PATCH] Bash-4.4 patch 5
50ece2
50ece2
---
50ece2
 builtins/evalstring.c | 3 ---
50ece2
 patchlevel.h          | 2 +-
50ece2
 2 files changed, 1 insertion(+), 4 deletions(-)
50ece2
50ece2
diff --git a/builtins/evalstring.c b/builtins/evalstring.c
50ece2
index e221591..6dc756c 100644
50ece2
--- a/builtins/evalstring.c
50ece2
+++ b/builtins/evalstring.c
50ece2
@@ -104,12 +104,9 @@ should_suppress_fork (command)
50ece2
 	  running_trap == 0 &&
50ece2
 	  *bash_input.location.string == '\0' &&
50ece2
 	  command->type == cm_simple &&
50ece2
-#if 0
50ece2
 	  signal_is_trapped (EXIT_TRAP) == 0 &&
50ece2
 	  signal_is_trapped (ERROR_TRAP) == 0 &&
50ece2
-#else
50ece2
 	  any_signals_trapped () < 0 &&
50ece2
-#endif
50ece2
 	  command->redirects == 0 && command->value.Simple->redirects == 0 &&
50ece2
 	  ((command->flags & CMD_TIME_PIPELINE) == 0) &&
50ece2
 	  ((command->flags & CMD_INVERT_RETURN) == 0));
50ece2
diff --git a/patchlevel.h b/patchlevel.h
50ece2
index c059f0b..1bc098b 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 4
50ece2
+#define PATCHLEVEL 5
50ece2
 
50ece2
 #endif /* _PATCHLEVEL_H_ */
50ece2
-- 
50ece2
2.9.3
50ece2