diff --git a/.gitignore b/.gitignore index 525ed83..e7705a7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ autoconf-2.66.tar.xz /autoconf-2.68.tar.xz /autoconf-2.69.tar.xz -/autoconf-2.70.tar.xz diff --git a/autoconf-2.69-bash-5-LINENO.patch b/autoconf-2.69-bash-5-LINENO.patch new file mode 100644 index 0000000..60e1529 --- /dev/null +++ b/autoconf-2.69-bash-5-LINENO.patch @@ -0,0 +1,64 @@ +From 4c1f7a361f4fd6180b7b46b950e3bfe389b5b831 Mon Sep 17 00:00:00 2001 +From: Ondrej Dubaj +Date: Wed, 28 Aug 2019 07:39:50 +0200 +Subject: [PATCH] Port tests to Bash 5 + +* tests/local.at (AT_CHECK_ENV, AT_CONFIG_CMP): +Add BASH_ARGC, BASH_ARGV to list of variables to be ignored when +comparing variable space dumps. +(AT_CONFIG_CMP): Also ignore LINENO. +* tests/m4sh.at: Also unset LINENO in 'reference' and 'test/test-1'. + +--- + tests/local.at | 5 ++++- + tests/m4sh.at | 4 ++-- + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/tests/local.at b/tests/local.at +index 40b7318..f3ad2b5 100644 +--- a/tests/local.at ++++ b/tests/local.at +@@ -324,7 +324,7 @@ if test -f state-env.before && test -f state-env.after; then + [AWK|LEX|LEXLIB|LEX_OUTPUT_ROOT|LN_S|M4|MKDIR_P|RANLIB|SET_MAKE|YACC], + [GREP|[EF]GREP|SED], + [[_@]|.[*#?$].], +- [argv|ARGC|LINENO|OLDPWD|PIPESTATUS|RANDOM|SECONDS]))=' \ ++ [argv|ARGC|LINENO|BASH_ARGC|BASH_ARGV|OLDPWD|PIPESTATUS|RANDOM|SECONDS]))=' \ + $act_file || + test $? -eq 1 || echo failed >&2 + ) 2>stderr-$act_file | +@@ -381,6 +381,9 @@ do + /'\'\\\$\''=/ d + /^argv=/ d + /^ARGC=/ d ++ /^BASH_ARGC=/ d ++ /^BASH_ARGV=/ d ++ /^LINENO=/ d + ' $act_file >at_config_vars-$act_file + done + AT_CMP([at_config_vars-$1], [at_config_vars-$2])[]dnl +diff --git a/tests/m4sh.at b/tests/m4sh.at +index 4e4da5d..80684ca 100644 +--- a/tests/m4sh.at ++++ b/tests/m4sh.at +@@ -254,7 +254,7 @@ AT_CHECK([autom4te -l m4sh $1.as -o $1]) + # `_oline_', once processed and ran, produces our reference. + # We check that we find ourselves by looking at a string which is + # available only in the original script: `_oline_'. +-AT_DATA_LINENO([reference], [false], [__OLINE__], [_oline__]) ++AT_DATA_LINENO([reference], [true], [__OLINE__], [_oline__]) + AT_CHECK([./reference], 0, [stdout]) + + # The reference: +@@ -264,7 +264,7 @@ mv stdout expout + # Be sure to be out of the PATH. + AT_CHECK([mkdir test || exit 77]) + +-AT_DATA_LINENO([test/test-1], [false], [__LINENO__], [LINENO]) ++AT_DATA_LINENO([test/test-1], [true], [__LINENO__], [LINENO]) + AT_CHECK([./test/test-1], 0, [expout]) + AT_CHECK([(PATH=test$PATH_SEPARATOR$PATH; export PATH; exec test-1)], + 0, [expout]) +-- +2.19.1 + diff --git a/autoconf-2.69-perl-5.22-autoscan.patch b/autoconf-2.69-perl-5.22-autoscan.patch new file mode 100644 index 0000000..7442cad --- /dev/null +++ b/autoconf-2.69-perl-5.22-autoscan.patch @@ -0,0 +1,28 @@ +From e5654a5591884b92633c7785f325626711e7f7aa Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Tue, 29 Jan 2013 13:46:48 -0800 +Subject: [PATCH] autoscan: port to perl 5.17 + +* bin/autoscan.in (scan_sh_file): Escape '{'. This avoids a +feature that is deprecated in Perl 5.17. Reported by Ray Lauff in +. +--- + bin/autoscan.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bin/autoscan.in b/bin/autoscan.in +index 993a750..db1df79 100644 +--- a/bin/autoscan.in ++++ b/bin/autoscan.in +@@ -358,7 +358,7 @@ sub scan_sh_file ($) + { + # Strip out comments and variable references. + s/#.*//; +- s/\${[^\}]*}//g; ++ s/\$\{[^\}]*}//g; + s/@[^@]*@//g; + + # Tokens in the code. +-- +2.1.0 + diff --git a/autoconf.spec b/autoconf.spec index 08bea89..52d70c0 100644 --- a/autoconf.spec +++ b/autoconf.spec @@ -5,14 +5,17 @@ Summary: A GNU tool for automatically configuring source code Name: autoconf -Version: 2.70 -Release: 1%{?dist} +Version: 2.69 +Release: 34%{?dist} License: GPLv2+ and GFDL Source0: http://ftpmirror.gnu.org/autoconf/autoconf-%{version}.tar.xz Source1: config.site Source2: autoconf-init.el URL: http://www.gnu.org/software/autoconf/ +Patch1: autoconf-2.69-perl-5.22-autoscan.patch +Patch2: autoconf-2.69-bash-5-LINENO.patch + BuildArch: noarch @@ -121,9 +124,6 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_emacs_sitestartdir} %changelog -* Wed Dec 09 2020 Ondrej Dubaj - 2.70-1 -- rebase to version 2.70 - * Mon Jul 27 2020 Fedora Release Engineering - 2.69-34 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 2769c83..7263de3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (autoconf-2.70.tar.xz) = af4af6b8811baa424c00990b368a6cbfb1d598dde9ee08dce2a5fc32cb9517e6e683a59d6852507f6a72d499fc298c4171b6f06962cf3ba40cf1557cfb6069fe +SHA512 (autoconf-2.69.tar.xz) = 995d3e5a8eb1eb37e2b7fae53c6ec7a9b4df997286b7d643344818f94636756b1bf5ff5ea9155e755cb9461149a853dfbf2886fc6bd7132e5afa9c168e306e9b