Merge pull request 'Factory' (#3) from factory into main

bash.changes

@@ -1,53 +1,4 @@
--------------------------------------------------------------------
+Adjusting changes
-Thu Dec 11 10:00:17 UTC 2025 - Dr. Werner Fink <werner@suse.de>
-
-- Add upstream patch
-  * Bash-5.3 Official patch 8 -- bash53-009
-    A SIGINT during a reverse i-search can cause a segmentation fault
-    due to accessing data freed by a signal handler.
-
--------------------------------------------------------------------
-Thu Nov 27 08:52:56 UTC 2025 - Dr. Werner Fink <werner@suse.de>
-
-- Add upstream patches
-  * Bash-5.3 Official patch 4 -- bash53-004
-    The Linux kernel reports incorrect sizes for files in /sys/block/*/uevent,
-    leading bash to report a read error when the byte count does not agree
-    with the file size from fstat(2).
-  * Bash-5.3 Official patch 5 -- bash53-005
-    Restoring the default disposition in a subshell for a signal bash treats
-    specially can cause a crash.
-  * Bash-5.3 Official patch 6 -- bash53-006
-    When `globasciiranges' is enabled, glob patterns with ranges in bracket
-    expressions can produce incorrect matches for character ranges whose
-    start and end are non-ascii characters.
-  * Bash-5.3 Official patch 7 -- bash53-007
-    No-fork command substitutions can perform redirections that act on the
-    enclosing command as well.
-  * Bash-5.3 Official patch 8 -- bash53-008
-    Bash tries to consume entire multibyte characters when looking for backslash
-    escapes in $'...' strings, and treats too many characters as potentially
-    beginning a multibyte character in UTF-8 locales. Being more selective about
-    when to call mbrtowc() can lead to optimized string processing and script
-    speedups. This patch also handles the unlikely situation of a locale
-    encoding null wide characters with non-null bytes.
-- Remove patch boo1254087.patch now upstream with bash53-004
-
--------------------------------------------------------------------
-Fri Nov 21 09:36:12 UTC 2025 - Dr. Werner Fink <werner@suse.de>
-
-- Cherry pick from commit 01070d43248fb97f3b2a08d780ae5a392573ce34 
-  two fixes:
-  * boo1254087.patch -- fix for short reads by `source' builtin (boo#1254087)
-  * risc-v.patch -- fix for crash on RISC-V machines
-
-
--------------------------------------------------------------------
-Mon Sep 29 15:32:45 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
-
-- DRop use of patchutils: the patch tarball seems to contain only
-  patches to be applied -p0. This allows us to shorten the build
-  cycle.
 
 -------------------------------------------------------------------
 Fri Aug  1 06:00:45 UTC 2025 - Dr. Werner Fink <werner@suse.de>

bash.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package bash
 #
-# Copyright (c) 2025 SUSE LLC and contributors
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -86,8 +86,6 @@ Patch48:        bash-4.3-extra-import-func.patch
 Patch49:        bash-4.3-pathtemp.patch
 # PATCH-FIX-SUSE
 Patch50:        quotes-man2html.patch
-# PATCH-UPSTREAM-CHERRY-PICKED
-Patch51:        risc-v.patch
 BuildRequires:  autoconf
 # latest bash uses with patch 18 the tag YYEOF
 BuildRequires:  bison
@@ -95,6 +93,7 @@ BuildRequires:  fdupes
 BuildRequires:  glibc-locale
 BuildRequires:  glibc-locale-base
 BuildRequires:  makeinfo
+BuildRequires:  patchutils
 BuildRequires:  pkgconfig
 BuildRequires:  screen
 BuildRequires:  sed
@@ -251,8 +250,16 @@ set +x
 for patch in ../bash-%{bversion}-patches/*-*[0-9]; do
     test -e $patch || break
 
+    let level=0 || true
+    file=$(lsdiff --files=1 $patch)
+    if test ! -e $file ; then
+	file=${file#*/}
+	let level++ || true
+    fi
+    test -e $file || exit 1
+    sed -ri '/^\*\*\* \.\./{ s@\.\./bash-%{bversion}[^/]*/@@ }' $patch
     echo Patch $patch
-    patch -s -p0 < $patch
+    patch -s -p$level < $patch
 done
 set -x
 %patch -P1   -b .manual
@@ -276,7 +283,6 @@ set -x
 %endif
 %patch -P49  -b .pthtmp
 %patch -P50  -b .qd
-%patch -P51  -p1 -b .riscv
 %patch -P0   -b .p0
 
 # This has to be always the same version as included in the bash its self

risc-v.patch

@@ -1,43 +0,0 @@
-Based on 01070d43248fb97f3b2a08d780ae5a392573ce34 Mon Sep 17 00:00:00 2001
-From: Chet Ramey <chet.ramey@case.edu>
-Date: Fri, 18 Jul 2025 11:53:01 -0400
-Subject: fix for `wait -n' in posix mode; fix for long messages in readline;
- fix for short reads by `source' builtin; fix for crash on RISC-V machines;
- fix for bad memory read when getopts is called twice with different sets of
- arguments
-
----
- command.h |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/command.h b/command.h
-index 189b00de..2c25b341 100644
---- a/command.h
-+++ b/command.h
-@@ -195,7 +195,6 @@ typedef struct element {
- 
- /* What a command looks like. */
- typedef struct command {
--  enum command_type type;	/* FOR CASE WHILE IF CONNECTION or SIMPLE. */
-   int flags;			/* Flags controlling execution environment. */
-   int line;			/* line number the command starts on */
-   REDIRECT *redirects;		/* Special redirects for FOR CASE, etc. */
-@@ -223,6 +222,7 @@ typedef struct command {
-     struct subshell_com *Subshell;
-     struct coproc_com *Coproc;
-   } value;
-+  enum command_type type;	/* FOR CASE WHILE IF CONNECTION SIMPLE, etc. */
- } COMMAND;
- 
- /* Structure used to represent the CONNECTION type. */
-@@ -337,9 +337,9 @@ typedef struct cond_com {
- typedef struct simple_com {
-   int flags;			/* See description of CMD flags. */
-   int line;			/* line number the command starts on */
-+  REDIRECT *redirects;		/* Redirections to perform. */
-   WORD_LIST *words;		/* The program name, the arguments,
- 				   variable assignments, etc. */
--  REDIRECT *redirects;		/* Redirections to perform. */
- } SIMPLE_COM;
- 
- /* The "function definition" command. */