From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2DFAC1584AD for ; Wed, 07 May 2025 14:52:08 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 16F9A3430C9 for ; Wed, 07 May 2025 14:52:08 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id A2B1F1103C1; Wed, 07 May 2025 14:52:02 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 9A94B1103C1 for ; Wed, 07 May 2025 14:52:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4E0A23430B5 for ; Wed, 07 May 2025 14:52:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B25712827 for ; Wed, 07 May 2025 14:52:00 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1746629462.ab0259bdf5fd1c77ca72f7723e73d43d6820aa0f.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/bash/, app-shells/bash/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-shells/bash/bash-5.2_p37-r2.ebuild app-shells/bash/bash-5.2_p37-r3.ebuild app-shells/bash/files/bash-5.2_p32-erroneous-delimiter-pushback-condition.patch app-shells/bash/files/bash-5.2_p32-invalid-continuation-byte-ignored-as-delimiter-2.patch X-VCS-Directories: app-shells/bash/ app-shells/bash/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: ab0259bdf5fd1c77ca72f7723e73d43d6820aa0f X-VCS-Branch: master Date: Wed, 07 May 2025 14:52:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7cc2f324-6e8e-4055-a0be-68d14828b4f1 X-Archives-Hash: 752215179793e1af30f70fb37f7a37e7 commit: ab0259bdf5fd1c77ca72f7723e73d43d6820aa0f Author: Kerin Millar plushkava net> AuthorDate: Wed May 7 14:29:28 2025 +0000 Commit: Sam James gentoo org> CommitDate: Wed May 7 14:51:02 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab0259bd 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 plushkava.net> Signed-off-by: Sam James gentoo.org> ...{bash-5.2_p37-r2.ebuild => bash-5.2_p37-r3.ebuild} | 0 ...2_p32-erroneous-delimiter-pushback-condition.patch | 6 +++--- ...lid-continuation-byte-ignored-as-delimiter-2.patch | 19 ++++++++++--------- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/app-shells/bash/bash-5.2_p37-r2.ebuild b/app-shells/bash/bash-5.2_p37-r3.ebuild similarity index 100% rename from app-shells/bash/bash-5.2_p37-r2.ebuild rename to app-shells/bash/bash-5.2_p37-r3.ebuild 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 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. @@ -47,7 +47,7 @@ Signed-off-by: Kerin Millar 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) diff --git a/app-shells/bash/files/bash-5.2_p32-invalid-continuation-byte-ignored-as-delimiter-2.patch b/app-shells/bash/files/bash-5.2_p32-invalid-continuation-byte-ignored-as-delimiter-2.patch index ff6fdf25414b..ea27d3b3d194 100644 --- a/app-shells/bash/files/bash-5.2_p32-invalid-continuation-byte-ignored-as-delimiter-2.patch +++ b/app-shells/bash/files/bash-5.2_p32-invalid-continuation-byte-ignored-as-delimiter-2.patch @@ -1,4 +1,4 @@ -From fb31e1965baa732f9e4cdbe3a7d6691d7beb4e03 Mon Sep 17 00:00:00 2001 +From c87aca06c259b6283a499584d95c87f163accba0 Mon Sep 17 00:00:00 2001 From: Kerin Millar Date: Mon, 28 Apr 2025 07:59:25 +0100 Subject: [PATCH 2/3] Backport fix for invalid continuation bytes above 0x7F @@ -26,11 +26,11 @@ Link: https://mywiki.wooledge.org/BashPitfalls#IFS.3D_read_-r_-d_.27.27_filename Link: https://lists.gnu.org/r/bug-bash/2024-08/msg00100.html Signed-off-by: Kerin Millar --- - builtins/read.def | 40 +++++++++++++++++++++++----------------- - 1 file changed, 23 insertions(+), 17 deletions(-) + builtins/read.def | 41 +++++++++++++++++++++++------------------ + 1 file changed, 23 insertions(+), 18 deletions(-) diff --git builtins/read.def builtins/read.def -index 53b4bd81..9fd9a74c 100644 +index 53b4bd81..48351c3c 100644 --- builtins/read.def +++ builtins/read.def @@ -142,7 +142,7 @@ sh_timer *read_timeout; @@ -80,16 +80,17 @@ index 53b4bd81..9fd9a74c 100644 mbchar[--i] = '\0'; /* unget the delimiter */ } break; /* invalid multibyte character */ -@@ -1220,6 +1219,8 @@ edit_line (p, itext) +@@ -1219,7 +1218,8 @@ edit_line (p, itext) + len = strlen (ret); ret = (char *)xrealloc (ret, len + 2); - ret[len++] = delim; +- ret[len++] = delim; + if (delim > 0) + ret[len++] = delim; ret[len] = '\0'; return ret; } -@@ -1240,7 +1241,7 @@ static rl_command_func_t *old_delim_func; +@@ -1240,7 +1240,7 @@ static rl_command_func_t *old_delim_func; static int old_newline_ctype; static rl_command_func_t *old_newline_func; @@ -98,7 +99,7 @@ index 53b4bd81..9fd9a74c 100644 static void set_eol_delim (c) -@@ -1252,19 +1253,21 @@ set_eol_delim (c) +@@ -1252,19 +1252,21 @@ set_eol_delim (c) initialize_readline (); cmap = rl_get_keymap (); @@ -128,7 +129,7 @@ index 53b4bd81..9fd9a74c 100644 delim_char = c; } -@@ -1280,7 +1283,10 @@ reset_eol_delim (cp) +@@ -1280,7 +1282,10 @@ reset_eol_delim (cp) cmap[RETURN].type = old_newline_ctype; cmap[RETURN].function = old_newline_func;