From f311a77983e608c3218f492ece715bced27f77a0 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sat, 8 Oct 2022 23:07:20 +0100 Subject: app-shells/bash: reorganise 5.2_p2-r2 patches Just splits the patches from 47950445cddff736a1e6c0c1346a20ab6b326cc1 into two. Closes: https://bugs.gentoo.org/873931 See: 47950445cddff736a1e6c0c1346a20ab6b326cc1 Thanks-to: Kerin Millar Signed-off-by: Sam James --- ...h-5.2_p2-fixes-for-extglob-in-compat-mode.patch | 38 ---------------------- 1 file changed, 38 deletions(-) (limited to 'app-shells/bash/files/bash-5.2_p2-fixes-for-extglob-in-compat-mode.patch') diff --git a/app-shells/bash/files/bash-5.2_p2-fixes-for-extglob-in-compat-mode.patch b/app-shells/bash/files/bash-5.2_p2-fixes-for-extglob-in-compat-mode.patch index 06415b5cdaa4..16393c79af8b 100644 --- a/app-shells/bash/files/bash-5.2_p2-fixes-for-extglob-in-compat-mode.patch +++ b/app-shells/bash/files/bash-5.2_p2-fixes-for-extglob-in-compat-mode.patch @@ -213,44 +213,6 @@ https://git.savannah.gnu.org/cgit/bash.git/commit/?h=devel&id=22f21b760ed90eb77c This file is part of GNU Bash, the Bourne Again SHell. ---- subst.c -+++ subst.c -@@ -1798,6 +1798,9 @@ extract_heredoc_dolbrace_string (string, sindex, quoted, flags) - return (result); - } - -+#define PARAMEXPNEST_MAX 32 // for now -+static int dbstate[PARAMEXPNEST_MAX]; -+ - /* Extract a parameter expansion expression within ${ and } from STRING. - Obey the Posix.2 rules for finding the ending `}': count braces while - skipping over enclosed quoted strings and command substitutions. -@@ -1828,6 +1831,8 @@ extract_dollar_brace_string (string, sindex, quoted, flags) - if (quoted == Q_HERE_DOCUMENT && dolbrace_state == DOLBRACE_QUOTE && (flags & SX_NOALLOC) == 0) - return (extract_heredoc_dolbrace_string (string, sindex, quoted, flags)); - -+ dbstate[0] = dolbrace_state; -+ - pass_character = 0; - nesting_level = 1; - slen = strlen (string + *sindex) + *sindex; -@@ -1852,6 +1857,8 @@ extract_dollar_brace_string (string, sindex, quoted, flags) - - if (string[i] == '$' && string[i+1] == LBRACE) - { -+ if (nesting_level < PARAMEXPNEST_MAX) -+ dbstate[nesting_level] = dolbrace_state; - nesting_level++; - i += 2; - if (dolbrace_state == DOLBRACE_QUOTE || dolbrace_state == DOLBRACE_WORD) -@@ -1864,6 +1871,7 @@ extract_dollar_brace_string (string, sindex, quoted, flags) - nesting_level--; - if (nesting_level == 0) - break; -+ dolbrace_state = (nesting_level < PARAMEXPNEST_MAX) ? dbstate[nesting_level] : dbstate[0]; /* Guess using initial state */ - i++; - continue; - } --- tests/extglob.right +++ tests/extglob.right @@ -182,3 +182,10 @@ no dotglob: .a .foo bar -- cgit v1.2.3