From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH] bash: Update to version 5.2 plus patches 1 to 9 Date: Sat, 19 Nov 2022 15:40:05 +0100 Message-ID: <20221119144005.382898-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2704738413247612982==" List-Id: --===============2704738413247612982== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable - Update from version 5.1.16 to version 5.2 plus patches 1 to 9 - Update of rootfile - Changelog This is a terse description of the new features added to bash-5.2 since the release of bash-5.1. As always, the manual page (doc/bash.1) is the place to look for complete descriptions. 1. New Features in Bash a. The bash malloc returns memory that is aligned on 16-byte boundaries. b. There is a new internal timer framework used for read builtin timeouts. c. Rewrote the command substitution parsing code to call the parser recursiv= ely and rebuild the command string from the parsed command. This allows better syntax checking and catches errors much earlier. Along with this, if command substitution parsing completes with here-documents remaining to be read, the shell prints a warning message and reads the here-document bodi= es from the current input stream. d. The `ulimit' builtin now treats an operand remaining after all of the opt= ions and arguments are parsed as an argument to the last command specified by an option. This is for POSIX compatibility. e. Here-document parsing now handles $'...' and $"..." quoting when reading = the here-document body. f. The `shell-expand-line' and `history-and-alias-expand-line' bindable read= line commands now understand $'...' and $"..." quoting. g. There is a new `spell-correct-word' bindable readline command to perform spelling correction on the current word. h. The `unset' builtin now attempts to treat arguments as array subscripts without parsing or expanding the subscript, even when `assoc_expand_once' is not set. i. There is a default value for $BASH_LOADABLES_PATH in config-top.h. j. Associative array assignment and certain instances of referencing (e.g., `test -v' now allow `@' and `*' to be used as keys. k. Bash attempts to expand indexed array subscripts only once when executing shell constructs and word expansions. l. The `unset' builtin allows a subscript of `@' or `*' to unset a key with that value for associative arrays instead of unsetting the entire array (which you can still do with `unset arrayname'). For indexed arrays, it removes all elements of the array without unsetting it (like `A=3D()'). m. Additional builtins (printf/test/read/wait) do a better job of not parsing array subscripts if array_expand_once is set. n. New READLINE_ARGUMENT variable set to numeric argument for readline comma= nds defined using `bind -x'. o. The new `varredir_close' shell option causes bash to automatically close file descriptors opened with {var}&WORD- redirection has WORD expand to the empty string, treat the redirection as [N]<&- or [N]>&- and close file descript= or N (default 0). w. Invalid parameter transformation operators are now invalid word expansion= s, and so cause fatal errors in non-interactive shells. x. New shell option: patsub_replacement. When enabled, a `&' in the replacem= ent string of the pattern substitution expansion is replaced by the portion of the string that matched the pattern. Backslash will escape the `&' and insert a literal `&'. y. `command -p' no longer looks in the hash table for the specified command. z. The new `--enable-translatable-strings' option to `configure' allows $"..= ." support to be compiled in or out. aa. The new `globskipdots' shell option forces pathname expansion never to return `.' or `..' unless explicitly matched. It is enabled by default. bb. Array references using `@' and `*' that are the value of nameref variabl= es (declare -n ref=3D'v[@]' ; echo $ref) no longer cause the shell to exit = if set -u is enabled and the array (v) is unset. cc. There is a new bindable readline command name: `vi-edit-and-execute-command'. dd. In posix mode, the `printf' builtin checks for the `L' length modifier a= nd uses long double for floating point conversion specifiers if it's presen= t, double otherwise. ee. The `globbing' completion code now takes the `globstar' option into acco= unt. ff. `suspend -f' now forces the shell to suspend even if job control is not currently enabled. gg. Since there is no `declare -' equivalent of `local -', make sure to use `local -' in the output of `local -p'. Signed-off-by: Adolf Belka --- config/rootfiles/common/bash | 5 + lfs/bash | 9 +- src/patches/bash/bash52-001 | 46 ++++++ src/patches/bash/bash52-002 | 46 ++++++ src/patches/bash/bash52-003 | 89 +++++++++++ src/patches/bash/bash52-004 | 70 +++++++++ src/patches/bash/bash52-005 | 47 ++++++ src/patches/bash/bash52-006 | 293 +++++++++++++++++++++++++++++++++++ src/patches/bash/bash52-007 | 262 +++++++++++++++++++++++++++++++ src/patches/bash/bash52-008 | 58 +++++++ src/patches/bash/bash52-009 | 43 +++++ 11 files changed, 966 insertions(+), 2 deletions(-) create mode 100644 src/patches/bash/bash52-001 create mode 100644 src/patches/bash/bash52-002 create mode 100644 src/patches/bash/bash52-003 create mode 100644 src/patches/bash/bash52-004 create mode 100644 src/patches/bash/bash52-005 create mode 100644 src/patches/bash/bash52-006 create mode 100644 src/patches/bash/bash52-007 create mode 100644 src/patches/bash/bash52-008 create mode 100644 src/patches/bash/bash52-009 diff --git a/config/rootfiles/common/bash b/config/rootfiles/common/bash index c28d3571a..f348b5366 100644 --- a/config/rootfiles/common/bash +++ b/config/rootfiles/common/bash @@ -21,6 +21,7 @@ #usr/include/bash/conftypes.h #usr/include/bash/dispose_cmd.h #usr/include/bash/error.h +#usr/include/bash/execute_cmd.h #usr/include/bash/externs.h #usr/include/bash/general.h #usr/include/bash/hashlib.h @@ -62,13 +63,16 @@ #usr/include/bash/y.tab.h #usr/lib/bash usr/lib/bash/Makefile.inc +usr/lib/bash/Makefile.sample usr/lib/bash/accept usr/lib/bash/basename usr/lib/bash/csv usr/lib/bash/cut usr/lib/bash/dirname +usr/lib/bash/dsv usr/lib/bash/fdflags usr/lib/bash/finfo +usr/lib/bash/getconf usr/lib/bash/head usr/lib/bash/id usr/lib/bash/ln @@ -88,6 +92,7 @@ usr/lib/bash/rmdir usr/lib/bash/seq usr/lib/bash/setpgid usr/lib/bash/sleep +usr/lib/bash/stat usr/lib/bash/strftime usr/lib/bash/sync usr/lib/bash/tee diff --git a/lfs/bash b/lfs/bash index ec8939aed..14b20b986 100644 --- a/lfs/bash +++ b/lfs/bash @@ -24,7 +24,7 @@ =20 include Config =20 -VER =3D 5.1.16 +VER =3D 5.2 =20 THISAPP =3D bash-$(VER) DL_FILE =3D $(THISAPP).tar.gz @@ -53,7 +53,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_BLAKE2 =3D 0bc53b24d9b95cd85e45196510104acf6ac6c980f68aedcc83c840= 9ce6a4682e92736a9cbe089ed92d74590e28918d0bee0e67c8e0f994bd37e45fad83f5b48e +$(DL_FILE)_BLAKE2 =3D 51b196e710794ebad8eac28c31c93eb99ac1a7db30919a13271e39= e1cb66a0672f242df75fc7d71627ea873dfbce53ec35c0c56a71c5167143070a7811343fd9 =20 install : $(TARGET) =20 @@ -90,6 +90,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bash/bash-4.0-paths-1.= patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bash/bash-4.0-profile-= 1.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bash/bash-3.2-ssh_sour= ce_bash.patch +=09 + for i in $$(seq 1 9); do \ + cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/bash/bash52-$$(printf = "%03d" "$${i}") || exit 1; \ + done + =20 cd $(DIR_APP) && ./configure --prefix=3D$(PREFIX) $(CONFIGURE_OPTIONS) cd $(DIR_APP) && make $(MAKETUNING) diff --git a/src/patches/bash/bash52-001 b/src/patches/bash/bash52-001 new file mode 100644 index 000000000..83776ec76 --- /dev/null +++ b/src/patches/bash/bash52-001 @@ -0,0 +1,46 @@ + BASH PATCH REPORT + =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +Bash-Release: 5.2 +Patch-ID: bash52-001 + +Bug-Reported-by: Emanuele Torre +Bug-Reference-ID: +Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2022-09/msg00= 060.html + +Bug-Description: + +Expanding unset arrays in an arithmetic context can cause a segmentation fau= lt. + +Patch (apply with `patch -p0'): + +*** ../bash-5.2/subst.c 2022-08-31 17:36:46.000000000 -0400 +--- subst.c 2022-09-30 09:12:05.000000000 -0400 +*************** +*** 10858,10862 **** + t =3D expand_subscript_string (exp, quoted & ~(Q_ARITH|Q_DOUBLE_QUOTES)); + free (exp); +! exp =3D sh_backslash_quote (t, abstab, 0); + free (t); + =20 +--- 10858,10862 ---- + t =3D expand_subscript_string (exp, quoted & ~(Q_ARITH|Q_DOUBLE_QUOTES)); + free (exp); +! exp =3D t ? sh_backslash_quote (t, abstab, 0) : savestring (""); + free (t); + =20 +*** ../bash-5.2/patchlevel.h 2020-06-22 14:51:03.000000000 -0400 +--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + =20 +! #define PATCHLEVEL 0 + =20 + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + =20 +! #define PATCHLEVEL 1 + =20 + #endif /* _PATCHLEVEL_H_ */ diff --git a/src/patches/bash/bash52-002 b/src/patches/bash/bash52-002 new file mode 100644 index 000000000..18229c996 --- /dev/null +++ b/src/patches/bash/bash52-002 @@ -0,0 +1,46 @@ + BASH PATCH REPORT + =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +Bash-Release: 5.2 +Patch-ID: bash52-002 + +Bug-Reported-by: Kan-Ru Chen +Bug-Reference-ID: +Bug-Reference-URL: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=3D10211= 09 + +Bug-Description: + +Starting bash with an invalid locale specification for LC_ALL/LANG/LC_CTYPE +can cause the shell to crash. + +Patch (apply with `patch -p0'): + +*** ../bash-5.2-patched/lib/readline/nls.c 2022-08-15 09:38:51.000000000 -04= 00 +--- lib/readline/nls.c 2022-10-05 09:23:22.000000000 -0400 +*************** +*** 142,145 **** +--- 142,149 ---- + lspec =3D ""; + ret =3D setlocale (LC_CTYPE, lspec); /* ok, since it does not change loc= ale */ ++ if (ret =3D=3D 0 || *ret =3D=3D 0) ++ ret =3D setlocale (LC_CTYPE, (char *)NULL); ++ if (ret =3D=3D 0 || *ret =3D=3D 0) ++ ret =3D RL_DEFAULT_LOCALE; + #else + ret =3D (lspec =3D=3D 0 || *lspec =3D=3D 0) ? RL_DEFAULT_LOCALE : lspec; + +*** ../bash-5.2/patchlevel.h 2020-06-22 14:51:03.000000000 -0400 +--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + =20 +! #define PATCHLEVEL 1 + =20 + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + =20 +! #define PATCHLEVEL 2 + =20 + #endif /* _PATCHLEVEL_H_ */ diff --git a/src/patches/bash/bash52-003 b/src/patches/bash/bash52-003 new file mode 100644 index 000000000..b2dc4cbcc --- /dev/null +++ b/src/patches/bash/bash52-003 @@ -0,0 +1,89 @@ + BASH PATCH REPORT + =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +Bash-Release: 5.2 +Patch-ID: bash52-003 + +Bug-Reported-by: D630 +Bug-Reference-ID: +Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2022-10/msg00= 092.html + +Bug-Description: + +Command substitutions need to preserve newlines instead of replacing them +with semicolons, especially in the presence of multiple here-documents. + +Patch (apply with `patch -p0'): + +*** ../bash-5.2-patched/print_cmd.c 2022-07-26 09:16:39.000000000 -0400 +--- print_cmd.c 2022-10-17 10:41:06.000000000 -0400 +*************** +*** 298,305 **** +--- 298,307 ---- + { + char c =3D command->value.Connection->connector; ++ int was_newline; + =20 + s[0] =3D printing_comsub ? c : ';'; + s[1] =3D '\0'; + =20 ++ was_newline =3D deferred_heredocs =3D=3D 0 && was_heredoc =3D=3D 0 && c = =3D=3D '\n'; + if (deferred_heredocs =3D=3D 0) + { +*************** +*** 315,318 **** +--- 317,322 ---- + if (inside_function_def) + cprintf ("\n"); ++ else if (printing_comsub && c =3D=3D '\n' && was_newline =3D=3D 0) ++ cprintf ("\n"); /* preserve newlines in comsubs but don't double them = */ + else + { +*************** +*** 1366,1370 **** + } + else +! newline ("}"); + =20 + dispose_command (cmdcopy); +--- 1371,1379 ---- + } + else +! { +! /* { */ +! newline ("}"); +! was_heredoc =3D 0; /* not printing any here-documents now */ +! } + =20 + dispose_command (cmdcopy); +*************** +*** 1443,1447 **** + } + else +! newline ("}"); + =20 + result =3D the_printed_command; +--- 1452,1459 ---- + } + else +! { /* { */ +! newline ("}"); +! was_heredoc =3D 0; +! } + =20 + result =3D the_printed_command; +*** ../bash-5.2/patchlevel.h 2020-06-22 14:51:03.000000000 -0400 +--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + =20 +! #define PATCHLEVEL 2 + =20 + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + =20 +! #define PATCHLEVEL 3 + =20 + #endif /* _PATCHLEVEL_H_ */ diff --git a/src/patches/bash/bash52-004 b/src/patches/bash/bash52-004 new file mode 100644 index 000000000..d0834c19c --- /dev/null +++ b/src/patches/bash/bash52-004 @@ -0,0 +1,70 @@ + BASH PATCH REPORT + =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +Bash-Release: 5.2 +Patch-ID: bash52-004 + +Bug-Reported-by: Antoine +Bug-Reference-ID: <8bd59753-05ff-9b09-2337-2c7f52ded650(a)glitchimini.net> +Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2022-10/msg00= 022.html + +Bug-Description: + +Bash needs to keep better track of nested brace expansions to avoid problems +with quoting and POSIX semantics. + +Patch (apply with `patch -p0'): + +*** ../bash-5.2-patched/subst.c 2022-10-05 10:22:02.000000000 -0400 +--- subst.c 2022-10-06 15:19:08.000000000 -0400 +*************** +*** 1799,1802 **** +--- 1804,1810 ---- + } + =20 ++ #define PARAMEXPNEST_MAX 32 // for now ++ static int dbstate[PARAMEXPNEST_MAX]; ++=20 + /* Extract a parameter expansion expression within ${ and } from STRING. + Obey the Posix.2 rules for finding the ending `}': count braces while +*************** +*** 1829,1832 **** +--- 1837,1842 ---- + return (extract_heredoc_dolbrace_string (string, sindex, quoted, flags= )); + =20 ++ dbstate[0] =3D dolbrace_state; ++=20 + pass_character =3D 0; + nesting_level =3D 1; +*************** +*** 1853,1856 **** +--- 1863,1868 ---- + if (string[i] =3D=3D '$' && string[i+1] =3D=3D LBRACE) + { ++ if (nesting_level < PARAMEXPNEST_MAX) ++ dbstate[nesting_level] =3D dolbrace_state; + nesting_level++; + i +=3D 2; +*************** +*** 1865,1868 **** +--- 1877,1881 ---- + if (nesting_level =3D=3D 0) + break; ++ dolbrace_state =3D (nesting_level < PARAMEXPNEST_MAX) ? dbstate[nesting= _level] : dbstate[0]; /* Guess using initial state */ + i++; + continue; +*** ../bash-5.2/patchlevel.h 2020-06-22 14:51:03.000000000 -0400 +--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + =20 +! #define PATCHLEVEL 3 + =20 + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + =20 +! #define PATCHLEVEL 4 + =20 + #endif /* _PATCHLEVEL_H_ */ diff --git a/src/patches/bash/bash52-005 b/src/patches/bash/bash52-005 new file mode 100644 index 000000000..3f6a85215 --- /dev/null +++ b/src/patches/bash/bash52-005 @@ -0,0 +1,47 @@ + BASH PATCH REPORT + =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +Bash-Release: 5.2 +Patch-ID: bash52-005 + +Bug-Reported-by: Justin Wood (Callek) +Bug-Reference-ID: +Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2022-10/msg00= 088.html + +Bug-Description: + +Null pattern substitution replacement strings can cause a crash. + +Patch (apply with `patch -p0'): + +*** ../bash-5.2-patched/subst.c 2022-10-05 10:22:02.000000000 -0400 +--- subst.c 2022-10-13 16:57:26.000000000 -0400 +*************** +*** 8966,8970 **** + } + else if (*string =3D=3D 0 && (match_pattern (string, pat, mtype, &s, &e)= !=3D 0)) +! return ((mflags & MATCH_EXPREP) ? strcreplace (rep, '&', "", 2) : save= string (rep)); + =20 + ret =3D (char *)xmalloc (rsize =3D 64); +--- 8966,8971 ---- + } + else if (*string =3D=3D 0 && (match_pattern (string, pat, mtype, &s, &e)= !=3D 0)) +! return (mflags & MATCH_EXPREP) ? strcreplace (rep, '&', "", 2) +! : (rep ? savestring (rep) : savestring ("")); + =20 + ret =3D (char *)xmalloc (rsize =3D 64); +*** ../bash-5.2/patchlevel.h 2020-06-22 14:51:03.000000000 -0400 +--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + =20 +! #define PATCHLEVEL 4 + =20 + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + =20 +! #define PATCHLEVEL 5 + =20 + #endif /* _PATCHLEVEL_H_ */ diff --git a/src/patches/bash/bash52-006 b/src/patches/bash/bash52-006 new file mode 100644 index 000000000..851cfd7b6 --- /dev/null +++ b/src/patches/bash/bash52-006 @@ -0,0 +1,293 @@ + BASH PATCH REPORT + =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +Bash-Release: 5.2 +Patch-ID: bash52-006 + +Bug-Reported-by: feng xiangjun +Bug-Reference-ID: +Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2022-10/msg00= 089.html + +Bug-Description: + +In interactive shells, interrupting the shell while entering a command +substitution can inhibit alias expansion. + +Patch (apply with `patch -p0'): + +*** ../bash-5.2-patched/parse.y 2022-10-08 13:10:06.000000000 -0400 +--- parse.y 2022-10-14 10:03:19.000000000 -0400 +*************** +*** 3307,3310 **** +--- 3307,3312 ---- + extended_glob =3D global_extglob; + #endif ++ if (parser_state & (PST_CMDSUBST|PST_STRING)) ++ expand_aliases =3D expaliases_flag; + =20 + parser_state =3D 0; +*************** +*** 4389,4392 **** +--- 4391,4395 ---- + parser_state |=3D PST_NOERROR; + =20 ++ parser_state |=3D PST_STRING; + expand_aliases =3D 0; + =20 +*************** +*** 6402,6406 **** + parser_state &=3D ~PST_NOEXPAND; /* parse_comsub sentinel */ + /* State flags we want to set for this run through the tokenizer. */ +! parser_state |=3D PST_COMPASSIGN|PST_REPARSE; + } + =20 +--- 6405,6409 ---- + parser_state &=3D ~PST_NOEXPAND; /* parse_comsub sentinel */ + /* State flags we want to set for this run through the tokenizer. */ +! parser_state |=3D PST_COMPASSIGN|PST_REPARSE|PST_STRING; + } + =20 +*** ../bash-20221007/parser.h 2022-08-30 11:39:56.000000000 -0400 +--- parser.h 2022-10-14 09:56:18.000000000 -0400 +*************** +*** 51,54 **** +--- 51,55 ---- + #define PST_NOEXPAND 0x400000 /* don't expand anything in read_token_word;= for command substitution */ + #define PST_NOERROR 0x800000 /* don't print error messages in yyerror */ ++ #define PST_STRING 0x1000000 /* parsing a string to a command or word list= */ + =20 + /* Definition of the delimiter stack. Needed by parse.y and bashhist.c. */ +*** ../bash-20221007/builtins/shopt.def 2022-10-07 10:25:55.000000000 -0400 +--- builtins/shopt.def 2022-10-14 09:30:11.000000000 -0400 +*************** +*** 150,153 **** +--- 150,156 ---- + #endif + =20 ++ int expaliases_flag =3D 0; ++ static int shopt_set_expaliases PARAMS((char *, int)); ++=20 + static int shopt_set_debug_mode PARAMS((char *, int)); + =20 +*************** +*** 199,203 **** + { "dotglob", &glob_dot_filenames, (shopt_set_func_t *)NULL }, + { "execfail", &no_exit_on_failed_exec, (shopt_set_func_t *)NULL }, +! { "expand_aliases", &expand_aliases, (shopt_set_func_t *)NULL }, + #if defined (DEBUGGER) + { "extdebug", &debugging_mode, shopt_set_debug_mode }, +--- 202,206 ---- + { "dotglob", &glob_dot_filenames, (shopt_set_func_t *)NULL }, + { "execfail", &no_exit_on_failed_exec, (shopt_set_func_t *)NULL }, +! { "expand_aliases", &expaliases_flag, shopt_set_expaliases }, + #if defined (DEBUGGER) + { "extdebug", &debugging_mode, shopt_set_debug_mode }, +*************** +*** 351,355 **** + allow_null_glob_expansion =3D glob_dot_filenames =3D 0; + no_exit_on_failed_exec =3D 0; +! expand_aliases =3D 0; + extended_quote =3D 1; + fail_glob_expansion =3D 0; +--- 354,358 ---- + allow_null_glob_expansion =3D glob_dot_filenames =3D 0; + no_exit_on_failed_exec =3D 0; +! expand_aliases =3D expaliases_flag =3D 0; + extended_quote =3D 1; + fail_glob_expansion =3D 0; +*************** +*** 632,635 **** +--- 635,647 ---- + } + =20 ++ static int ++ shopt_set_expaliases (option_name, mode) ++ char *option_name; ++ int mode; ++ { ++ expand_aliases =3D expaliases_flag; ++ return 0; ++ } ++=20 + #if defined (READLINE) + static int +*** ../bash-20221007/builtins/common.h 2022-10-07 10:10:17.000000000 -0400 +--- builtins/common.h 2022-10-14 09:29:25.000000000 -0400 +*************** +*** 258,261 **** +--- 258,263 ---- + #endif + =20 ++ extern int expaliases_flag; ++=20 + /* variables from source.def */ + extern int source_searches_cwd; +*** ../bash-20221007/execute_cmd.c 2022-10-10 10:48:54.000000000 -0400 +--- execute_cmd.c 2022-10-14 09:32:24.000000000 -0400 +*************** +*** 1537,1541 **** + aliases. */ + if (ois !=3D interactive_shell) +! expand_aliases =3D 0; + } + =20 +--- 1537,1541 ---- + aliases. */ + if (ois !=3D interactive_shell) +! expand_aliases =3D expaliases_flag =3D 0; + } + =20 +*** ../bash-20221007/general.c 2021-11-04 14:12:38.000000000 -0400 +--- general.c 2022-10-14 09:34:24.000000000 -0400 +*************** +*** 92,96 **** + &interactive_comments, + &source_uses_path, +! &expand_aliases, + &inherit_errexit, + &print_shift_error, +--- 92,96 ---- + &interactive_comments, + &source_uses_path, +! &expaliases_flag, + &inherit_errexit, + &print_shift_error, +*************** +*** 107,111 **** + if (on !=3D 0) + { +! interactive_comments =3D source_uses_path =3D expand_aliases =3D 1; + inherit_errexit =3D 1; + source_searches_cwd =3D 0; +--- 107,112 ---- + if (on !=3D 0) + { +! interactive_comments =3D source_uses_path =3D 1; +! expand_aliases =3D expaliases_flag =3D 1; + inherit_errexit =3D 1; + source_searches_cwd =3D 0; +*************** +*** 117,120 **** +--- 118,122 ---- + { + set_posix_options (saved_posix_vars); ++ expand_aliases =3D expaliases_flag; + free (saved_posix_vars); + saved_posix_vars =3D 0; +*************** +*** 123,127 **** + { + source_searches_cwd =3D 1; +! expand_aliases =3D interactive_shell; + print_shift_error =3D 0; + } +--- 125,129 ---- + { + source_searches_cwd =3D 1; +! expand_aliases =3D expaliases_flag =3D interactive_shell; /* XXX */ + print_shift_error =3D 0; + } + +*** ../bash-5.2-patched/shell.c 2022-03-04 15:13:00.000000000 -0500 +--- shell.c 2022-10-14 09:36:19.000000000 -0400 +*************** +*** 1845,1850 **** + init_interactive () + { +! expand_aliases =3D interactive_shell =3D startup_state =3D 1; +! interactive =3D 1; + #if defined (HISTORY) + if (enable_history_list =3D=3D -1) +--- 1845,1850 ---- + init_interactive () + { +! expand_aliases =3D expaliases_flag =3D 1; +! interactive_shell =3D startup_state =3D interactive =3D 1; + #if defined (HISTORY) + if (enable_history_list =3D=3D -1) +*************** +*** 1866,1870 **** + #endif /* HISTORY */ + interactive_shell =3D startup_state =3D interactive =3D 0; +! expand_aliases =3D posixly_correct; /* XXX - was 0 not posixly_correct */ + no_line_editing =3D 1; + #if defined (JOB_CONTROL) +--- 1866,1870 ---- + #endif /* HISTORY */ + interactive_shell =3D startup_state =3D interactive =3D 0; +! expand_aliases =3D expaliases_flag =3D posixly_correct; /* XXX - was 0 n= ot posixly_correct */ + no_line_editing =3D 1; + #if defined (JOB_CONTROL) +*************** +*** 1883,1887 **** + #endif + init_noninteractive (); +! expand_aliases =3D interactive_shell =3D startup_state =3D 1; + #if defined (HISTORY) + remember_on_history =3D enable_history_list; /* XXX */ +--- 1883,1887 ---- + #endif + init_noninteractive (); +! expand_aliases =3D expaliases_flag =3D interactive_shell =3D startup_sta= te =3D 1; + #if defined (HISTORY) + remember_on_history =3D enable_history_list; /* XXX */ +*************** +*** 2026,2030 **** + forced_interactive =3D interactive_shell =3D 0; + subshell_environment =3D running_in_background =3D 0; +! expand_aliases =3D 0; + bash_argv_initialized =3D 0; + =20 +--- 2026,2030 ---- + forced_interactive =3D interactive_shell =3D 0; + subshell_environment =3D running_in_background =3D 0; +! expand_aliases =3D expaliases_flag =3D 0; + bash_argv_initialized =3D 0; + =20 +*** ../bash-5.2-patched/y.tab.c 2022-09-23 10:18:27.000000000 -0400 +--- y.tab.c 2022-10-14 14:57:26.000000000 -0400 +*************** +*** 5618,5621 **** +--- 5618,5623 ---- + extended_glob =3D global_extglob; + #endif ++ if (parser_state & (PST_CMDSUBST|PST_STRING)) ++ expand_aliases =3D expaliases_flag; + =20 + parser_state =3D 0; +*************** +*** 6700,6703 **** +--- 6702,6706 ---- + parser_state |=3D PST_NOERROR; + =20 ++ parser_state |=3D PST_STRING; + expand_aliases =3D 0; + =20 +*************** +*** 8713,8717 **** + parser_state &=3D ~PST_NOEXPAND; /* parse_comsub sentinel */ + /* State flags we want to set for this run through the tokenizer. */ +! parser_state |=3D PST_COMPASSIGN|PST_REPARSE; + } + =20 +--- 8716,8720 ---- + parser_state &=3D ~PST_NOEXPAND; /* parse_comsub sentinel */ + /* State flags we want to set for this run through the tokenizer. */ +! parser_state |=3D PST_COMPASSIGN|PST_REPARSE|PST_STRING; + } + =20 +*** ../bash-5.2/patchlevel.h 2020-06-22 14:51:03.000000000 -0400 +--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + =20 +! #define PATCHLEVEL 5 + =20 + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + =20 +! #define PATCHLEVEL 6 + =20 + #endif /* _PATCHLEVEL_H_ */ diff --git a/src/patches/bash/bash52-007 b/src/patches/bash/bash52-007 new file mode 100644 index 000000000..152776f4b --- /dev/null +++ b/src/patches/bash/bash52-007 @@ -0,0 +1,262 @@ + BASH PATCH REPORT + =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +Bash-Release: 5.2 +Patch-ID: bash52-007 + +Bug-Reported-by: Bruce Jerrick +Bug-Reference-ID: +Bug-Reference-URL: https://bugzilla.redhat.com/show_bug.cgi?id=3D2134307 + +Bug-Description: + +This patch fixes several problems with alias expansion inside command +substitutions when in POSIX mode. + +Patch (apply with `patch -p0'): + +*** /fs1/chet/scratch/bash-5.2.6/parse.y 2022-11-02 10:36:54.000000000 -0400 +--- parse.y 2022-10-24 10:53:26.000000000 -0400 +*************** +*** 3613,3616 **** +--- 3614,3618 ---- + #define P_ARRAYSUB 0x0020 /* parsing a [...] array subscript for assignmen= t */ + #define P_DOLBRACE 0x0040 /* parsing a ${...} construct */ ++ #define P_ARITH 0x0080 /* parsing a $(( )) arithmetic expansion */ + =20 + /* Lexical state while parsing a grouping construct or $(...). */ +*************** +*** 3911,3914 **** +--- 3914,3920 ---- + else if ((flags & (P_ARRAYSUB|P_DOLBRACE)) && (tflags & LEX_WASDOL) && = (ch =3D=3D '(' || ch =3D=3D '{' || ch =3D=3D '[')) /* ) } ] */ + goto parse_dollar_word; ++ else if ((flags & P_ARITH) && (tflags & LEX_WASDOL) && ch =3D=3D '(') /= *)*/ ++ /* $() inside $(( ))/$[ ] */ ++ goto parse_dollar_word; + #if defined (PROCESS_SUBSTITUTION) + /* XXX - technically this should only be recognized at the start of +*************** +*** 3941,3945 **** + nestret =3D parse_matched_pair (0, '{', '}', &nestlen, P_FIRSTCLOSE|P= _DOLBRACE|rflags); + else if (ch =3D=3D '[') /* ] */ +! nestret =3D parse_matched_pair (0, '[', ']', &nestlen, rflags); + =20 + CHECK_NESTRET_ERROR (); +--- 3947,3951 ---- + nestret =3D parse_matched_pair (0, '{', '}', &nestlen, P_FIRSTCLOSE|P= _DOLBRACE|rflags); + else if (ch =3D=3D '[') /* ] */ +! nestret =3D parse_matched_pair (0, '[', ']', &nestlen, rflags|P_ARITH= ); + =20 + CHECK_NESTRET_ERROR (); +*************** +*** 4080,4084 **** + shell_ungetc (peekc); + if (peekc =3D=3D '(') /*)*/ +! return (parse_matched_pair (qc, open, close, lenp, 0)); + } + =20 +--- 4086,4090 ---- + shell_ungetc (peekc); + if (peekc =3D=3D '(') /*)*/ +! return (parse_matched_pair (qc, open, close, lenp, P_ARITH)); + } + =20 +*************** +*** 4501,4505 **** + =20 + exp_lineno =3D line_number; +! ttok =3D parse_matched_pair (0, '(', ')', &ttoklen, 0); + rval =3D 1; + if (ttok =3D=3D &matched_pair_error) +--- 4512,4516 ---- + =20 + exp_lineno =3D line_number; +! ttok =3D parse_matched_pair (0, '(', ')', &ttoklen, P_ARITH); + rval =3D 1; + if (ttok =3D=3D &matched_pair_error) +*************** +*** 5016,5020 **** + } + else +! ttok =3D parse_matched_pair (cd, '[', ']', &ttoklen, 0); + if (ttok =3D=3D &matched_pair_error) + return -1; /* Bail immediately. */ +--- 5030,5034 ---- + } + else +! ttok =3D parse_matched_pair (cd, '[', ']', &ttoklen, P_ARITH); + if (ttok =3D=3D &matched_pair_error) + return -1; /* Bail immediately. */ +*** ../bash-5.2.6/y.tab.c 2022-11-02 10:36:54.000000000 -0400 +--- y.tab.c 2022-11-02 10:55:58.000000000 -0400 +*************** +*** 5924,5927 **** +--- 5924,5928 ---- + #define P_ARRAYSUB 0x0020 /* parsing a [...] array subscript for assignmen= t */ + #define P_DOLBRACE 0x0040 /* parsing a ${...} construct */ ++ #define P_ARITH 0x0080 /* parsing a $(( )) arithmetic expansion */ + =20 + /* Lexical state while parsing a grouping construct or $(...). */ +*************** +*** 6222,6225 **** +--- 6223,6229 ---- + else if ((flags & (P_ARRAYSUB|P_DOLBRACE)) && (tflags & LEX_WASDOL) && = (ch =3D=3D '(' || ch =3D=3D '{' || ch =3D=3D '[')) /* ) } ] */ + goto parse_dollar_word; ++ else if ((flags & P_ARITH) && (tflags & LEX_WASDOL) && ch =3D=3D '(') /= *)*/ ++ /* $() inside $(( ))/$[ ] */ ++ goto parse_dollar_word; + #if defined (PROCESS_SUBSTITUTION) + /* XXX - technically this should only be recognized at the start of +*************** +*** 6252,6256 **** + nestret =3D parse_matched_pair (0, '{', '}', &nestlen, P_FIRSTCLOSE|P= _DOLBRACE|rflags); + else if (ch =3D=3D '[') /* ] */ +! nestret =3D parse_matched_pair (0, '[', ']', &nestlen, rflags); + =20 + CHECK_NESTRET_ERROR (); +--- 6256,6260 ---- + nestret =3D parse_matched_pair (0, '{', '}', &nestlen, P_FIRSTCLOSE|P= _DOLBRACE|rflags); + else if (ch =3D=3D '[') /* ] */ +! nestret =3D parse_matched_pair (0, '[', ']', &nestlen, rflags|P_ARITH= ); + =20 + CHECK_NESTRET_ERROR (); +*************** +*** 6391,6395 **** + shell_ungetc (peekc); + if (peekc =3D=3D '(') /*)*/ +! return (parse_matched_pair (qc, open, close, lenp, 0)); + } + =20 +--- 6395,6399 ---- + shell_ungetc (peekc); + if (peekc =3D=3D '(') /*)*/ +! return (parse_matched_pair (qc, open, close, lenp, P_ARITH)); + } + =20 +*************** +*** 6812,6816 **** + =20 + exp_lineno =3D line_number; +! ttok =3D parse_matched_pair (0, '(', ')', &ttoklen, 0); + rval =3D 1; + if (ttok =3D=3D &matched_pair_error) +--- 6816,6820 ---- + =20 + exp_lineno =3D line_number; +! ttok =3D parse_matched_pair (0, '(', ')', &ttoklen, P_ARITH); + rval =3D 1; + if (ttok =3D=3D &matched_pair_error) +*************** +*** 7327,7331 **** + } + else +! ttok =3D parse_matched_pair (cd, '[', ']', &ttoklen, 0); + if (ttok =3D=3D &matched_pair_error) + return -1; /* Bail immediately. */ +--- 7331,7335 ---- + } + else +! ttok =3D parse_matched_pair (cd, '[', ']', &ttoklen, P_ARITH); + if (ttok =3D=3D &matched_pair_error) + return -1; /* Bail immediately. */ +*** /fs1/chet/scratch/bash-5.2.6/builtins/evalstring.c 2022-07-18 14:46:56.0= 00000000 -0400 +--- builtins/evalstring.c 2022-10-18 10:57:51.000000000 -0400 +*************** +*** 432,435 **** +--- 432,437 ---- + if (parse_command () =3D=3D 0) + { ++ int local_expalias, local_alflag; ++=20 + if ((flags & SEVAL_PARSEONLY) || (interactive_shell =3D=3D 0 && read_bu= t_dont_execute)) + { +*************** +*** 508,511 **** +--- 510,526 ---- + #endif /* ONESHOT */ + =20 ++ /* We play tricks in the parser and command_substitute() turning ++ expand_aliases on and off depending on which parsing pass and ++ whether or not we're in posix mode. This only matters for ++ parsing, and we let the higher layers deal with that. We just ++ want to ensure that expand_aliases is set to the appropriate ++ global value when we go to execute this command, so we save ++ and restore it around the execution (we don't restore it if ++ the global value of the flag (expaliases_flag) changes). */ ++ local_expalias =3D expand_aliases; ++ local_alflag =3D expaliases_flag; ++ if (subshell_environment & SUBSHELL_COMSUB) ++ expand_aliases =3D expaliases_flag; ++=20 + /* See if this is a candidate for $( word : (char *)NULL; + if (tword) +--- 11306,11310 ---- + { + de_backslash (temp); +! tword =3D command_substitute (temp, quoted, PF_BACKQUOTE); + temp1 =3D tword ? tword->word : (char *)NULL; + if (tword) +*** ../bash-5.2/patchlevel.h 2020-06-22 14:51:03.000000000 -0400 +--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + =20 +! #define PATCHLEVEL 6 + =20 + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + =20 +! #define PATCHLEVEL 7 + =20 + #endif /* _PATCHLEVEL_H_ */ diff --git a/src/patches/bash/bash52-008 b/src/patches/bash/bash52-008 new file mode 100644 index 000000000..ff6371140 --- /dev/null +++ b/src/patches/bash/bash52-008 @@ -0,0 +1,58 @@ + BASH PATCH REPORT + =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +Bash-Release: 5.2 +Patch-ID: bash52-008 + +Bug-Reported-by: Glenn Jackman +Bug-Reference-ID: +Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2022-10/msg00= 095.html + +Bug-Description: + +Array subscript expansion can inappropriately quote brackets if the expressi= on +contains < or >. + +Patch (apply with `patch -p0'): + +*** ../bash-20221015/subst.c 2022-10-18 10:47:33.000000000 -0500 +--- subst.c 2022-10-20 11:41:07.000000000 -0500 +*************** +*** 3820,3823 **** +--- 3820,3827 ---- + #endif + =20 ++ /* We don't perform process substitution in arithmetic expressions, so don= 't ++ bother checking for it. */ ++ #define ARITH_EXP_CHAR(s) (s =3D=3D '$' || s =3D=3D '`' || s =3D=3D CTLESC= || s =3D=3D '~') ++=20 + /* If there are any characters in STRING that require full expansion, + then call FUNC to expand STRING; otherwise just perform quote +*************** +*** 4029,4033 **** + while (string[i]) + { +! if (EXP_CHAR (string[i])) + break; + else if (string[i] =3D=3D '\'' || string[i] =3D=3D '\\' || string[i]= =3D=3D '"') +--- 4033,4037 ---- + while (string[i]) + { +! if (ARITH_EXP_CHAR (string[i])) + break; + else if (string[i] =3D=3D '\'' || string[i] =3D=3D '\\' || string[i]= =3D=3D '"') +*** ../bash-5.2/patchlevel.h 2020-06-22 14:51:03.000000000 -0400 +--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + =20 +! #define PATCHLEVEL 7 + =20 + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + =20 +! #define PATCHLEVEL 8 + =20 + #endif /* _PATCHLEVEL_H_ */ diff --git a/src/patches/bash/bash52-009 b/src/patches/bash/bash52-009 new file mode 100644 index 000000000..f907c8c47 --- /dev/null +++ b/src/patches/bash/bash52-009 @@ -0,0 +1,43 @@ + BASH PATCH REPORT + =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +Bash-Release: 5.2 +Patch-ID: bash52-009 + +Bug-Reported-by: Corey Hickey +Bug-Reference-ID: <134330ef-0ead-d73e-68eb-d58fc51efdba(a)fatooh.org> +Bug-Reference-URL: https://lists.gnu.org/archive/html/help-bash/2022-10/msg0= 0025.html + +Bug-Description: + +Bash arithmetic expansion should allow `@' and `*' to be used as associative +array keys in expressions. + +Patch (apply with `patch -p0'): + +*** ../bash-5.2-patched/expr.c 2022-07-11 10:03:34.000000000 -0400 +--- expr.c 2022-10-31 10:51:08.000000000 -0400 +*************** +*** 1169,1172 **** +--- 1169,1174 ---- + #if defined (ARRAY_VARS) + aflag =3D tflag; /* use a different variable for now */ ++ if (shell_compatibility_level > 51) ++ aflag |=3D AV_ATSTARKEYS; + v =3D (e =3D=3D ']') ? array_variable_part (tok, tflag, (char **)0, (int= *)0) : find_variable (tok); + #else +*** ../bash-5.2/patchlevel.h 2020-06-22 14:51:03.000000000 -0400 +--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + =20 +! #define PATCHLEVEL 8 + =20 + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + =20 +! #define PATCHLEVEL 9 + =20 + #endif /* _PATCHLEVEL_H_ */ --=20 2.38.1 --===============2704738413247612982==--