Merge pull request #4924 from oldium/fwknopd-init-script
[feed/packages.git] / utils / bash / patches / 105-upstream-bash44-005.patch
1 Index: bash-4.4/builtins/evalstring.c
2 ===================================================================
3 --- bash-4.4.orig/builtins/evalstring.c
4 +++ bash-4.4/builtins/evalstring.c
5 @@ -104,12 +104,9 @@ should_suppress_fork (command)
6 running_trap == 0 &&
7 *bash_input.location.string == '\0' &&
8 command->type == cm_simple &&
9 -#if 0
10 signal_is_trapped (EXIT_TRAP) == 0 &&
11 signal_is_trapped (ERROR_TRAP) == 0 &&
12 -#else
13 any_signals_trapped () < 0 &&
14 -#endif
15 command->redirects == 0 && command->value.Simple->redirects == 0 &&
16 ((command->flags & CMD_TIME_PIPELINE) == 0) &&
17 ((command->flags & CMD_INVERT_RETURN) == 0));
18 Index: bash-4.4/patchlevel.h
19 ===================================================================
20 --- bash-4.4.orig/patchlevel.h
21 +++ bash-4.4/patchlevel.h
22 @@ -25,6 +25,6 @@
23 regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
24 looks for to find the patch level (for the sccs version string). */
25
26 -#define PATCHLEVEL 4
27 +#define PATCHLEVEL 5
28
29 #endif /* _PATCHLEVEL_H_ */