diff --git a/Fix-for-a-crash-if-one-of-the-expressions-in-an-arit.patch b/Fix-for-a-crash-if-one-of-the-expressions-in-an-arit.patch deleted file mode 100644 index 6923a99a281b8cb2e91e71a6bd80c286bf1300da..0000000000000000000000000000000000000000 --- a/Fix-for-a-crash-if-one-of-the-expressions-in-an-arit.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 708cc7f694738c6dde2dbb5317749a5a9e6d26e2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=E8=82=96=E5=9C=A8?= -Date: Wed, 8 May 2024 17:04:43 +0800 -Subject: [PATCH] fix for a crash if one of the expressions in an arithmetic - for command expands to NULL - ---- - execute_cmd.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/execute_cmd.c b/execute_cmd.c -index ce221a2..46b671d 100644 ---- a/execute_cmd.c -+++ b/execute_cmd.c -@@ -3056,7 +3056,7 @@ eval_arith_for_expr (l, okp) - temp = expand_arith_string (expr, Q_DOUBLE_QUOTES|Q_ARITH); - if (l->next) - free (expr); -- new = make_word_list (make_word (temp), (WORD_LIST *)NULL); -+ new = make_word_list (make_word (temp ? temp : ""), (WORD_LIST *)NULL); - free (temp); - - if (new) --- -2.33.0 - diff --git a/bash-5.2.15.tar.gz b/bash-5.2.21.tar.gz similarity index 57% rename from bash-5.2.15.tar.gz rename to bash-5.2.21.tar.gz index 91a7c7dc37fe177743c46175dc59e239c38ad056..41801214e1c8fb4a3bfe6a2d7d1f9d9c4826dc13 100644 Binary files a/bash-5.2.15.tar.gz and b/bash-5.2.21.tar.gz differ diff --git a/bash.spec b/bash.spec index 208e4d379bcc683dfca61e38c265b20b34e9080a..a518bc7dd9e60bdde3e1b138af56220c849d4665 100644 --- a/bash.spec +++ b/bash.spec @@ -1,6 +1,6 @@ Name: bash -Version: 5.2.15 -Release: 9 +Version: 5.2.21 +Release: 1 Summary: It is the Bourne Again Shell License: GPLv3 URL: https://www.gnu.org/software/bash @@ -33,7 +33,6 @@ Patch6005: backport-fixes-for-LINENO-in-multi-line-simple-commands-print.patch Patch6006: backport-changes-to-SIGINT-handler-while-waiting-for-a-child-.patch Patch6007: backport-renamed-several-functions-beginning-with-legal_-chan.patch Patch6008: backport-fix-for-cd-when-curent-directory-doesn-t-exist-fix-w.patch -Patch6009: Fix-for-a-crash-if-one-of-the-expressions-in-an-arit.patch BuildRequires: gcc bison texinfo autoconf ncurses-devel # Required for bash tests @@ -162,6 +161,9 @@ make check %exclude %{_infodir}/dir %changelog +* Wed Jul 3 2024 dillon chen - 5.2.21-1 +- update to 5.2.21 + * Wed May 08 2024 xiaozai -5.2.15-9 - fix for a crash if one of the expressions in an arithmetic for command expands to NULL