]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blob - src/patches/bash/bash51-011
Merge branch 'next' into temp-c163-development
[people/pmueller/ipfire-2.x.git] / src / patches / bash / bash51-011
1 BASH PATCH REPORT
2 =================
3
4 Bash-Release: 5.1
5 Patch-ID: bash51-011
6
7 Bug-Reported-by: Alex fxmbsw7 Ratchev <fxmbsw7@gmail.com>
8 Bug-Reference-ID: <CAALKErFrm+yuwy=ioK+RmjCiwxTDmzeMFWqLF2BEWYtkGS5UFQ@mail.gmail.com>
9 Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2020-11/msg00064.html
10
11 Bug-Description:
12
13 When reading a compound assignment, and running it through the parser to
14 split it into words, we need to save and restore any alias we're currently
15 expanding.
16
17 Patch (apply with `patch -p0'):
18
19 *** ../bash-5.1-patched/parse.y 2020-11-28 12:10:06.000000000 -0500
20 --- parse.y 2021-10-13 11:04:27.000000000 -0400
21 ***************
22 *** 6494,6501 ****
23
24 push_stream (1);
25 - #if 0 /* TAG: bash-5.2 Alex fxmbsw7 Ratchev <fxmbsw7@gmail.com> 11/17/2020 */
26 if (ea = expanding_alias ())
27 parser_save_alias ();
28 - #endif
29 last_read_token = WORD; /* WORD to allow reserved words here */
30 current_command_line_count = 0;
31 --- 6494,6499 ----
32 ***************
33 *** 6532,6539 ****
34 pop_stream ();
35
36 - #if 0 /* TAG: bash-5.2 */
37 if (ea)
38 parser_restore_alias ();
39 - #endif
40
41 #if defined (HISTORY)
42 --- 6530,6535 ----
43 *** ../bash-5.1-patched/y.tab.c 2020-11-28 12:17:19.000000000 -0500
44 --- y.tab.c 2021-11-17 10:47:35.000000000 -0500
45 ***************
46 *** 8788,8795 ****
47
48 push_stream (1);
49 - #if 0 /* TAG: bash-5.2 Alex fxmbsw7 Ratchev <fxmbsw7@gmail.com> 11/17/2020 */
50 if (ea = expanding_alias ())
51 parser_save_alias ();
52 - #endif
53 last_read_token = WORD; /* WORD to allow reserved words here */
54 current_command_line_count = 0;
55 --- 8777,8782 ----
56 ***************
57 *** 8826,8833 ****
58 pop_stream ();
59
60 - #if 0 /* TAG: bash-5.2 */
61 if (ea)
62 parser_restore_alias ();
63 - #endif
64
65 #if defined (HISTORY)
66 --- 8813,8818 ----
67 *** ../bash-5.1/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
68 --- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
69 ***************
70 *** 26,30 ****
71 looks for to find the patch level (for the sccs version string). */
72
73 ! #define PATCHLEVEL 10
74
75 #endif /* _PATCHLEVEL_H_ */
76 --- 26,30 ----
77 looks for to find the patch level (for the sccs version string). */
78
79 ! #define PATCHLEVEL 11
80
81 #endif /* _PATCHLEVEL_H_ */