From 4fff4534fe8b1b792ab344d9c641cf6a6794c2c3 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Thu, 18 Nov 2021 10:43:17 +0000
Subject: [PATCH] Update bash 5.1 to patch level 12

OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=336
---
 bash-4.3-2.4.4.patch      |  4 ++--
 bash-4.3-sigrestart.patch |  4 ++--
 bash-5.1-patches.tar.bz2  |  4 ++--
 bash.changes              | 21 +++++++++++++++++++++
 bash.spec                 |  1 +
 5 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/bash-4.3-2.4.4.patch b/bash-4.3-2.4.4.patch
index 8629fb68..b8e2a3f7 100644
--- a/bash-4.3-2.4.4.patch
+++ b/bash-4.3-2.4.4.patch
@@ -54,7 +54,7 @@
  signal_is_trapped (s)
 --- jobs.c
 +++ jobs.c	2020-10-12 16:00:37.267184666 +0000
-@@ -2221,6 +2221,15 @@ make_child (command, flags)
+@@ -2223,6 +2223,15 @@ make_child (command, flags)
  	 child process, go back and change callers who free `command' in
  	 the child process when this returns. */
        mypid = getpid ();
@@ -72,7 +72,7 @@
  	 0 because that's the file descriptor used when redirecting input,
 --- sig.c
 +++ sig.c	2020-10-12 16:00:37.267184666 +0000
-@@ -83,10 +83,10 @@ sigset_t top_level_mask;
+@@ -84,10 +84,10 @@ sigset_t top_level_mask;
  #endif /* JOB_CONTROL */
  
  /* When non-zero, we throw_to_top_level (). */
diff --git a/bash-4.3-sigrestart.patch b/bash-4.3-sigrestart.patch
index 4875e14f..fd9c4a46 100644
--- a/bash-4.3-sigrestart.patch
+++ b/bash-4.3-sigrestart.patch
@@ -4,7 +4,7 @@
 
 --- sig.c
 +++ sig.c	2018-11-29 08:13:00.103944580 +0000
-@@ -788,6 +788,8 @@ set_signal_handler (sig, handler)
+@@ -796,6 +796,8 @@ set_signal_handler (sig, handler)
    if (sig == SIGCHLD)
      act.sa_flags |= SA_RESTART;		/* XXX */
  #endif
@@ -13,7 +13,7 @@
    /* Let's see if we can keep SIGWINCH from interrupting interruptible system
       calls, like open(2)/read(2)/write(2) */
  #if defined (SIGWINCH)
-@@ -798,6 +800,10 @@ set_signal_handler (sig, handler)
+@@ -806,6 +808,10 @@ set_signal_handler (sig, handler)
       it to be as close to SIG_IGN as possible. */
    if (sig == SIGTERM && handler == sigterm_sighandler)
      act.sa_flags |= SA_RESTART;		/* XXX */
diff --git a/bash-5.1-patches.tar.bz2 b/bash-5.1-patches.tar.bz2
index 25824d8a..1bfd4005 100644
--- a/bash-5.1-patches.tar.bz2
+++ b/bash-5.1-patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eae6def895cb3712538a395e821cd935b85928510419ef16ca59778955849f9c
-size 5494
+oid sha256:27c699e9b229528c1b4e71952b9a375a1bdc9276954d7d6031e64ccab7f5112b
+size 8455
diff --git a/bash.changes b/bash.changes
index b64ba05d..0ddf65b5 100644
--- a/bash.changes
+++ b/bash.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Thu Nov 18 10:28:52 UTC 2021 - Dr. Werner Fink <werner@suse.de>
+
+- Update bash 5.1 to patch level 12
+  * Add official patch bash51-009
+    The bash malloc implementation of malloc_usable_size() does not follow the
+    specification. This can cause library functions that use it to overwrite
+    memory bounds checking.
+  * Add official patch bash51-010
+    If `wait -n' is interrupted by a trapped signal other than SIGINT, it does
+    not completely clean up state, and that can prevent subsequent calls to
+    `wait -n' from working correctly.
+  * Add official patch bash51-011
+    When reading a compound assignment, and running it through the parser to
+    split it into words, we need to save and restore any alias we're currently
+    expanding.
+  * Add official patch bash51-012
+    There is a possible race condition that arises when a child process receives
+    a signal trapped by the parent before it can reset the signal dispositions.
+    The child process is not supposed to trap the signal in this circumstance.
+
 -------------------------------------------------------------------
 Fri Oct 22 09:28:06 UTC 2021 - Stefan Schubert <schubi@suse.de>
 
diff --git a/bash.spec b/bash.spec
index d92e31f9..c80a85ad 100644
--- a/bash.spec
+++ b/bash.spec
@@ -139,6 +139,7 @@ Requires:       bash = %{version}
 %description sh
 Use bash as /bin/sh implementation.
 %endif
+
 %package devel
 Summary:        Include Files mandatory for Development of bash loadable builtins
 Group:          Development/Languages/C and C++