From ad93408ffe23af81e0fb310cd9131628b2d27c4b34565d2c3eb0aa2979bd9361 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 12 Oct 2022 12:36:34 +0000 Subject: [PATCH 1/2] Accepting request 1010225 from home:Andreas_Schwab:Factory - Remove backup of patched tests OBS-URL: https://build.opensuse.org/request/show/1010225 OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=359 --- bash.changes | 5 +++++ bash.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bash.changes b/bash.changes index 3a157fb..4c1c7a0 100644 --- a/bash.changes +++ b/bash.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Oct 12 11:30:01 UTC 2022 - Andreas Schwab + +- Remove backup of patched tests + ------------------------------------------------------------------- Thu Oct 6 10:43:59 UTC 2022 - Dr. Werner Fink diff --git a/bash.spec b/bash.spec index 4ec8b88..5474317 100644 --- a/bash.spec +++ b/bash.spec @@ -276,7 +276,7 @@ set -x %endif %patch49 -b .pthtmp %patch50 -b .qd -%patch0 -b .0 +%patch0 # This has to be always the same version as included in the bash its self rl1=($(sed -rn '/RL_READLINE_VERSION/p' lib/readline/readline.h)) From 9a41239ff4a3344b29baaa0c7ce22ff4e67424d70c2f8fe1e9e0943944f10b33 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 13 Oct 2022 12:46:15 +0000 Subject: [PATCH 2/2] Accepting request 1010321 from home:Andreas_Schwab:Factory - Don't strip binaries - Work around a signal mask issue with qemu linux-user emulation OBS-URL: https://build.opensuse.org/request/show/1010321 OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=360 --- bash.changes | 6 ++++++ bash.spec | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/bash.changes b/bash.changes index 4c1c7a0..4f4f308 100644 --- a/bash.changes +++ b/bash.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 12 17:37:47 UTC 2022 - Andreas Schwab + +- Don't strip binaries +- Work around a signal mask issue with qemu linux-user emulation + ------------------------------------------------------------------- Wed Oct 12 11:30:01 UTC 2022 - Andreas Schwab diff --git a/bash.spec b/bash.spec index 5474317..6217809 100644 --- a/bash.spec +++ b/bash.spec @@ -283,6 +283,12 @@ rl1=($(sed -rn '/RL_READLINE_VERSION/p' lib/readline/readline.h)) rl2=($(sed -rn '/RL_READLINE_VERSION/p' %{_includedir}/readline/readline.h)) test ${rl1[2]} = ${rl2[2]} || exit 1 +%if 0%{?qemu_user_space_build} +# Something in qemu clobbers the signal mask to block SIGALRM during the +# execution of this test, causing it to hang. Skip it. +echo exit 0 > tests/read7.sub +%endif + %build LANG=POSIX LC_ALL=$LANG @@ -548,7 +554,6 @@ EOF %find_lang bash %fdupes -s %{buildroot}%{_datadir}/bash/helpfiles sed -ri '1{ s@/bin/sh@/bin/bash@ }' %{buildroot}%{_bindir}/bashbug - strip --strip-unneeded %{buildroot}%{_bindir}/bash %if %{with alternatives} %post -p %{_bindir}/bash