From 015427056954e149061e5c176e72f6067ebe4fb010fb697aba7bcfbb0e6d5568 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 3 Oct 2024 15:10:00 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main autoconf revision 28bfbb0dd79b4b5391511136ea71c705 --- Port-AC_SYS_LARGEFILE-to-C.patch | 87 ++++++++++++++++++++++ autoconf-2.71.tar.xz | 3 - autoconf-2.71.tar.xz.sig | 16 ---- autoconf-2.72.tar.xz | 3 + autoconf-2.72.tar.xz.sig | 16 ++++ autoconf.changes | 51 +++++++++++++ autoconf.spec | 20 ++--- autoreconf-ltdl.diff | 7 +- fix-testsuite-failures-with-bash-5.2.patch | 36 --------- 9 files changed, 170 insertions(+), 69 deletions(-) create mode 100644 Port-AC_SYS_LARGEFILE-to-C.patch delete mode 100644 autoconf-2.71.tar.xz delete mode 100644 autoconf-2.71.tar.xz.sig create mode 100644 autoconf-2.72.tar.xz create mode 100644 autoconf-2.72.tar.xz.sig delete mode 100644 fix-testsuite-failures-with-bash-5.2.patch diff --git a/Port-AC_SYS_LARGEFILE-to-C.patch b/Port-AC_SYS_LARGEFILE-to-C.patch new file mode 100644 index 0000000..36c9af7 --- /dev/null +++ b/Port-AC_SYS_LARGEFILE-to-C.patch @@ -0,0 +1,87 @@ +From b71143738516017f0e0d347a4025301c06c40254 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Wed, 24 Apr 2024 14:47:56 -0700 +Subject: [PATCH] Port AC_SYS_LARGEFILE to C++ +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Problem reported by Zack Weinberg +. +* lib/autoconf/specific.m4 (_AC_SYS_YEAR2038_PROBE) +(_AC_SYS_LARGEFILE_PROBE): +In chatter, say it’s a CPPFLAGS option, not a CC option. +(_AC_SYS_LARGEFILE_OPTIONS): Omit -n32, as we no longer +need to worry about IRIX. +(_AC_SYS_LARGEFILE_PROBE): Fiddle with CPPFLAGS, not CC, +and don’t worry about -n32. +--- + lib/autoconf/specific.m4 | 18 +++++++----------- + 1 file changed, 7 insertions(+), 11 deletions(-) + +diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4 +index a0e1fa8d..0d0191a8 100644 +--- a/lib/autoconf/specific.m4 ++++ b/lib/autoconf/specific.m4 +@@ -132,7 +132,7 @@ m4_define([_AC_SYS_YEAR2038_OPTIONS], m4_normalize( + # If you change this macro you may also need to change + # _AC_SYS_YEAR2038_OPTIONS. + AC_DEFUN([_AC_SYS_YEAR2038_PROBE], +-[AC_CACHE_CHECK([for $CC option for timestamps after 2038], ++[AC_CACHE_CHECK([for $CPPFLAGS option for timestamps after 2038], + [ac_cv_sys_year2038_opts], + [ac_save_CPPFLAGS="$CPPFLAGS" + ac_opt_found=no +@@ -262,7 +262,6 @@ m4_define([_AC_SYS_LARGEFILE_OPTIONS], m4_normalize( + ["none needed"] dnl Most current systems + ["-D_FILE_OFFSET_BITS=64"] dnl X/Open LFS spec + ["-D_LARGE_FILES=1"] dnl 32-bit AIX 4.2.1+, 32-bit z/OS +- ["-n32"] dnl 32-bit IRIX 6, SGI cc (obsolete) + )) + + # _AC_SYS_LARGEFILE_PROBE +@@ -279,25 +278,25 @@ m4_define([_AC_SYS_LARGEFILE_OPTIONS], m4_normalize( + # If you change this macro you may also need to change + # _AC_SYS_LARGEFILE_OPTIONS. + AC_DEFUN([_AC_SYS_LARGEFILE_PROBE], +-[AC_CACHE_CHECK([for $CC option to enable large file support], ++[AC_CACHE_CHECK([for $CPPFLAGS option for large files], + [ac_cv_sys_largefile_opts], +- [ac_save_CC="$CC" ++ [ac_save_CPPFLAGS=$CPPFLAGS + ac_opt_found=no + for ac_opt in _AC_SYS_LARGEFILE_OPTIONS; do + AS_IF([test x"$ac_opt" != x"none needed"], +- [CC="$ac_save_CC $ac_opt"]) ++ [CPPFLAGS="$ac_save_CPPFLAGS $ac_opt"]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([_AC_SYS_LARGEFILE_TEST_CODE])], + [AS_IF([test x"$ac_opt" = x"none needed"], + [# GNU/Linux s390x and alpha need _FILE_OFFSET_BITS=64 for wide ino_t. +- CC="$CC -DFTYPE=ino_t" ++ CPPFLAGS="$CPPFLAGS -DFTYPE=ino_t" + AC_COMPILE_IFELSE([], [], +- [CC="$CC -D_FILE_OFFSET_BITS=64" ++ [CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64" + AC_COMPILE_IFELSE([], [ac_opt='-D_FILE_OFFSET_BITS=64'])])]) + ac_cv_sys_largefile_opts=$ac_opt + ac_opt_found=yes]) + test $ac_opt_found = no || break + done +- CC="$ac_save_CC" ++ CPPFLAGS=$ac_save_CPPFLAGS + dnl Gnulib implements large file support for native Windows, based on the + dnl variables WINDOWS_64_BIT_OFF_T, WINDOWS_64_BIT_ST_SIZE. + m4_ifdef([gl_LARGEFILE], [ +@@ -327,9 +326,6 @@ AS_CASE([$ac_cv_sys_largefile_opts], + [AC_DEFINE([_LARGE_FILES], [1], + [Define to 1 on platforms where this makes off_t a 64-bit type.])], + +- ["-n32"], +- [CC="$CC -n32"], +- + [AC_MSG_ERROR( + [internal error: bad value for \$ac_cv_sys_largefile_opts])]) + +-- +2.35.3 + diff --git a/autoconf-2.71.tar.xz b/autoconf-2.71.tar.xz deleted file mode 100644 index 5b4d35b..0000000 --- a/autoconf-2.71.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f14c83cfebcc9427f2c3cea7258bd90df972d92eb26752da4ddad81c87a0faa4 -size 1292296 diff --git a/autoconf-2.71.tar.xz.sig b/autoconf-2.71.tar.xz.sig deleted file mode 100644 index c08bfae..0000000 --- a/autoconf-2.71.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEgvhU885zF0uLYxdAkfzDK2dpqmQFAmATPzIACgkQkfzDK2dp -qmSrUw//Z0ncEs8SD3qn2+QYUzo5dMZ4BJi/8h9LSlRZnp+OhVqtWgCQhiW/cTaa -UXKRca7JMRTreqMhgLkRE12cEvTIUlfl1QiOluNBq1YzNeG1JMIFEVxi8JiBzCqd -s7cEgIUB0ZhhEtBAAF0ABBDJraaTYJGUxLpvzOltdiRODn6ic9XZdUga7ouWgwLM -5o78OzYXbYz2CP6DrOsfntNol4Fx2gH8hOADWOlUEzCc/580twsm2xMTu8q6+win -yIxTC5yDJdXZnP6JIFD2rrg1tfFkTom2sMVC3feFjrgRqyA4Jcyf8WpmRnC21PzD -NhEO4aejgEmkKCIDudT62vzOhPGZrKPlPA+rMcYX3Jx1rCbozAbIcsGj6mD8q75g -7BYtwJQjKLH2b4pJ0Xl6l4bVnN2o82zdWY5cHE9TI+l5ntU9yooNKlh1IAz3WFwR -PCGd0F/JIXNjBbMzqtjyzYYvlSRDvS+aLg8S+PK/wXbZBEjQOjEI+m1YyOL2N7qM -UiM04x5BNCWG672qg38NISIHJvmBdgCHiwnVLpfstQPw+Y4L8YyMZyrbj3Mtmomo -Woa9oXvv1lVT4W2PleJQ71fq8QpuW+xbM9IXdWoMp1lCEZQ0doJcTFvEhwpW3tca -oEzNdgMghMDB9TFsiTpP1YoOyvAVhRtxWgO1j9pSi3JWQZ3AjKs= -=y3Hc ------END PGP SIGNATURE----- diff --git a/autoconf-2.72.tar.xz b/autoconf-2.72.tar.xz new file mode 100644 index 0000000..8b38157 --- /dev/null +++ b/autoconf-2.72.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba885c1319578d6c94d46e9b0dceb4014caafe2490e437a0dbca3f270a223f5a +size 1389680 diff --git a/autoconf-2.72.tar.xz.sig b/autoconf-2.72.tar.xz.sig new file mode 100644 index 0000000..40b2ac9 --- /dev/null +++ b/autoconf-2.72.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEgvhU885zF0uLYxdAkfzDK2dpqmQFAmWF39EACgkQkfzDK2dp +qmRSsQ//aJeoMyBhRHJxL42L3TGh/eDKHdXXdKRthaKcqMIMCUBqbSWFZy8FKSmN +U1FMpHp45EzLeurZtfQo3673bfYB1EUz/KOZSGFOJO6sPTLQ95Utkbmf0i+pGevp +xCGiDz1E3smTV41TD98rrF6t/GYUI+zTFh2NfkE1zbInQlFpNeXPvFOlmd7IJBAY +rSmqpHeCM7JB3MRZuwij9X6A293RGIzWcHbqY2BVRjWAe7osm/RXvm1yHokPAtdP +Y6o8wcImYtBItDAa9nDVkEP5fSOfB67ojtZnuz3Kk8k5nRRkFy/kEy3Y+zlfcQiO +nH8NtyGlrpMRwi9aQgD/m0b39N4Jc+Pbo4WU/ap8J2bjul6yduhAp6HkCW9iZX2z +xL0cuvMBjyonWRUEt53nhBjJ7YANhLTI0A4Lh4PgvRq6Y5/4Br/wrEitI9wtKJbR +LjtUYAY0CPNt8oHUQ29OBKdhO4lfi4KKYe3m4Q74v0xScQlVBNF0lLKddIgT4NyB +4QhwG7spGCvGD79NfQHKKeVSyWckNv+0GSSPKEMgBu1z1G2EnYPixJzrlo5w2mHm +LTCdj/ol7eiO2PZHQ9LRq+U9fYql4VBSCiBOLucOd5aciOaYwTQg+nvOPv+RWfSC +MXlf1nypXonF/xFaVfDkKrpDrA9Aft+bjgerWn+7mvj2FRIimu4= +=y9ft +-----END PGP SIGNATURE----- diff --git a/autoconf.changes b/autoconf.changes index 62739e9..050fc0d 100644 --- a/autoconf.changes +++ b/autoconf.changes @@ -1,3 +1,54 @@ +------------------------------------------------------------------- +Thu May 2 09:47:58 UTC 2024 - Valentin Lefebvre + +- Fix AC_SYS_LARGEFILE doesn't honor AC_LANG setting and undo the removing of + the largefile test. (bsc#1219035) + + Port-AC_SYS_LARGEFILE-to-C.patch + - remove-largefile-test.patch + +------------------------------------------------------------------- +Tue Feb 20 10:21:03 UTC 2024 - Dominique Leuenberger + +- Use %patch -P N instead of deprecated %patchN. + +------------------------------------------------------------------- +Tue Feb 13 09:22:52 UTC 2024 - Valentin Lefebvre + +- Re-add patch (bsc#1219035) + * [autoreconf-ltdl.diff] +- Remove test with macro LARGEFILE and YEAR2038, broken for i586 arch. see + https://git.savannah.gnu.org/cgit/autoconf.git/tree/NEWS#n194 (bsc#1219035) + * [remove-largefile-test.patch] + +------------------------------------------------------------------- +Sun Dec 24 08:49:46 UTC 2023 - Martin Pluskal + +- Use autosetup + +------------------------------------------------------------------- +Sat Dec 23 12:42:24 UTC 2023 - Christoph G + +- update to version 2.72 + * Support for ensuring time_t is Y2038-safe + configure can now ensure that time_t can represent moments in time + after 18 January 2038, i.e. 2**31 - 1 seconds after the Unix epoch. + On most 64-bit systems this is true by default; the new feature + is detection of systems where time_t is a 32-bit signed integer by + default, *and* there is an alternative mode in which it is larger, + in which case that mode will be enabled. + * AC_USE_SYSTEM_EXTENSIONS now enables C23 Annex F extensions + by defining __STDC_WANT_IEC_60559_EXT__. + * Configure scripts no longer support pre-1989 C compilers. + * Autoconf developers now need Perl 5.10 (2007) or later. + * Autoconf users now need GNU M4 1.4.8 (2006) or later. + * Some m4sh diversions have been renumbered. + * AC_FUNC_GETGROUPS and AC_TYPE_GETGROUPS no longer run test programs. + * All internal uses of AC_EGREP_CPP and AC_EGREP_HEADER have been removed. +- Update dependencies as recommendd to m4 1.4.16, Perl 5.10 +- Drop patch autoreconf-ltdl.diff as similar code is part of upstream +- Drop patch fix-testsuite-failures-with-bash-5.2.patch, it is + part of upstream + ------------------------------------------------------------------- Thu Oct 27 15:25:30 UTC 2022 - Valentin Lefebvre diff --git a/autoconf.spec b/autoconf.spec index e782033..232d278 100644 --- a/autoconf.spec +++ b/autoconf.spec @@ -1,7 +1,7 @@ # -# spec file +# spec file for package autoconf # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,8 +24,9 @@ %else %global psuffix %{nil} %endif + Name: autoconf%{?psuffix} -Version: 2.71 +Version: 2.72 Release: 0 Summary: A GNU Tool for Automatically Configuring Source Code License: GPL-3.0-or-later @@ -34,14 +35,15 @@ 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 +# PATCH-FIX-UPSTREAM: Fix problem https://savannah.gnu.org/support/?110983 +Patch1: Port-AC_SYS_LARGEFILE-to-C.patch BuildRequires: help2man -BuildRequires: m4 >= 1.4.6 +BuildRequires: m4 >= 1.4.16 BuildArch: noarch %if "%{name}" == "autoconf" Requires: info -Requires: m4 >= 1.4.6 -Requires: perl-base >= 5.6 +Requires: m4 >= 1.4.16 +Requires: perl-base >= 5.10 %endif %if "%{name}" == "autoconf-testsuite" BuildRequires: gcc-c++ @@ -67,9 +69,7 @@ be configuring software with an autoconf-generated script; autoconf is only required for the generation of the scripts, not their use. %prep -%setup -q -n autoconf-%{version} -%patch0 -%patch1 -p1 +%autosetup -p1 -n autoconf-%{version} %build %configure diff --git a/autoreconf-ltdl.diff b/autoreconf-ltdl.diff index 2254064..e045b2c 100644 --- a/autoreconf-ltdl.diff +++ b/autoreconf-ltdl.diff @@ -1,7 +1,6 @@ -Index: bin/autoreconf.in -=================================================================== ---- bin/autoreconf.in.orig -+++ bin/autoreconf.in +diff -Pdpru autoconf-2.72/bin/autoreconf.in autoconf-2.72-new/bin/autoreconf.in +--- autoconf-2.72/bin/autoreconf.in 2023-12-19 22:13:19.000000000 +0100 ++++ autoconf-2.72-new/bin/autoreconf.in 2024-02-19 11:01:32.513106786 +0100 @@ -595,6 +595,8 @@ sub autoreconf_current_directory ($) 'AC_CONFIG_AUX_DIR', 'AC_CONFIG_HEADERS', diff --git a/fix-testsuite-failures-with-bash-5.2.patch b/fix-testsuite-failures-with-bash-5.2.patch deleted file mode 100644 index c76ebb2..0000000 --- a/fix-testsuite-failures-with-bash-5.2.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- 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