From c483216e3b136ea0089e6c1cbaf9590456f27ce6 Mon Sep 17 00:00:00 2001 From: Ondrej Dubaj Date: Mar 19 2021 07:45:24 +0000 Subject: Rebase to version 2.71 (#1905678) --- diff --git a/.gitignore b/.gitignore index e7705a7..370cb97 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ autoconf-2.66.tar.xz /autoconf-2.68.tar.xz /autoconf-2.69.tar.xz +/autoconf-2.71.tar.xz diff --git a/autoconf-2.69-backport-runstatedir-option.patch b/autoconf-2.69-backport-runstatedir-option.patch deleted file mode 100644 index d2ecd98..0000000 --- a/autoconf-2.69-backport-runstatedir-option.patch +++ /dev/null @@ -1,107 +0,0 @@ -From a197431414088a417b407b9b20583b2e8f7363bd Mon Sep 17 00:00:00 2001 -From: Eric Blake -Date: Thu, 12 Sep 2013 15:11:29 -0600 -Subject: [PATCH] AC_INIT: add --runstatedir option to configure - -http://lwn.net/Articles/436012/ documents that many distros -are now preferring to use /run rather than /var/run for -storage of pid files and other per-process temporary files -that must not be cleaned out during arbitrary TMPDIR sweeps. -As such, the GNU Coding Standards were recently changed to -recommend a new configure option to make it easy to choose -this directory at configure time. This patch adds support -for the option to all configure scripts built by autoconf. - -* general.m4 (_AC_INIT_PARSE_ARGS): Add new directory option. -(_AC_INIT_HELP): Document it. -* doc/autoconf.texi (Installation Directory Variables): Document -new option. -(Site Defaults): Mention typical use within a distro. -* NEWS: Mention the addition. - -Signed-off-by: Eric Blake ---- - NEWS | 5 +++++ - doc/autoconf.texi | 14 +++++++++++++- - lib/autoconf/general.m4 | 13 ++++++++++++- - 3 files changed, 30 insertions(+), 2 deletions(-) - -diff --git a/doc/autoconf.texi b/doc/autoconf.texi -index 26e7b17..4932067 100644 ---- a/doc/autoconf.texi -+++ b/doc/autoconf.texi -@@ -2826,7 +2826,18 @@ usually has a subdirectory per locale. - - @defvar localstatedir - @ovindex localstatedir --The directory for installing modifiable single-machine data. -+The directory for installing modifiable single-machine data. Content in -+this directory typically survives a reboot. -+@end defvar -+ -+@defvar runstatedir -+@ovindex runstatedir -+The directory for installing temporary modifiable single-machine data. -+Content in this directory survives as long as the process is running -+(such as pid files), as contrasted with @file{/tmp} that may be -+periodically cleaned. Conversely, this directory is typically cleaned -+on a reboot. By default, this is a subdirectory of -+@code{localstatedir}. - @end defvar - - @defvar mandir -@@ -22606,6 +22617,7 @@ test "$prefix" = NONE && prefix=/usr/share/local/gnu - test "$exec_prefix" = NONE && exec_prefix=/usr/local/gnu - test "$sharedstatedir" = '$@{prefix@}/com' && sharedstatedir=/var - test "$localstatedir" = '$@{prefix@}/var' && localstatedir=/var -+test "$runstatedir" = '$@{localstatedir@}/run' && runstatedir=/run - - # Give Autoconf 2.x generated configure scripts a shared default - # cache file for feature test results, architecture-specific. -diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 -index 70b0168..1ce9922 100644 ---- a/lib/autoconf/general.m4 -+++ b/lib/autoconf/general.m4 -@@ -586,6 +586,7 @@ AC_SUBST([datadir], ['${datarootdir}'])dnl - AC_SUBST([sysconfdir], ['${prefix}/etc'])dnl - AC_SUBST([sharedstatedir], ['${prefix}/com'])dnl - AC_SUBST([localstatedir], ['${prefix}/var'])dnl -+AC_SUBST([runstatedir], ['${localstatedir}/run'])dnl - AC_SUBST([includedir], ['${prefix}/include'])dnl - AC_SUBST([oldincludedir], ['/usr/include'])dnl - AC_SUBST([docdir], [m4_ifset([AC_PACKAGE_TARNAME], -@@ -812,6 +813,15 @@ do - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - -+ -runstatedir | --runstatedir | --runstatedi | --runstated \ -+ | --runstate | --runstat | --runsta | --runst | --runs \ -+ | --run | --ru | --r) -+ ac_prev=runstatedir ;; -+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ -+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ -+ | --run=* | --ru=* | --r=*) -+ runstatedir=$ac_optarg ;; -+ - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ -@@ -921,7 +931,7 @@ fi - for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ - datadir sysconfdir sharedstatedir localstatedir includedir \ - oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ -- libdir localedir mandir -+ libdir localedir mandir runstatedir - do - eval ac_val=\$$ac_var - # Remove trailing slashes. -@@ -1058,6 +1068,7 @@ Fine tuning of the installation directories: - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] -+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] --- -1.7.2.5 diff --git a/autoconf-2.69-bash-5-LINENO.patch b/autoconf-2.69-bash-5-LINENO.patch deleted file mode 100644 index 60e1529..0000000 --- a/autoconf-2.69-bash-5-LINENO.patch +++ /dev/null @@ -1,64 +0,0 @@ -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 deleted file mode 100644 index 7442cad..0000000 --- a/autoconf-2.69-perl-5.22-autoscan.patch +++ /dev/null @@ -1,28 +0,0 @@ -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 ec8621e..eecd435 100644 --- a/autoconf.spec +++ b/autoconf.spec @@ -5,18 +5,14 @@ Summary: A GNU tool for automatically configuring source code Name: autoconf -Version: 2.69 -Release: 36%{?dist} +Version: 2.71 +Release: 1%{?dist} License: GPLv2+ and GFDL Source0: https://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.xz Source1: config.site Source2: autoconf-init.el URL: https://www.gnu.org/software/autoconf/ -Patch1: autoconf-2.69-perl-5.22-autoscan.patch -Patch2: autoconf-2.69-bash-5-LINENO.patch -Patch3: autoconf-2.69-backport-runstatedir-option.patch - BuildArch: noarch @@ -25,6 +21,8 @@ BuildArch: noarch # m4 >= 1.4.6 is required, >= 1.4.14 is recommended: BuildRequires: perl +Requires: perl-File-Compare +Requires: perl-interpreter BuildRequires: m4 >= 1.4.14 Requires: m4 >= 1.4.14 %if %{with autoconf_enables_emacs} @@ -126,6 +124,9 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_emacs_sitestartdir} %changelog +* Fri Mar 19 2021 Ondrej Dubaj - 2.71-1 +- Rebase to version 2.71 (#1905678) + * Tue Jan 26 2021 Fedora Release Engineering - 2.69-36 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 7263de3..7b09df3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (autoconf-2.69.tar.xz) = 995d3e5a8eb1eb37e2b7fae53c6ec7a9b4df997286b7d643344818f94636756b1bf5ff5ea9155e755cb9461149a853dfbf2886fc6bd7132e5afa9c168e306e9b +SHA512 (autoconf-2.71.tar.xz) = 73d32b4adcbe24e3bafa9f43f59ed3b6efbd3de0f194e5ec90375f35da1199c583f5d3e89139b7edbad35171403709270e339ffa56a2ecb9b3123e9285021ff0