Tobias Powalowski pushed to branch main at Arch Linux / Packaging / Packages /
bash
Commits:
fa237d9c by Tobias Powalowski at 2025-05-07T17:46:53+02:00
really update patchset
- - - - -
3 changed files:
- PKGBUILD
- bash-5.2_p32-erroneous-delimiter-pushback-condition.patch
- bash-5.2_p32-invalid-continuation-byte-ignored-as-delimiter-2.patch
Changes:
=====================================
PKGBUILD
=====================================
@@ -9,7 +9,7 @@ pkgname=bash
_basever=5.2
_patchlevel=037
pkgver=${_basever}.${_patchlevel}
-pkgrel=4
+pkgrel=5
pkgdesc='The GNU Bourne Again shell'
arch=(x86_64)
license=('GPL-3.0-or-later')
@@ -53,9 +53,9 @@
b2sums=('51b196e710794ebad8eac28c31c93eb99ac1a7db30919a13271e39e1cb66a0672f242df
'adab09c3f2ce3697e3659e01266120155714b80263bd125808edf556a354291af615540189553b1c32a2d462ac41e28a9df8fb9f7d963a3ca3629d297a46e62d'
'0c7f5eb5b697abf15c1d17888a973e44d0ead1f095778b41841a6a1937a5b9e7ce5fa6a05e4404504990b0a244fdecfc12ce7c33ee7d67b4c837435e9bfe2b57'
'373aa3be1f0a6bc65403cde63cbc4dcd612336e86b1cae918670a99e8ca639c665ac7efb467ec8823a62cec0a71c485bd3fda4bbf058d759498377f5cfe90f51'
-
'db1a2a7bc82e3e5dd8478ab5c52e7c630bf818ee9e09f6df34c34091426da21b5bb1727c892084a0b49733ad4be699d51c164019e7f87c6a67406553061509d9'
+
'82248ea90a51c9cb5d8c68dae43510556907147d5d721ffea8051543ef1a642380da228cacd207e8b443fa2202088dd7ac93e4782c4fd78f37b8666f2b426560'
'c6e48a37c88ab4d361eab3c375de13d837b79755b53cb46aea2f16ce664d6dfd024c2fdb228031e74444891ac70806f0851863fdce02b5dd28f6e7e447137fb7'
-
'c838aa2e64342ad975fd2e1782f0026ba36011996cfd080b013aec820eb5f5770e5b9b4b9149677c6d78182cd0498f229207e0ce120f998a15f6f638e1b57d0b'
+
'32df201c49a259605aac58daac4842bd09404129bc2a2ad8e5a30a2b8d8f0de69cc1d3013d729bc2818f62a8e572edb5fa7113c538f208e9da77590924bb52f1'
'61cc3b7c9e85ae29b48518a2579896cb037153184a233cb5636d8dce4c2a2fded88624c9d5a986d86fdd4b0d521828b510c7a0d16b3c8b95cfca8d4c0a74da17'
'2d53f99e485218ed47f2e40907023645594ac8ffcf00d0569050d54a8f4dabe0a2bdcab515a45b663283c2e6299d805b923ea7b7b789c6a4150c37a98a5b117c'
'dbfe5c1aaea94419305c1f8c9b54b94eab515260910f2309360ff702a27032faa34514e70b31adbb1e41bd912d4e43a610939cb07565f43e05dd19813a81752e'
=====================================
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 <[email protected]>
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 <[email protected]>
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)
=====================================
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 <[email protected]>
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 <[email protected]>
---
- 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;
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/bash/-/commit/fa237d9c9d63390003f75055343b7b6b19c8746c
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/bash/-/commit/fa237d9c9d63390003f75055343b7b6b19c8746c
You're receiving this email because of your account on gitlab.archlinux.org.
