From 4f483d608ed101da0b0d54d42287642499f19a491cff4637c62449181da6d10d Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 1 Nov 2022 08:27:41 +0000 Subject: [PATCH] Accepting request 1031841 from home:vlefebvre:branches:devel:tools:building - fix testsuite failure by bash 5.2 update * [fix-testsuite-failures-with-bash-5.2.patch] OBS-URL: https://build.opensuse.org/request/show/1031841 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/autoconf?expand=0&rev=54 --- autoconf.changes | 6 ++++ autoconf.spec | 2 ++ fix-testsuite-failures-with-bash-5.2.patch | 36 ++++++++++++++++++++++ 3 files changed, 44 insertions(+) create mode 100644 fix-testsuite-failures-with-bash-5.2.patch diff --git a/autoconf.changes b/autoconf.changes index 34e7d66..62739e9 100644 --- a/autoconf.changes +++ b/autoconf.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Oct 27 15:25:30 UTC 2022 - Valentin Lefebvre + +- fix testsuite failure by bash 5.2 update + * [fix-testsuite-failures-with-bash-5.2.patch] + ------------------------------------------------------------------- Mon Mar 28 12:14:28 UTC 2022 - Dirk Müller diff --git a/autoconf.spec b/autoconf.spec index 9601e4b..e782033 100644 --- a/autoconf.spec +++ b/autoconf.spec @@ -34,6 +34,7 @@ Source0: https://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.xz Source1: https://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.xz.sig Source9: autoconf.keyring Patch0: autoreconf-ltdl.diff +Patch1: fix-testsuite-failures-with-bash-5.2.patch BuildRequires: help2man BuildRequires: m4 >= 1.4.6 BuildArch: noarch @@ -68,6 +69,7 @@ only required for the generation of the scripts, not their use. %prep %setup -q -n autoconf-%{version} %patch0 +%patch1 -p1 %build %configure diff --git a/fix-testsuite-failures-with-bash-5.2.patch b/fix-testsuite-failures-with-bash-5.2.patch new file mode 100644 index 0000000..c76ebb2 --- /dev/null +++ b/fix-testsuite-failures-with-bash-5.2.patch @@ -0,0 +1,36 @@ +--- autoconf-2.71/tests/local.at 2021-01-28 21:46:48.000000000 +0100 ++++ autoconf-2.71-new/tests/local.at 2022-10-27 16:36:24.604217375 +0200 +@@ -352,7 +352,7 @@ m4_define([AT_CHECK_CONFIGURE], + # - AC_SUBST'ed variables + # (FIXME: Generate a list of these automatically.) + # - _|@|.[*#?$].|argv|ARGC|LINENO|OLDPWD|PIPESTATUS|RANDOM|SECONDS +-# |START_TIME|ToD|_AST_FEATURES ++# |SHLVL|START_TIME|ToD|_AST_FEATURES + # Some variables some shells use and change. + # `.[*#?$].' catches `$#' etc. which are displayed like this: + # | '!'=18186 +@@ -403,7 +403,7 @@ if test -f state-env.before && test -f s + [GREP|[EF]GREP|SED], + [[_@]|.[*@%:@?$].], + [argv|ARGC|LINENO|BASH_ARGC|BASH_ARGV|OLDPWD|PIPESTATUS|RANDOM], +- [SECONDS|START_TIME|ToD|_AST_FEATURES]))=' \ ++ [SECONDS|SHLVL|START_TIME|ToD|_AST_FEATURES]))=' \ + $act_file || + test $? -eq 1 || echo failed >&2 + ) 2>stderr-$act_file | +@@ -434,6 +434,7 @@ fi + # - PPID [bash, zsh] + # - RANDOM [bash, zsh] + # - SECONDS [bash, zsh] ++# - SHLVL [bash] + # - START_TIME [NetBSD sh] + # - ToD [NetBSD sh] + # - '$' [zsh] +@@ -481,6 +482,7 @@ do + /^PPID=/ d + /^RANDOM=/ d + /^SECONDS=/ d ++ /^SHLVL=/ d + /^START_TIME=/ d + /^ToD=/ d + /'\'\\\$\''=/ d