summaryrefslogtreecommitdiff
path: root/app-shells/bash/files/bash-5.2_p32-erroneous-delimiter-pushback-condition.patch
diff options
context:
space:
mode:
authorKerin Millar <kfm@plushkava.net>2025-05-07 15:29:28 +0100
committerSam James <sam@gentoo.org>2025-05-07 15:51:02 +0100
commitab0259bdf5fd1c77ca72f7723e73d43d6820aa0f (patch)
tree81809a8adbc57dff533304825257d5d5ce30caa7 /app-shells/bash/files/bash-5.2_p32-erroneous-delimiter-pushback-condition.patch
parent9f33c0527a15c89c19bcf7386b48003a65a5edb6 (diff)
downloadgentoo-ab0259bdf5fd1c77ca72f7723e73d43d6820aa0f.tar.gz
gentoo-ab0259bdf5fd1c77ca72f7723e73d43d6820aa0f.tar.bz2
gentoo-ab0259bdf5fd1c77ca72f7723e73d43d6820aa0f.zip
app-shells/bash: add 5.2_p37-r3 to rectify the misapplication of a backported fix
While backporting commit e327891b52513bef0b34aac625c44f8fa6811f53 from the devel branch, I accidentally left in a line that should have been removed, resulting in bash occasionally segfaulting while using the -e option of the read builtin. Address that mistake. Additionally, correct a typo in the commit message of one of the other patches ("incoprorate" > "incorporate"). Fixes: 0193ee11e3aa99775c546ac63346ec05c01a51f7 Signed-off-by: Kerin Millar <kfm@plushkava.net> Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-shells/bash/files/bash-5.2_p32-erroneous-delimiter-pushback-condition.patch')
-rw-r--r--app-shells/bash/files/bash-5.2_p32-erroneous-delimiter-pushback-condition.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/app-shells/bash/files/bash-5.2_p32-erroneous-delimiter-pushback-condition.patch b/app-shells/bash/files/bash-5.2_p32-erroneous-delimiter-pushback-condition.patch
index 6e8000952644..e997c37cff15 100644
--- a/app-shells/bash/files/bash-5.2_p32-erroneous-delimiter-pushback-condition.patch
+++ b/app-shells/bash/files/bash-5.2_p32-erroneous-delimiter-pushback-condition.patch
@@ -1,4 +1,4 @@
-From 57fbf1c67f2d89365601f39e72781fba001fe2f3 Mon Sep 17 00:00:00 2001
+From 01463f6ae5a58b7309769596714e76b0d265b622 Mon Sep 17 00:00:00 2001
From: Kerin Millar <kfm@plushkava.net>
Date: Mon, 28 Apr 2025 08:13:38 +0100
Subject: [PATCH 3/3] Backport fix for erroneous delimiter pushback condition
@@ -23,7 +23,7 @@ $'\315'
''
''
-With the upcoming 5.3-rc2, which will incoprorate this patch, all three
+With the upcoming 5.3-rc2, which will incorporate this patch, all three
records are read correctly.
<FOO>
@@ -47,7 +47,7 @@ Signed-off-by: Kerin Millar <kfm@plushkava.net>
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git builtins/read.def builtins/read.def
-index 9fd9a74c..8000def3 100644
+index 48351c3c..70a3508b 100644
--- builtins/read.def
+++ builtins/read.def
@@ -1102,14 +1102,14 @@ read_mbchar (fd, string, ind, ch, delim, unbuffered)