From 74e3b4b7527223c55690d281777104d3798c3cb4 Mon Sep 17 00:00:00 2001
From: fly_fzc <2385803914@qq.com>
Date: Tue, 18 Jul 2023 17:37:20 +0800
Subject: [PATCH] Fix testsuite failures with bash 5.2.15

---
 autoconf.spec                                 |  9 ++-
 ...Fix-testsuite-failures-with-bash-5.2.patch | 65 +++++++++++++++++++
 2 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 backport-Fix-testsuite-failures-with-bash-5.2.patch

diff --git a/autoconf.spec b/autoconf.spec
index ccec31e..e7781b6 100644
--- a/autoconf.spec
+++ b/autoconf.spec
@@ -3,7 +3,7 @@
 
 Name:           autoconf
 Version:        2.71
-Release:        3
+Release:        4
 Summary:        An extensible package to automatically configure software source code packages
 License:        GPLv2+ and GPLv3+ and GFDL-1.3-only
 URL:            https://www.gnu.org/software/%{name}/
@@ -12,6 +12,7 @@ Source1:        config.site
 Source2:        autoconf-el.el
 
 Patch1:         backport-_AC_PROG_CXX_STDCXX_EDITION_TRY-fix-typo-in-variable.patch
+Patch2:         backport-Fix-testsuite-failures-with-bash-5.2.patch
 
 Patch9000:      skip-one-test-at-line-1616-of-autotest.patch
 
@@ -72,6 +73,12 @@ fi
 
 
 %changelog
+* Tue Jul 18 2023 fuanan <fuanan3@h-partners.com> - 2.71-4
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:Fix testsuite failures with bash 5.2.15
+
 * Sat Oct 22 2022 yixiangzhike <yixiangzhike007@163.com> - 2.71-3
 - Type:bugfix
 - ID:NA
diff --git a/backport-Fix-testsuite-failures-with-bash-5.2.patch b/backport-Fix-testsuite-failures-with-bash-5.2.patch
new file mode 100644
index 0000000..5b059fa
--- /dev/null
+++ b/backport-Fix-testsuite-failures-with-bash-5.2.patch
@@ -0,0 +1,65 @@
+From 412166e185c00d6eacbe67dfcb0326f622ec4020 Mon Sep 17 00:00:00 2001
+From: Xi Ruoyao <xry111@xry111.site>
+Date: Fri, 30 Sep 2022 11:36:03 -0400
+Subject: [PATCH] Fix testsuite failures with bash 5.2.
+
+Bash v5.2 includes several new optimizations to the number of
+subshells used for various constructs; as a side effect, the value of
+SHLVL is less stable than it used to be.  Add SHLVL to the list of
+built-in shell variables with unstable values, to be ignored when
+checking for inappropriate differences to the shell environment
+before and after a macro invocation / between two configure runs.
+
+Problem and solution reported by Xi Ruoyao in
+https://lists.gnu.org/archive/html/autoconf/2022-09/msg00015.html
+Problem also reported by Bruce Dubbs in
+https://lists.gnu.org/archive/html/bug-autoconf/2022-09/msg00010.html
+
+* tests/local.at (_AT_CHECK_ENV, AT_CONFIG_CMP): Ignore changes in
+  value of SHLVL.
+Copyright-paperwork-exempt: yes
+---
+ tests/local.at | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/tests/local.at b/tests/local.at
+index 193fd118..a9cf4050 100644
+--- a/tests/local.at
++++ b/tests/local.at
+@@ -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
+@@ -404,7 +404,7 @@ if test -f state-env.before && test -f state-env.after; then
+       [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 |
+@@ -435,6 +435,7 @@ fi
+ #   - PPID [bash, zsh]
+ #   - RANDOM [bash, zsh]
+ #   - SECONDS [bash, zsh]
++#   - SHLVL [bash]
+ #   - START_TIME [NetBSD sh]
+ #   - ToD [NetBSD sh]
+ #   - '$' [zsh]
+@@ -483,6 +484,7 @@ do
+ 	/^PPID=/ d
+ 	/^RANDOM=/ d
+ 	/^SECONDS=/ d
++	/^SHLVL=/ d
+ 	/^START_TIME=/ d
+ 	/^ToD=/ d
+ 	/'\'\\\$\''=/ d
+-- 
+2.27.0
+
-- 
Gitee