projects / ipfire-2.x.git / blame
| Commit | Line | Data |
|---|---|---|
| 725ffd6f AB |
1 | BASH PATCH REPORT |
| 2 | ================= | |
| 3 | ||
| 4 | Bash-Release: 5.1 | |
| 5 | Patch-ID: bash51-010 | |
| 6 | ||
| 7 | Bug-Reported-by: Jonas Alfredsson <jonas.alfredsson@protonmail.com> | |
| 8 | Bug-Reference-ID: <LjAfZaEuZncr2RaqhSSfcaiXdkuK6kdEYxshP3LApXbgMVQzggMGyWHO9knVkXicW2fP-ibsipJ_GZ-YaJRm96Rsozf6PgFmPsljRCtflls=@protonmail.com> | |
| 9 | Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2021-05/msg00059.html | |
| 10 | ||
| 11 | Bug-Description: | |
| 12 | ||
| 13 | If `wait -n' is interrupted by a trapped signal other than SIGINT, it does | |
| 14 | not completely clean up state, and that can prevent subsequent calls to | |
| 15 | `wait -n' from working correctly. | |
| 16 | ||
| 17 | Patch (apply with `patch -p0'): | |
| 18 | ||
| 19 | *** ../bash-5.1-patched/builtins/wait.def 2020-12-16 17:13:12.000000000 -0500 | |
| 20 | --- builtins/wait.def 2021-11-17 10:25:15.000000000 -0500 | |
| 21 | *************** | |
| 22 | *** 112,116 **** | |
| 23 | WORD_LIST *list; | |
| 24 | { | |
| 25 | ! int status, code, opt, nflag, wflags; | |
| 26 | char *vname; | |
| 27 | SHELL_VAR *pidvar; | |
| 28 | --- 112,117 ---- | |
| 29 | WORD_LIST *list; | |
| 30 | { | |
| 31 | ! int status, code, opt, nflag; | |
| 32 | ! volatile int wflags; | |
| 33 | char *vname; | |
| 34 | SHELL_VAR *pidvar; | |
| 35 | *************** | |
| 36 | *** 181,184 **** | |
| 37 | --- 188,193 ---- | |
| 38 | status = 128 + wait_signal_received; | |
| 39 | wait_sigint_cleanup (); | |
| 40 | + if (wflags & JWAIT_WAITING) | |
| 41 | + unset_waitlist (); | |
| 42 | WAIT_RETURN (status); | |
| 43 | } | |
| 44 | ||
| 45 | *** ../bash-5.1/patchlevel.h 2020-06-22 14:51:03.000000000 -0400 | |
| 46 | --- patchlevel.h 2020-10-01 11:01:28.000000000 -0400 | |
| 47 | *************** | |
| 48 | *** 26,30 **** | |
| 49 | looks for to find the patch level (for the sccs version string). */ | |
| 50 | ||
| 51 | ! #define PATCHLEVEL 9 | |
| 52 | ||
| 53 | #endif /* _PATCHLEVEL_H_ */ | |
| 54 | --- 26,30 ---- | |
| 55 | looks for to find the patch level (for the sccs version string). */ | |
| 56 | ||
| 57 | ! #define PATCHLEVEL 10 | |
| 58 | ||
| 59 | #endif /* _PATCHLEVEL_H_ */ |