Accepting request 1251754 from Base:System

Skip PGO with %want_reproducible_builds (boo#1040589) (forwarded request 1251745 from bmwiedemann)

OBS-URL: https://build.opensuse.org/request/show/1251754
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bash?expand=0&rev=197

bash-3.2-printf.patch

@@ -24,7 +24,7 @@
 @@ -710,7 +711,12 @@ printf_builtin (list)
  
  		    p = getfloatmax ();
- 		    f = mklong (start, "L", 1);
+ 		    f = mklong (start, FLOATMAX_CONV, USE_LONG_DOUBLE);
 +
 +		    if (lce && lcl) setlocale(LC_NUMERIC, lce);
 +

bash-4.3-winch.dif

@@ -1,15 +0,0 @@
----
- config-top.h |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- config-top.h
-+++ config-top.h	2018-09-20 08:15:45.026318359 +0000
-@@ -142,7 +142,7 @@
- 
- /* Define to 0 if you want the checkwinsize option off by default, 1 if you
-    want it on. */
--#define CHECKWINSIZE_DEFAULT	0
-+#define CHECKWINSIZE_DEFAULT	1
- 
- /* Define to 1 if you want to optimize for sequential array assignment when
-    using indexed arrays, 0 if you want bash-4.2 behavior, which favors

bash.changes

@@ -1,3 +1,54 @@
+-------------------------------------------------------------------
+Mon Mar 10 09:38:26 UTC 2025 - Bernhard Wiedemann <bwiedemann@suse.com>
+
+- Skip PGO with %want_reproducible_builds (boo#1040589)
+
+-------------------------------------------------------------------
+Mon Feb 24 18:21:33 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
+
+- Explicitly specify that the build recipe needs bash
+
+-------------------------------------------------------------------
+Fri Jan 24 12:09:40 UTC 2025 - Dr. Werner Fink <werner@suse.de>
+
+- As in bash-sh there is only a symbolic link avoid to require a version
+
+-------------------------------------------------------------------
+Sat Dec 28 20:38:43 UTC 2024 - Heitor Moreira da Silva <heitor@opensuse.org>
+
+- Move (/etc/skel/.bashrc) and (/etc/skel/.profile) to (/usr/etc/skel/).
+
+-------------------------------------------------------------------
+Mon Dec 16 12:47:07 UTC 2024 - Dr. Werner Fink <werner@suse.de>
+
+- Remove bash-4.3-winch.dif as this is the (current) default
+
+-------------------------------------------------------------------
+Wed Sep 25 06:33:29 UTC 2024 - Dr. Werner Fink <werner@suse.de>
+
+- Add upstream patches
+  * bash52-037
+    Fix the case where text to be completed from the line buffer (quoted) is
+    compared to the common prefix of the possible matches (unquoted) and the
+    quoting makes the former appear to be longer than the latter. Readline
+    assumes the match doesn't add any characters to the word and doesn't display
+    multiple matches.
+  * bash52-036
+    When readline is accumulating bytes until it reads a complete multibyte
+    character, reading a byte that makes the multibyte character invalid can
+    result in discarding the bytes in the partial character.
+  * bash52-035
+    There are systems that supply one of select or pselect, but not both.
+  * bash52-034
+    If we parse a compound assignment during an alias expansion, it's possible
+    to have the current input string popped out from underneath the parse. In
+    this case, we should not restore the input we were using when we began to
+    parse the compound assignment.
+  * bash52-033
+    A typo in the autoconf test for strtold causes false negatives for strtold
+    being available and working when compiled with gcc-14.
+- Port patch bash-3.2-printf.patch to fit change in bash52-033
+
 -------------------------------------------------------------------
 Mon Aug 19 08:57:30 UTC 2024 - Dr. Werner Fink <werner@suse.de>
 

bash.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package bash
 #
-# Copyright (c) 2024 SUSE LLC
+# 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
@@ -16,6 +16,7 @@
 #
 
 
+%define _buildshell /bin/bash
 %if 0%{?suse_version} > 1500
 %bcond_with alternatives
 %else
@@ -75,8 +76,6 @@ Patch13:        bash-4.2-nscdunmap.dif
 Patch14:        bash-4.3-sigrestart.patch
 # PATCH-FIX-UPSTREAM bnc#382214 -- disabled due bnc#806628 by -DBNC382214=0
 Patch16:        bash-4.0-setlocale.dif
-# PATCH-EXTEND-SUSE bnc#828877 -- xterm resizing does not pass to all sub clients
-Patch18:        bash-4.3-winch.dif
 Patch40:        bash-4.1-bash.bashrc.dif
 # PATCH-FIX-SUSE For bsc#1065158 add support for broken Japanese locale Shift JIS
 Patch42:        bash-4.3-SJIS.patch
@@ -111,7 +110,7 @@ BuildRequires:  pkgconfig(readline) >= %{rl_version}
 %if %{with alternatives}
 Requires(post): update-alternatives
 Requires(post): libreadline%{rl_major} >= %{rl_version}
-Requires(preun):update-alternatives
+Requires(preun): update-alternatives
 %endif
 Requires:       libreadline%{rl_major} >= %{rl_version}
 Suggests:       bash-doc = %{version}
@@ -150,7 +149,7 @@ Group:          System/Shells
 Provides:       alternative(sh)
 Conflicts:      alternative(sh)
 Provides:       bash:%{_bindir}/sh
-PreReq:         bash = %{version}
+PreReq:         bash
 BuildArch:      noarch
 
 %description sh
@@ -240,7 +239,12 @@ Legacy usrmove helper files for the build system. Do not install.
 %if %{with sjis}
 %{warn:Shift JIS support is enabled}
 %else
-%{echo:Shift JIS support disabled}
+%{echo:Shift JIS support is DISABLED}
+%endif
+%if %{with alternatives}
+%{echo:alternatives is enabled}
+%else
+%{echo:alternatives is DISABLED}
 %endif
 %setup -q -n bash-%{bversion}%{bextend} -b1
 typeset -i level
@@ -272,7 +276,6 @@ set -x
 %patch -P13  -b .nscdunmap
 %patch -P14  -b .sigrestart
 %patch -P16  -b .setlocale
-#%patch -P18 -p0 -b .winch
 %patch -P40  -b .bashrc
 %if %{with sjis}
 %patch -P42  -b .sjis
@@ -484,7 +487,7 @@ echo exit 0 > tests/read7.sub
 	$READLINE
   sed -rn '/Configuration feature settings controllable by autoconf/,/End of configuration settings controllable by autoconf/p' <  config.h
   profilecflags=CFLAGS="$CFLAGS"
-%if 0%{?do_profiling}
+%if 0%{?do_profiling} && !0%{?want_reproducible_builds}
   profilecflags=CFLAGS="$CFLAGS %{cflags_profile_generate}"
 %endif
   ulimit -Hv unlimited
@@ -499,9 +502,8 @@ echo exit 0 > tests/read7.sub
 	SCREENRC=$SCREENRC SCREENDIR=$SCREENDIR \
 	screen -D -m %make_build -j1 TESTSCRIPT=%{SOURCE4} check
   kill -TERM $pid
-%if 0%{?do_profiling}
+%if 0%{?do_profiling} && !0%{?want_reproducible_builds}
-  rm -f jobs.gcda
+  profilecflags=CFLAGS="$CFLAGS %{cflags_profile_feedback}"
-  profilecflags=CFLAGS="$CFLAGS %{cflags_profile_feedback} -fprofile-correction"
   %make_build $makeopts "$profilecflags" clean
 %endif
   %make_build $makeopts "$profilecflags" all
@@ -565,11 +567,9 @@ set in %{_sysconfdir}/inputrc or $HOME/.inputrc avoids this
 but disables multi byte handling.
 EOF
   # remove unpackaged files
-  mkdir -p %{buildroot}%{_sysconfdir}/skel
+  mkdir -p %{buildroot}%{_prefix}%{_sysconfdir}/skel
-  install -m 644 %{SOURCE5}    %{buildroot}%{_sysconfdir}/skel/.bashrc
+  install -m 640 %{SOURCE5} %{buildroot}%{_prefix}%{_sysconfdir}/skel/.bashrc
-  install -m 644 %{SOURCE6}    %{buildroot}%{_sysconfdir}/skel/.profile
+  install -m 640 %{SOURCE6} %{buildroot}%{_prefix}%{_sysconfdir}/skel/.profile
-  touch -t 199605181720.50 %{buildroot}%{_sysconfdir}/skel/.bash_history
-  chmod 600                %{buildroot}%{_sysconfdir}/skel/.bash_history
   %find_lang bash
   %fdupes -s %{buildroot}%{_datadir}/bash/helpfiles
   sed -ri '1{ s@/bin/sh@/bin/bash@ }' %{buildroot}%{_bindir}/bashbug
@@ -587,9 +587,8 @@ fi
 
 %files
 %license COPYING
-%config %attr(600,root,root) %{_sysconfdir}/skel/.bash_history
+%{_prefix}%{_sysconfdir}/skel/.bashrc
-%config %attr(644,root,root) %{_sysconfdir}/skel/.bashrc
+%{_prefix}%{_sysconfdir}/skel/.profile
-%config %attr(644,root,root) %{_sysconfdir}/skel/.profile
 %if %{with alternatives}
 %ghost %config %{_sysconfdir}/alternatives/sh
 %endif