Merge pull request #4950 from StevenHessing/noddos
[feed/packages.git] / utils / bash / patches / 111-upstream-bash44-011.patch
1 Index: bash-4.4/patchlevel.h
2 ===================================================================
3 --- bash-4.4.orig/patchlevel.h
4 +++ bash-4.4/patchlevel.h
5 @@ -25,6 +25,6 @@
6 regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
7 looks for to find the patch level (for the sccs version string). */
8
9 -#define PATCHLEVEL 10
10 +#define PATCHLEVEL 11
11
12 #endif /* _PATCHLEVEL_H_ */
13 Index: bash-4.4/sig.c
14 ===================================================================
15 --- bash-4.4.orig/sig.c
16 +++ bash-4.4/sig.c
17 @@ -585,7 +585,8 @@ termsig_handler (sig)
18 #if defined (JOB_CONTROL)
19 if (sig == SIGHUP && (interactive || (subshell_environment & (SUBSHELL_COMSUB|SUBSHELL_PROCSUB))))
20 hangup_all_jobs ();
21 - end_job_control ();
22 + if ((subshell_environment & (SUBSHELL_COMSUB|SUBSHELL_PROCSUB)) == 0)
23 + end_job_control ();
24 #endif /* JOB_CONTROL */
25
26 #if defined (PROCESS_SUBSTITUTION)