!48 [sync] PR-44: revert previous fix, as it causes too many regressions

From: @openeuler-sync-bot 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen

autoconf.spec

@@ -3,20 +3,23 @@
 
 Name:           autoconf
 Version:        2.71
-Release:        1
+Release:        9
 Summary:        An extensible package to automatically configure software source code packages
-License:        GPLv2+ and GPLv3+ and GFDL
+License:        GPLv2+ and GPLv3+ and GFDL-1.3-only
 URL:            https://www.gnu.org/software/%{name}/
 Source0:        http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
 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
 
 BuildArch:      noarch
 
-BuildRequires:  m4 emacs perl perl-generators help2man
-Requires:       m4 emacs-filesystem
+BuildRequires:  m4 emacs perl perl-generators help2man gcc-c++
+Requires:       m4 emacs-filesystem perl
 Requires(post): info
 Requires(preun):info
 
@@ -70,6 +73,32 @@ fi
 
 
 %changelog
+* Fri Dec 06 2024 Funda Wang <fundawang@yeah.net> - 2.71-9
+- revert previous fix, as it causes too many regressions
+
+* Wed Dec 04 2024 Funda Wang <fundawang@yeah.net> - 2.71-8
+- fix AC_CHECK_LIB no longer works with g++ (debian bug#992981)
+- Fix testsuite failures with bash 5.2.15
+
+* Wed Jun 12 2024 fuanan <fuanan3@h-partners.com> - 2.71-4
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:License compliance rectification
+
+* Sat Oct 22 2022 yixiangzhike <yixiangzhike007@163.com> - 2.71-3
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:Fix typo in variable name
+
+* Fri Dec 31 2021 wangjie <wangjie375@huawei.com> - 2.71-2
+- Type:enhancement
+- ID:NA
+- SUG:NA
+- DESC:Add perl to resolve compilation failure
+       Add gcc-c++ to solve test failure
+
 * Thu Dec 2 2021 wangjie <wangjie375@huawei.com> - 2.71-1
 - Type:enhancement
 - ID:NA

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
+

backport-_AC_PROG_CXX_STDCXX_EDITION_TRY-fix-typo-in-variable.patch

@@ -0,0 +1,31 @@
+From f460883035ef849a2248b1713f711292ec19f4f0 Mon Sep 17 00:00:00 2001
+From: Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
+Date: Fri, 14 May 2021 09:06:20 +0300
+Subject: [PATCH] _AC_PROG_CXX_STDCXX_EDITION_TRY: fix typo in variable name
+
+The typo causes "ac_prog_cxx_stdcxx" to be always set to "cxx11",
+regardless of whether the C++ compiler supports C++11.
+Message-Id: <YJ4TXAeJcvU0oSec@FSAPPLE2215.fi.f-secure.com>
+(tiny change)
+---
+ lib/autoconf/c.m4 | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/autoconf/c.m4 b/lib/autoconf/c.m4
+index 9f881f0b..47434c89 100644
+--- a/lib/autoconf/c.m4
++++ b/lib/autoconf/c.m4
+@@ -2749,8 +2749,8 @@ AC_DEFUN([_AC_PROG_CXX_STDCXX_EDITION_TRY],
+ [AC_REQUIRE([_AC_CXX_CXX$1_TEST_PROGRAM])]dnl
+ [AS_IF([test x$ac_prog_cxx_stdcxx = xno],
+ [AC_MSG_CHECKING([for $CXX option to enable C++$1 features])
+-AC_CACHE_VAL(ac_cv_prog_cxx_$1,
+-[ac_cv_prog_cxx_$1=no
++AC_CACHE_VAL(ac_cv_prog_cxx_cxx$1,
++[ac_cv_prog_cxx_cxx$1=no
+ ac_save_CXX=$CXX
+ AC_LANG_CONFTEST([AC_LANG_DEFINES_PROVIDED][$][ac_cxx_conftest_cxx$1_program])
+ for ac_arg in '' m4_normalize(m4_defn([_AC_CXX_CXX$1_OPTIONS]))
+-- 
+2.27.0
+