From 5a7ee7d04a3840fad7ccc317ecbc805a095456b2af956c2bd7ec99ca9fb337ef Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 16 Jan 2024 09:08:48 +0000 Subject: [PATCH 1/2] Update to bash 5.2 patchlevel 26 OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=378 --- bash-5.2-patches.tar.bz2 | 4 ++-- bash.changes | 19 +++++++++++++++++++ bash.spec | 6 +++--- get_version_number.sh | 3 ++- 4 files changed, 26 insertions(+), 6 deletions(-) diff --git a/bash-5.2-patches.tar.bz2 b/bash-5.2-patches.tar.bz2 index 13632aa..aa7b42b 100644 --- a/bash-5.2-patches.tar.bz2 +++ b/bash-5.2-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:91f63c75796ddb746934ffc8106289f31b99970287393067ceb2a55d42e23428 -size 30584 +oid sha256:fd2f5e8ab1d04f97c681be63d585c545cd4d6b9ba5bee5e42ff06e107fbd9c37 +size 32648 diff --git a/bash.changes b/bash.changes index 9371631..8285484 100644 --- a/bash.changes +++ b/bash.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Tue Jan 16 08:49:57 UTC 2024 - Dr. Werner Fink + +- Add upstream patches + * bash52-022 + It's possible for readline to try to zero out a line that's not + null-terminated, leading to a memory fault. + * bash52-023 + Running `local -' multiple times in a shell function would + overwrite the original saved set of options. + * bash52-024 + Fix bug where associative array compound assignment would not + expand tildes in values. + * bash52-025 + Make sure a subshell checks for and handles any terminating + signals before exiting (which might have arrived after the + command completed) so the parent and any EXIT trap will see + the correct value for $?. + ------------------------------------------------------------------- Wed Nov 15 09:08:33 UTC 2023 - Dr. Werner Fink diff --git a/bash.spec b/bash.spec index 80e08fc..8a8b44d 100644 --- a/bash.spec +++ b/bash.spec @@ -1,7 +1,7 @@ # # spec file for package bash # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -108,10 +108,10 @@ BuildRequires: pkgconfig(ncurses) BuildRequires: pkgconfig(readline) = 8.2 %if %{with alternatives} Requires(post): update-alternatives -Requires(post): libreadline%{rl_major} = %{rl_version} +Requires(post): libreadline%{rl_major} >= %{rl_version} Requires(preun):update-alternatives %endif -Requires: libreadline%{rl_major} = %{rl_version} +Requires: libreadline%{rl_major} >= %{rl_version} Suggests: bash-doc = %{version} Suggests: command-not-found Provides: /bin/bash diff --git a/get_version_number.sh b/get_version_number.sh index b586f91..e735da4 100644 --- a/get_version_number.sh +++ b/get_version_number.sh @@ -13,4 +13,5 @@ OFS="$IFS" IFS=- last=($(tar --wildcards -tf ${sourcedir}/bash-${version}-patches.tar.bz2 '*/bash[0-9][0-9]-*[0-9]' | sed -r 's@\.patch$@@'| sort -t '-' -k 3,3 -n | tail -n 1)) IFS="$OFS" -echo ${last[3]/*0/} +shopt -s extglob +echo ${last[3]##+(0)} From e3bbc3d8c8634dd29d52f62cd579bd2e8a3e2676b6cf8dc3750937816663c0d1 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 16 Jan 2024 09:53:38 +0000 Subject: [PATCH 2/2] . OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=379 --- bash.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bash.spec b/bash.spec index 8a8b44d..e03989c 100644 --- a/bash.spec +++ b/bash.spec @@ -105,7 +105,7 @@ BuildRequires: update-alternatives BuildRequires: pkgconfig(audit) BuildRequires: pkgconfig(ncurses) # This has to be always the same version as included in the bash its self -BuildRequires: pkgconfig(readline) = 8.2 +BuildRequires: pkgconfig(readline) >= %{rl_version} %if %{with alternatives} Requires(post): update-alternatives Requires(post): libreadline%{rl_major} >= %{rl_version}