[Buildroot] [PATCH v2] package/bash: bump to v5.3
Joseph Kogut
joseph.kogut at gmail.com
Wed Oct 22 20:01:33 UTC 2025
See the relevant announcement:
https://lists.gnu.org/archive/html/bug-bash/2025-07/msg00005.html
Changes:
- Removed upstreamed multibyte compilation fix
- Rebased missing include patch that remains unmerged
- Fixed Upstream: checkpackage warning
- Removed build failure workarounds enforcing older C standard
Signed-off-by: Joseph Kogut <joseph.kogut at gmail.com>
---
Changes in v2:
- Removed Fixes: lines that are outdated [Julien]
- Removed build failure workaround [Julien]
- Removed outdated .checkpackageignore entries [Julien]
- Link to v1: https://lore.kernel.org/all/20251021-bash-5-3-v1-1-b28c4c46a3a3@gmail.com/
---
.checkpackageignore | 2 -
...01-input.h-add-missing-include-on-stdio.h.patch | 11 ++--
...-fix-compilation-for-non-multibyte-builds.patch | 63 ----------------------
package/bash/bash.hash | 4 +-
package/bash/bash.mk | 11 +---
5 files changed, 9 insertions(+), 82 deletions(-)
diff --git a/.checkpackageignore b/.checkpackageignore
index e8c97c2d63..7b56e4e6c1 100644
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -228,8 +228,6 @@ package/avahi/S05avahi-setup.sh lib_sysv.Indent lib_sysv.Variables
package/avahi/S50avahi-daemon lib_sysv.Indent lib_sysv.Variables
package/babeld/S50babeld Shellcheck lib_sysv.Indent lib_sysv.Variables
package/babeltrace2/0001-configure-simplify-warning-flags-detection.patch lib_patch.Upstream
-package/bash/0001-input.h-add-missing-include-on-stdio.h.patch lib_patch.Upstream
-package/bash/0002-parse.y-fix-compilation-for-non-multibyte-builds.patch lib_patch.Upstream
package/bc/0001-bc-use-MAKEINFO-variable-for-docs.patch lib_patch.Upstream
package/bc/0002-notice-read-and-write-errors-on-input-and-output.patch lib_patch.Upstream
package/bcache-tools/0001-Don-t-inline-crc64-for-gcc-5-compatability.patch lib_patch.Upstream
diff --git a/package/bash/0001-input.h-add-missing-include-on-stdio.h.patch b/package/bash/0001-input.h-add-missing-include-on-stdio.h.patch
index fd008e9472..14d01c18b0 100644
--- a/package/bash/0001-input.h-add-missing-include-on-stdio.h.patch
+++ b/package/bash/0001-input.h-add-missing-include-on-stdio.h.patch
@@ -1,4 +1,4 @@
-From 4fa85c85b9a76afd3b19ed75bf17ccd2940f1f55 Mon Sep 17 00:00:00 2001
+From bb974701658ec88fe80357e58c44fd8df55aae77 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice at gmail.com>
Date: Sun, 16 Feb 2020 16:18:48 +0100
Subject: [PATCH] input.h: add missing include on stdio.h
@@ -15,13 +15,14 @@ Fixes:
- http://autobuild.buildroot.org/results/bfca306868df54c567215c45c8cdac838d02f567
Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
-[Upstream status: https://savannah.gnu.org/support/?110196]
+Upstream: https://savannah.gnu.org/support/?110196
+Signed-off-by: Joseph Kogut <joseph.kogut at gmail.com>
---
input.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/input.h b/input.h
-index 6aef1269..08b0fdea 100644
+index 592b6cb9..21544df4 100644
--- a/input.h
+++ b/input.h
@@ -21,6 +21,8 @@
@@ -32,7 +33,7 @@ index 6aef1269..08b0fdea 100644
+
#include "stdc.h"
- /* Function pointers can be declared as (Function *)foo. */
+ typedef int sh_cget_func_t (void); /* sh_ivoidfunc_t */
--
-2.24.1
+2.51.1
diff --git a/package/bash/0002-parse.y-fix-compilation-for-non-multibyte-builds.patch b/package/bash/0002-parse.y-fix-compilation-for-non-multibyte-builds.patch
deleted file mode 100644
index 378ff0dfd3..0000000000
--- a/package/bash/0002-parse.y-fix-compilation-for-non-multibyte-builds.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 0217fc2816e47ee296472df71d1011f0eb2937e6 Mon Sep 17 00:00:00 2001
-From: Vincent Fazio <vfazio at gmail.com>
-Date: Fri, 27 Jan 2023 14:37:26 -0600
-Subject: [PATCH] parse.y: fix compilation for non-multibyte builds
-
-Builds configured with --disable-multibyte or when the toolchain does
-not have WCHAR support would encounter a compile error due to an
-undeclared reference to shell_input_line_property in shell_getc.
-
-Add a HANDLE_MULTIBYTE guard to conditionally compile the block that
-references shell_input_line_property in shell_getc as it's only declared
-when HANDLE_MULTIBYTE is defined.
-
-Signed-off-by: Vincent Fazio <vfazio at gmail.com>
-[Upstream status: https://savannah.gnu.org/patch/index.php?10309]
----
- parse.y | 2 ++
- y.tab.c | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/parse.y b/parse.y
-index 1d12e639..8f1355c6 100644
---- a/parse.y
-+++ b/parse.y
-@@ -2640,6 +2640,7 @@ next_alias_char:
- parser_state |= PST_ENDALIAS;
- /* We need to do this to make sure last_shell_getc_is_singlebyte returns
- true, since we are returning a single-byte space. */
-+#if defined (HANDLE_MULTIBYTE)
- if (shell_input_line_index == shell_input_line_len && last_shell_getc_is_singlebyte == 0)
- {
- #if 0
-@@ -2653,6 +2654,7 @@ next_alias_char:
- shell_input_line_property[shell_input_line_index - 1] = 1;
- #endif
- }
-+#endif /* HANDLE_MULTIBYTE */
- return ' '; /* END_ALIAS */
- }
- #endif
-diff --git a/y.tab.c b/y.tab.c
-index 50c5845b..799f730f 100644
---- a/y.tab.c
-+++ b/y.tab.c
-@@ -4955,6 +4955,7 @@ next_alias_char:
- parser_state |= PST_ENDALIAS;
- /* We need to do this to make sure last_shell_getc_is_singlebyte returns
- true, since we are returning a single-byte space. */
-+#if defined (HANDLE_MULTIBYTE)
- if (shell_input_line_index == shell_input_line_len && last_shell_getc_is_singlebyte == 0)
- {
- #if 0
-@@ -4968,6 +4969,7 @@ next_alias_char:
- shell_input_line_property[shell_input_line_index - 1] = 1;
- #endif
- }
-+#endif /* HANDLE_MULTIBYTE */
- return ' '; /* END_ALIAS */
- }
- #endif
---
-2.25.1
-
diff --git a/package/bash/bash.hash b/package/bash/bash.hash
index c2fb1d38d4..35475d5194 100644
--- a/package/bash/bash.hash
+++ b/package/bash/bash.hash
@@ -1,4 +1,4 @@
# Locally calculated after checking pgp signature from
-# https://ftp.gnu.org/gnu/bash/bash-5.2.37.tar.gz.sig
-sha256 9599b22ecd1d5787ad7d3b7bf0c59f312b3396d1e281175dd1f8a4014da621ff bash-5.2.37.tar.gz
+# https://ftp.gnu.org/gnu/bash/bash-5.3.tar.gz.sig
+sha256 0d5cd86965f869a26cf64f4b71be7b96f90a3ba8b3d74e27e8e9d9d5550f31ba bash-5.3.tar.gz
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
diff --git a/package/bash/bash.mk b/package/bash/bash.mk
index 7fb43c52c0..ed99bbadb2 100644
--- a/package/bash/bash.mk
+++ b/package/bash/bash.mk
@@ -4,7 +4,7 @@
#
################################################################################
-BASH_VERSION = 5.2.37
+BASH_VERSION = 5.3
BASH_SITE = $(BR2_GNU_MIRROR)/bash
BASH_DEPENDENCIES = ncurses readline host-bison
BASH_LICENSE = GPL-3.0+
@@ -26,15 +26,6 @@ BASH_CONF_ENV = \
bash_cv_func_sigsetjmp=present \
bash_cv_printf_a_format=yes
-# Can be dropped when bash is bumped to 5.3 or newer.
-ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_15),y)
-BASH_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=gnu17"
-endif
-
-ifeq ($(BR2_HOST_GCC_AT_LEAST_15),y)
-BASH_CONF_ENV += CFLAGS_FOR_BUILD="$(HOST_CFLAGS) -std=gnu17"
-endif
-
# The static build needs some trickery
ifeq ($(BR2_STATIC_LIBS),y)
BASH_CONF_OPTS += --enable-static-link
---
base-commit: e1ef4be70b601863949cccd4ec0d98ff19513cc3
change-id: 20251022-bash-5-3-c9bae058f7d1
Best regards,
--
Joseph Kogut <joseph.kogut at gmail.com>
More information about the buildroot
mailing list