Sync from SUSE:SLFO:1.1 automake revision e7d7256179cb6bd9961da92aed2900a2

2025-04-15 16:42:36 +02:00
15 changed files with 1708 additions and 227 deletions
--- a/0001-correct-parameter-parsing-in-test-driver-script.patch
+++ b/0001-correct-parameter-parsing-in-test-driver-script.patch
@@ -0,0 +1,54 @@
+From ba1172154da6739f9bf9e11c93f2abbb90a226ac Mon Sep 17 00:00:00 2001
+From: Thomas Blume <Thomas.Blume@suse.com>
+Date: Tue, 14 Jun 2016 14:45:42 +0200
+Subject: [PATCH] correct parameter parsing in test-driver script
+
+The help text suggest using an equal sign for assigning parameter values
+but the code only supports spaces.
+The patch adds support for both.
+---
+ lib/test-driver | 27 ++++++++++++++++-----------
+ 1 file changed, 16 insertions(+), 11 deletions(-)
+
+Index: automake-1.16.3/lib/test-driver
+===================================================================
+--- automake-1.16.3.orig/lib/test-driver
+++ automake-1.16.3/lib/test-driver
+@@ -58,21 +58,26 @@ trs_file=  # Where to save the metadata
+ expect_failure=no
+ color_tests=no
+ enable_hard_errors=yes
+-while test $# -gt 0; do
+-  case $1 in
+while test $# -gt 1; do
+ arg=${1%=*}
+ val=${1#*=}
+ if [ $arg = $val ]; then
+   val=$2
+   shift
+ fi
+ case $arg in
+   --help) print_usage; exit $?;;
+   --version) echo "test-driver $scriptversion"; exit $?;;
+-  --test-name) test_name=$2; shift;;
+-  --log-file) log_file=$2; shift;;
+-  --trs-file) trs_file=$2; shift;;
+-  --color-tests) color_tests=$2; shift;;
+-  --expect-failure) expect_failure=$2; shift;;
+-  --enable-hard-errors) enable_hard_errors=$2; shift;;
+-  --) shift; break;;
+  --test-name) test_name=$val;;
+  --log-file) log_file=$val;;
+  --trs-file) trs_file=$val;;
+  --color-tests) color_tests=$val;;
+  --expect-failure) expect_failure=$val;;
+  --enable-hard-errors) enable_hard_errors=$val;;
+  --) break;;
+   -*) usage_error "invalid option: '$1'";;
+-   *) break;;
+   esac
+-  shift
+  [ $arg != $val ] && shift
+ done
+ 
+ missing_opts=
--- a/automake-1.13.4-fix-primary-prefix-invalid-couples-test.patch
+++ b/automake-1.13.4-fix-primary-prefix-invalid-couples-test.patch
@@ -0,0 +1,26 @@
+From: Andreas Stieger <andreas.stieger@gmx.de>
+Subject: fix test failures in openSUSE Factory
+Date: Fri, 16 Aug 2013 22:59:41 +0100
+Upstream: no
+
+The test suite fails for factory comparing the output of two command runs.
+As only the content is relevant, not the order, sort befor diffing to fix.
+
+---
+ t/primary-prefix-invalid-couples.tap |    2 ++
+ 1 file changed, 2 insertions(+)
+
+Index: automake-1.15.1/t/primary-prefix-invalid-couples.tap
+===================================================================
+--- automake-1.15.1.orig/t/primary-prefix-invalid-couples.tap
+++ automake-1.15.1/t/primary-prefix-invalid-couples.tap
+@@ -186,7 +186,9 @@ grep -v 'dir.* not a legitimate director
+ # Check that the same failures are present without the '--add-missing'
+ # option.
+ mv stderr stderr.old
+sort stderr.old -o stderr.old
+ AUTOMAKE_fails -d "automake error out on mismatched prefix/primary couples"
+sort stderr -o stderr
+ command_ok_ "... and with the same diagnostic of 'automake -a'" \
+             diff stderr.old stderr
+ 
--- a/automake-1.16.5.tar.xz
+++ b/automake-1.16.5.tar.xz
--- a/automake-1.16.5.tar.xz.sig
+++ b/automake-1.16.5.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEFV0/xQDINEhtHupnf9n8ywAL7u4FAmFac7IACgkQf9n8ywAL
+7u7TGw/8CdJWZAdWeg8tqnthdtz4BIVr0JcqWWtv7eyYc0G66u9OaAUnGGlRLh+V
+Uhign3A/HsJQkwUqEw7V1N/RBT8HtB1eDXu3H/E4XPZE7nuxlmBfy2gO4TLUmWRd
+SSS8L/AEy0kWcYOGUJuk9xS+sAeDMPor2erHxx/Yo6S9tLyNpPK/rPas5Q/ZqAJf
+EI9vMtaw9qedW16LkOqvrQ8U6VHOWgSS0xRgUNj8u2yG2TpNqEbyqS94fiNFtoQx
+5BWzhXcunDV85LzGuqYiBkmDBLd2Ldr1WhCHh7iA/LoD8xqoLnvLQfcb8cwpHpKx
+PIqGgSIcaRwcbf4dQwNWPV5d3NXyU1vE9FzooVrhyjv6uWwT4SK2jYHaNUlP34fX
+RtpkAk+G79HLJCZyWjjLhVAlTxoMH+4RnzMjbzotpZp80WhQW0/mM23Hl14uEpuf
+bGNiFBHx8JEbb4vCQZrudRDMPA76GTYaZRMsRIDmta7g/JURf6roOKDOWs4gPMM5
+JspOopPPyvUDt5jQRkOj1Q/nyAsrF5lCuC3RrkgQwBb4ZQ9cyLTPC5dHirV/DI4a
+erM+mfDiH4coTaZ/ML4jtUvVXJreioMEMoW6KJvo09X09bEhv/0JUa/jmo9N+hoc
+9T848ej8oGIswE5gG/qFVRA2I/as7oQcCEqRILf0sH0RYm5HEdk=
+=lQXz
+-----END PGP SIGNATURE-----
--- a/automake-1.18.1.tar.xz
+++ b/automake-1.18.1.tar.xz
--- a/automake-1.18.1.tar.xz.sig
+++ b/automake-1.18.1.tar.xz.sig
@@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQEzBAABCAAdFiEEF9MxGxS8DySCZ78CBxZ0ijDRVa0FAmhds1YACgkQBxZ0ijDR
-Va2JLAf+I3CH3G3/7d1F4tIEKFjk7py6TbceXQumg+9nACo7tKoaxKDvVhVEKnCi
-bymNAidvKWYmiKcF6C3C0c5x6DyTSIjWO4S+g93aUSfzgN8ipLAjUvKnxl3ePtiV
-ivhr5X4Nwx0FwW6OF8HB3/ejRJCdfpmFirNKAo4DbEfg/mrpO9HP5NFqAexvgUuM
-bOucHcrHiTGAnvTlzlChEOHpjZzNa00hJNbv/i93VOI+inyFPIPq1H8cnEnYkMoP
-+rT4+Qlisw8MIq9rG+kjTHxne5GDfccIheywSEuLfxsMzUIUXjHg4v8RMMxTri50
-ufd58lhAsw6za9Q9fjK75ByfJCOeYg==
-=aNPf
-----END PGP SIGNATURE-----
--- a/automake-require_file.patch
+++ b/automake-require_file.patch
@@ -0,0 +1,24 @@
+---
+ bin/automake.in |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+Index: automake-1.16.5/bin/automake.in
+===================================================================
+--- automake-1.16.5.orig/bin/automake.in
+++ automake-1.16.5/bin/automake.in
+@@ -7617,12 +7617,14 @@ sub required_file_check_or_copy
+   my $fullfile = "$dir/$file";
+   my $found_it = 0;
+   my $dangling_sym = 0;
+  my $thisdir = dirname ($fullfile);
+  my $thisfile = basename ($fullfile);
+ 
+   if (-l $fullfile && ! -f $fullfile)
+     {
+       $dangling_sym = 1;
+     }
+-  elsif (dir_has_case_matching_file ($dir, $file))
+  elsif (dir_has_case_matching_file ($thisdir, $thisfile))
+     {
+       $found_it = 1;
+     }
--- a/automake-suse-vendor.patch
+++ b/automake-suse-vendor.patch
@@ -1,8 +1,8 @@
-diff --git a/lib/config.guess b/lib/config.guess
-index f6d217a49..67f9aa0fb 100755
--- a/lib/config.guess
-+++ b/lib/config.guess
-@@ -194,6 +194,17 @@ Linux|GNU|GNU/*)
+Index: automake-1.16.5/lib/config.guess
+===================================================================
+--- automake-1.16.5.orig/lib/config.guess
+++ automake-1.16.5/lib/config.guess
+@@ -188,6 +188,17 @@ Linux|GNU|GNU/*)
 	;;
 esac
 
@@ -20,7 +20,7 @@ index f6d217a49..67f9aa0fb 100755
 # Note: order is significant - the case branches are not exclusive.
 
 case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
-@@ -275,46 +286,46 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
+@@ -269,46 +280,46 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME
 	;;
     *:Bitrig:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
@@ -80,7 +80,7 @@ index f6d217a49..67f9aa0fb 100755
 	;;
     mips:OSF1:*.*)
 	GUESS=mips-dec-osf1
-@@ -376,13 +387,13 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
+@@ -370,13 +381,13 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME
 	GUESS=$UNAME_MACHINE-dec-osf$OSF_REL
 	;;
     Amiga*:UNIX_System_V:4.0:*)
@@ -97,7 +97,7 @@ index f6d217a49..67f9aa0fb 100755
 	;;
     *:OS/390:*:*)
 	GUESS=i370-ibm-openedition
-@@ -397,7 +408,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
+@@ -391,7 +402,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME
 	GUESS=arm-acorn-riscix$UNAME_RELEASE
 	;;
     arm*:riscos:*:*|arm*:RISCOS:*:*)
@@ -106,7 +106,7 @@ index f6d217a49..67f9aa0fb 100755
 	;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
 	GUESS=hppa1.1-hitachi-hiuxmpp
-@@ -511,7 +522,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
+@@ -505,7 +516,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME
 	GUESS=m68k-hades-mint$UNAME_RELEASE
 	;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
@@ -115,7 +115,7 @@ index f6d217a49..67f9aa0fb 100755
 	;;
     m68k:machten:*:*)
 	GUESS=m68k-apple-machten$UNAME_RELEASE
-@@ -824,9 +835,9 @@ EOF
+@@ -818,9 +829,9 @@ EOF
 	;;
     i*86:OSF1:*:*)
 	if test -x /usr/sbin/sysversion ; then
@@ -127,7 +127,7 @@ index f6d217a49..67f9aa0fb 100755
 	fi
 	;;
     parisc*:Lites*:*:*)
-@@ -891,10 +902,10 @@ EOF
+@@ -885,10 +896,10 @@ EOF
 	GUESS=$UNAME_MACHINE-pc-bsdi$UNAME_RELEASE
 	;;
     sparc*:BSD/OS:*:*)
@@ -140,7 +140,7 @@ index f6d217a49..67f9aa0fb 100755
 	;;
     arm:FreeBSD:*:*)
 	UNAME_PROCESSOR=`uname -p`
-@@ -903,10 +914,10 @@ EOF
+@@ -897,10 +908,10 @@ EOF
 	    | grep -q __ARM_PCS_VFP
 	then
 	    FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
@@ -153,7 +153,7 @@ index f6d217a49..67f9aa0fb 100755
 	fi
 	;;
     *:FreeBSD:*:*)
-@@ -918,7 +929,7 @@ EOF
+@@ -912,7 +923,7 @@ EOF
 		UNAME_PROCESSOR=i586 ;;
 	esac
 	FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
@@ -162,7 +162,7 @@ index f6d217a49..67f9aa0fb 100755
 	;;
     i*:CYGWIN*:*)
 	GUESS=$UNAME_MACHINE-pc-cygwin
-@@ -944,10 +955,10 @@ EOF
+@@ -935,10 +946,10 @@ EOF
 		GUESS=i586-pc-interix$UNAME_RELEASE
 		;;
 	    authenticamd | genuineintel | EM64T)
@@ -175,7 +175,7 @@ index f6d217a49..67f9aa0fb 100755
 		;;
 	esac ;;
     i*:UWIN*:*)
-@@ -958,7 +969,7 @@ EOF
+@@ -949,29 +960,29 @@ EOF
 	;;
     prep*:SunOS:5.*:*)
 	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
@@ -184,25 +184,25 @@ index f6d217a49..67f9aa0fb 100755
 	;;
     *:GNU:*:*)
 	# the GNU system
-@@ -976,10 +987,10 @@ EOF
- 	GUESS="$UNAME_MACHINE-pc-managarm-mlibc"
+ 	GNU_ARCH=`echo "$UNAME_MACHINE" | sed -e 's,[-/].*$,,'`
+ 	GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's,/.*$,,'`
+-	GUESS=$GNU_ARCH-unknown-$LIBC$GNU_REL
+	GUESS=$GNU_ARCH-${VENDOR}-$LIBC$GNU_REL
 	;;
-     *:[Mm]anagarm:*:*)
-	GUESS="$UNAME_MACHINE-unknown-managarm-mlibc"
-+	GUESS="$UNAME_MACHINE-${VENDOR}-managarm-mlibc"
+     *:GNU/*:*:*)
+ 	# other systems with GNU libc and userland
+ 	GNU_SYS=`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"`
+ 	GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
+-	GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC
+	GUESS=$UNAME_MACHINE-${VENDOR}-$GNU_SYS$GNU_REL-$LIBC
 	;;
     *:Minix:*:*)
 -	GUESS=$UNAME_MACHINE-unknown-minix
 +	GUESS=$UNAME_MACHINE-${VENDOR}-minix
 	;;
     aarch64:Linux:*:*)
- 	set_cc_for_build
-@@ -1002,11 +1013,11 @@ EOF
- 		eabi | eabihf) CPU=armv8l; LIBCABI=$LIBC$ABI ;;
- 	    esac
- 	fi
-	GUESS=$CPU-unknown-linux-$LIBCABI
-+	GUESS=$CPU-${VENDOR}-linux-$LIBCABI
+-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
 	;;
     aarch64_be:Linux:*:*)
 	UNAME_MACHINE=aarch64_be
@@ -211,7 +211,7 @@ index f6d217a49..67f9aa0fb 100755
 	;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in
-@@ -1020,29 +1031,29 @@ EOF
+@@ -985,29 +996,29 @@ EOF
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
 	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
@@ -247,7 +247,7 @@ index f6d217a49..67f9aa0fb 100755
 	;;
     cris:Linux:*:*)
 	GUESS=$UNAME_MACHINE-axis-linux-$LIBC
-@@ -1051,40 +1062,40 @@ EOF
+@@ -1016,31 +1027,31 @@ EOF
 	GUESS=$UNAME_MACHINE-axis-linux-$LIBC
 	;;
     e2k:Linux:*:*)
@@ -263,7 +263,8 @@ index f6d217a49..67f9aa0fb 100755
 +	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
 	;;
     i*86:Linux:*:*)
- 	GUESS=$UNAME_MACHINE-pc-linux-$LIBC
+-	GUESS=$UNAME_MACHINE-pc-linux-$LIBC
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
 	;;
     ia64:Linux:*:*)
 -	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
@@ -273,19 +274,7 @@ index f6d217a49..67f9aa0fb 100755
 -	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
 +	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
 	;;
-     kvx:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
- 	;;
-     kvx:cos:*:*)
-	GUESS=$UNAME_MACHINE-unknown-cos
-+	GUESS=$UNAME_MACHINE-${VENDOR}-cos
- 	;;
-     kvx:mbr:*:*)
-	GUESS=$UNAME_MACHINE-unknown-mbr
-+	GUESS=$UNAME_MACHINE-${VENDOR}-mbr
- 	;;
-     loongarch32:Linux:*:* | loongarch64:Linux:*:*)
+     loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*)
 -	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
 +	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
 	;;
@@ -299,8 +288,12 @@ index f6d217a49..67f9aa0fb 100755
 	;;
     mips:Linux:*:* | mips64:Linux:*:*)
 	set_cc_for_build
-@@ -1135,57 +1146,57 @@ EOF
- 	test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; }
+@@ -1088,60 +1099,60 @@ EOF
+ EOF
+ 	cc_set_vars=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'`
+ 	eval "$cc_set_vars"
+-	test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; }
+	test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-${VENDOR}-linux-$LIBCABI"; exit; }
 	;;
     mips64el:Linux:*:*)
 -	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
@@ -374,8 +367,12 @@ index f6d217a49..67f9aa0fb 100755
 	;;
     vax:Linux:*:*)
 	GUESS=$UNAME_MACHINE-dec-linux-$LIBC
-@@ -1215,7 +1226,7 @@ EOF
- 	GUESS=$CPU-pc-linux-$LIBCABI
+@@ -1157,10 +1168,10 @@ EOF
+ 		LIBCABI=${LIBC}x32
+ 	    fi
+ 	fi
+-	GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBCABI
 	;;
     xtensa*:Linux:*:*)
 -	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
@@ -383,7 +380,7 @@ index f6d217a49..67f9aa0fb 100755
 	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-@@ -1237,16 +1248,16 @@ EOF
+@@ -1182,16 +1193,16 @@ EOF
 	GUESS=$UNAME_MACHINE-pc-os2-emx
 	;;
     i*86:XTS-300:*:STOP)
@@ -403,7 +400,7 @@ index f6d217a49..67f9aa0fb 100755
 	;;
     i*86:*DOS:*:*)
 	GUESS=$UNAME_MACHINE-pc-msdosdjgpp
-@@ -1266,7 +1277,7 @@ EOF
+@@ -1211,7 +1222,7 @@ EOF
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
 	esac
@@ -412,7 +409,7 @@ index f6d217a49..67f9aa0fb 100755
 	;;
     i*86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
-@@ -1305,7 +1316,7 @@ EOF
+@@ -1250,7 +1261,7 @@ EOF
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
 	  GUESS=i860-stardent-sysv$UNAME_RELEASE    # Stardent Vistra i860-SVR4
 	else # Add other i860-SVR4 vendors below as they are discovered.
@@ -421,7 +418,7 @@ index f6d217a49..67f9aa0fb 100755
 	fi
 	;;
     mini*:CTIX:SYS*5:*)
-@@ -1342,19 +1353,19 @@ EOF
+@@ -1287,19 +1298,19 @@ EOF
 	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
 	    && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
@@ -445,7 +442,7 @@ index f6d217a49..67f9aa0fb 100755
 	;;
     SM[BE]S:UNIX_SV:*:*)
 	GUESS=mips-dde-sysv$UNAME_RELEASE
-@@ -1404,7 +1415,7 @@ EOF
+@@ -1349,7 +1360,7 @@ EOF
 	if test -d /usr/nec; then
 		GUESS=mips-nec-sysv$UNAME_RELEASE
 	else
@@ -454,16 +451,16 @@ index f6d217a49..67f9aa0fb 100755
 	fi
 	;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-@@ -1423,7 +1434,7 @@ EOF
- 	GUESS=powerpc-apple-haiku
+@@ -1365,7 +1376,7 @@ EOF
+ 	GUESS=i586-pc-haiku
 	;;
-     *:Haiku:*:*)	# Haiku modern gcc (not bound by BeOS compat)
-	GUESS=$UNAME_MACHINE-unknown-haiku
-+	GUESS=$UNAME_MACHINE-${VENDOR}-haiku
+     x86_64:Haiku:*:*)
+-	GUESS=x86_64-unknown-haiku
+	GUESS=x86_64-${VENDOR}-haiku
 	;;
     SX-4:SUPER-UX:*:*)
 	GUESS=sx4-nec-superux$UNAME_RELEASE
-@@ -1536,13 +1547,13 @@ EOF
+@@ -1478,13 +1489,13 @@ EOF
 	elif test "x${cputype-}" != x; then
 	    UNAME_MACHINE=$cputype
 	fi
@@ -480,7 +477,7 @@ index f6d217a49..67f9aa0fb 100755
 	;;
     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
 	GUESS=pdp10-dec-tops20
-@@ -1551,17 +1562,17 @@ EOF
+@@ -1493,17 +1504,17 @@ EOF
 	GUESS=pdp10-xkl-tops20
 	;;
     *:TOPS-20:*:*)
@@ -501,8 +498,8 @@ index f6d217a49..67f9aa0fb 100755
 	;;
     *:*VMS:*:*)
 	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-@@ -1584,19 +1595,19 @@ EOF
- 	GUESS=$UNAME_MACHINE-pc-fiwix
+@@ -1523,16 +1534,16 @@ EOF
+ 	GUESS=$UNAME_MACHINE-pc-rdos
 	;;
     *:AROS:*:*)
 -	GUESS=$UNAME_MACHINE-unknown-aros
@@ -520,9 +517,5 @@ index f6d217a49..67f9aa0fb 100755
 -	GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE
 +	GUESS=$UNAME_MACHINE-${VENDOR}-unleashed$UNAME_RELEASE
 	;;
-     *:Ironclad:*:*)
-	GUESS=$UNAME_MACHINE-unknown-ironclad
-+	GUESS=$UNAME_MACHINE-${VENDOR}-ironclad
- 	;;
 esac
 
--- a/automake.changes
+++ b/automake.changes
@@ -1,87 +1,3 @@
-------------------------------------------------------------------
-Fri Jun 27 05:44:11 UTC 2025 - Christoph G <foss@grueninger.de>
-
- update to 1.18.1
-  - Undo change to mdate-sh; once again, it does not look at
-    SOURCE_DATE_EPOCH. This change was a misunderstanding that causes
-    problems, not fixes, for reproducible builds.
-  - Improve debuggability of installcheck failures.
-
-------------------------------------------------------------------
-Wed Jun  4 09:42:26 UTC 2025 - Valentin Lefebvre <valentin.lefebvre@suse.com>
-
- Get the latest automake.keyring from Savannah, including new key used to
-  sign the sources.
-
-------------------------------------------------------------------
-Tue Jun  3 20:55:21 UTC 2025 - Christoph G <foss@grueninger.de>
-
- test-driver don't use equal sign for assigning parameter, upstream well
-  documented to use only spaces. See commit:
-  6cfd9401c5d6b4a6fce1318d50a6ec34fdd4799a
-  * Drop 0001-correct-parameter-parsing-in-test-driver-script.patch
-
-------------------------------------------------------------------
-Wed May 28 17:59:59 UTC 2025 - Christoph G <foss@grueninger.de>
-
- update to 1.18
-  * Default tar format is now ustar, mainly to support longer
-    filenames; the tar-v7 and other explicit options to force a
-    particular tar format are unchanged and still override the
-    default.
-  * The mdate-sh auxiliary script generally used with Texinfo now
-    uses SOURCE_DATE_EPOCH, if set, instead of the source file's
-    mtime.
-  * New option dist-bzip3 for bzip3 compression of distributions.
-  * New option --stderr-prefix for tap-driver.sh, to prefix each
-    line of stderr from a test script with a given string.
-  * Support for Algol 68 added, based on the GNU Algol 68
-    compiler.
- Do not call bootstrap script, as it triggers an texinfo run.
-
-------------------------------------------------------------------
-Fri Jul 12 17:18:39 UTC 2024 - Christoph G <foss@grueninger.de>
-
- update to 1.17
-  - AM_PATH_PYTHON will, after checking "python", prefer any Python 3
-    version (latest versions checked first) over any Python 2
-    version. If a specific version of Python 2 is still needed, the
-    $PYTHON variable should be set beforehand.
-  - AM_PATH_PYTHON will also search for Python versions 3.20 through 3.10.
-    It previously searched for 3.9 through 3.0.
-  - RANLIB may be overridden on a per-target basis.
-  - AM_TEXI2FLAGS may be defined to pass extra flags to TEXI2DVI & TEXI2PDF.
-  - New option "posix" to emit the special target .POSIX for make.
-  - Systems with non-POSIX "rm -f" behavior are now supported, and the
-    prior intent to drop support for them has been reversed.
-    The ACCEPT_INFERIOR_RM_PROGRAM setting no longer exists.
-  - Variables using escaped \# will trigger portability warnings, but be
-    retained when appended.  GNU Make & BSD Makes are known to support it.
-  - GNU Make's default pattern rules are disabled, for speed and debugging.
-    (.SUFFIXES was already cleared.)
-  - For Texinfo documents, if a .texi.in file exists, but no .texi, the
-    .texi.in will be read. Texinfo source files need not be present at
-    all, and if present, need not contain @setfilename. Then the file name
-    as given in the Makefile.am will be used.  If @setfilename is present,
-    it should be the basename of the Texinfo file, extended with .info.
-  - aclocal has a new option --aclocal-path to override $ACLOCAL_PATH.
-  - The missing script also supports autoreconf, autogen, and perl.
-  - test-suite.log now contains basic system information, and the
-    console message about bug reporting on failure has a bit more detail.
-  - When using the (default) "parallel" test driver, you can now omit the
-    output of skipped tests from test-suite.log by defining the
-    variable IGNORE_SKIPPED_LOGS to a non-empty value. (bug#71422)
- Drop patches now included in 1.17
-  * tests-Fix-type-defaults-error-in-link_cond.patch
-  * tests-avoid-implicit-function-declaration-in-depcomp.patch
-  * tests-don-t-try-to-prevent-flex-from-including-unist.patch
-  * tests-avoid-implicit-function-declarations.patch
- Drop patch automake-require_file.patch with different upstream fix
- Drop no longer necessary patch
-  automake-1.13.4-fix-primary-prefix-invalid-couples-test.patch
- Ajust patches automake-suse-vendor.patch and
-  0001-correct-parameter-parsing-in-test-driver-script.patch
-
 -------------------------------------------------------------------
 Tue May  7 15:46:57 UTC 2024 - Valentin Lefebvre <valentin.lefebvre@suse.com>

--- a/automake.keyring
+++ b/automake.keyring
@@ -3635,63 +3635,3 @@ LfnCUezmdRdxQa0vljTM4+mIhbZVQBH6ZKXwv5IJ5DiS2XdsPx0p87PCWTaYKKjZ
 dJu2rMPff+h8UjA=
 =lsRc
 -----END PGP PUBLIC KEY BLOCK-----
-
-----BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-Qg==
-=/kap
-----END PGP PUBLIC KEY BLOCK-----
--- a/automake.spec
+++ b/automake.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package automake
 #
-# Copyright (c) 2025 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
@@ -26,7 +26,7 @@
 %define nsuffix %{nil}
 %endif
 Name:           automake%{nsuffix}
-Version:        1.18.1
+Version:        1.16.5
 Release:        0
 Summary:        A Program for Automatically Generating GNU-Style Makefile.in Files
 # docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT
@@ -38,6 +38,14 @@ Source1:        https://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz.sig
 # taken from https://savannah.gnu.org/project/release-gpgkeys.php?group=automake&download=1
 Source2:        automake.keyring
 Source3:        automake-rpmlintrc
+Patch2:         automake-require_file.patch
+Patch3:         automake-1.13.4-fix-primary-prefix-invalid-couples-test.patch
+Patch5:         0001-correct-parameter-parsing-in-test-driver-script.patch
+# PATCH-FIX-UPSTREAM: Fix testuite with GCC-14
+Patch6:         tests-Fix-type-defaults-error-in-link_cond.patch
+Patch7:         tests-avoid-implicit-function-declaration-in-depcomp.patch
+Patch8:         tests-don-t-try-to-prevent-flex-from-including-unist.patch
+Patch9:         tests-avoid-implicit-function-declarations.patch
 Patch100:       automake-suse-vendor.patch
 BuildRequires:  autoconf >= 2.69
 BuildRequires:  bison
@@ -85,13 +93,14 @@ definitions (with rules occasionally thrown in).  The generated
 %autopatch -p1

 %build
+sh bootstrap
 %configure --docdir=%{_docdir}/%{name}
-%make_build
+%make_build #%%{?_smp_mflags}

 %if "%{flavor}" == "testsuite"
 %check
 # Some architectures can't keep up the pace.
-%ifnarch %{arm}
+%ifnarch alpha %{arm}
 %make_build check
 %endif

@@ -106,6 +115,7 @@ ln -s %{_sysconfdir}/aclocal_dirlist %{buildroot}%{_datadir}/aclocal/dirlist
 install -m644 AUTHORS ChangeLog NEWS README THANKS %{buildroot}%{_docdir}/%{name}
 # info's dir file is not auto ignored on some systems
 rm -rf %{buildroot}%{_infodir}/dir
+#name == automake
 %endif

 %post
--- a/tests-Fix-type-defaults-error-in-link_cond.patch
+++ b/tests-Fix-type-defaults-error-in-link_cond.patch
@@ -0,0 +1,31 @@
+From 2a9908da9dbc075ee6c4e853cf3be0365b15f202 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20B=C3=A9rat?= <fberat@redhat.com>
+Date: Mon, 12 Dec 2022 08:05:53 +0100
+Subject: [PATCH] tests: Fix 'type defaults' error in link_cond due to main not
+ being properly declared
+
+This is related to an effort to prepare Automake for future GCC/Clang
+versions which set c99 as default standard to be used.
+Not properly declaring main as "int main(...)" is rejected since c99.
+
+* t/link_cond.sh: Add (void) to main definition.
+---
+ t/link_cond.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/t/link_cond.sh b/t/link_cond.sh
+index 45d0d7f40..889623131 100644
+--- a/t/link_cond.sh
+++ b/t/link_cond.sh
+@@ -52,7 +52,7 @@ $AUTOCONF
+ rm -f *.c++
+ cat > less.c <<'END'
+ /* Valid C but deliberately invalid C++ */
+-main ()
+int main (void)
+ {
+   int new = 0;
+   return new;
+-- 
+2.35.3
+
--- a/tests-avoid-implicit-function-declaration-in-depcomp.patch
+++ b/tests-avoid-implicit-function-declaration-in-depcomp.patch
@@ -0,0 +1,56 @@
+From 6c10512cce14d8537b33c2026aadbdbb1ff215c8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20B=C3=A9rat?= <fberat@redhat.com>
+Date: Mon, 28 Aug 2023 06:11:39 -0700
+Subject: [PATCH] tests: avoid implicit function declaration in t/depcomp.sh.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This patch is from https://bugs.gnu.org/60962.
+
+* t/ax/depcomp.sh: save and restore sub/subfoo.h, so its
+declaration will be seen, as required by C99.
+* THANKS: add Frédéric.
+---
+ THANKS          | 1 +
+ t/ax/depcomp.sh | 5 +++--
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/THANKS b/THANKS
+index 446c84e1b..1217d3c2a 100644
+--- a/THANKS
+++ b/THANKS
+@@ -138,6 +138,7 @@ Florian Briegel                 briegel@zone42.de
+ Francesco Salvestrini           salvestrini@gmail.com
+ François Pinard                 pinard@iro.umontreal.ca
+ Fred Fish                       fnf@ninemoons.com
+Frédéric Bérat                fberat@redhat.com
+ Ganesan Rajagopal               rganesan@novell.com
+ Garrett D'Amore                 garrett@qualcomm.com
+ Garth Corral                    garthc@inktomi.com
+diff --git a/t/ax/depcomp.sh b/t/ax/depcomp.sh
+index 7a3ac63a7..1d29673fe 100644
+--- a/t/ax/depcomp.sh
+++ b/t/ax/depcomp.sh
+@@ -243,6 +243,8 @@ cat > sub/subfoo.h <<'END'
+ #include <stdio.h>
+ extern int subfoo (void);
+ END
+# Save subfoo.h so we can restore it below; see #60962.
+cp sub/subfoo.h sub/subfoo.save
+ 
+ cat > src/baz.c <<'END'
+ #include "baz.h"
+@@ -399,8 +401,7 @@ do_test ()
+       && rewrite "$srcdir"/sub/subfoo.h echo 'choke me' \
+       && not $MAKE \
+       && delete "$srcdir"/sub/subfoo.h \
+-      && edit "$srcdir"/sub/subfoo.c -e 1d \
+-      && edit "$srcdir"/foo.h -e 2d \
+      && cp "$srcdir"/sub/subfoo.save "$srcdir"/sub/subfoo.h \
+       && make_ok \
+       || r='not ok'
+     result_ "$r" "$pfx dependency tracking works"
+-- 
+2.35.3
+
--- a/tests-avoid-implicit-function-declarations.patch
+++ b/tests-avoid-implicit-function-declarations.patch
@@ -0,0 +1,260 @@
+From 80714ea0aba62f025780f432abfbab2e66f6f801 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20B=C3=A9rat?= <fberat@redhat.com>
+Date: Tue, 29 Aug 2023 11:00:41 -0700
+Subject: [PATCH] tests: avoid implicit function declarations.
+
+This patch is from https://bugs.gnu.org/59993 (v2 part 2).
+
+* t/c-demo.sh: This patch is related to an effort to prepare
+Automake for future GCC/Clang versions which set c99 as default
+standard to be used.
+
+C99 requires that functions be properly declared before use.
+This is true for both user functions and standard functions,
+e.g., printf.
+
+* t/cond35.sh: Likewise.
+* t/dist-vs-built-sources.sh: Likewise.
+* t/lex-clean.sh: Likewise.
+* t/lex-multiple.sh: Likewise.
+* t/lex-nodist.sh: Likewise.
+* t/ltcond2.sh: Likewise.
+* t/ltconv.sh: Likewise.
+* t/subobj-clean-lt-pr10697.sh: Likewise.
+* t/subobj-clean-pr10697.sh: Likewise.
+* t/tags-pr12372.sh: Likewise.
+* t/yacc-basic.sh: Likewise.
+* t/yacc-clean.sh: Likewise.
+* t/yacc-nodist.sh: Likewise.
+
+This patch is from https://bugs.gnu.org/59993.
+---
+ t/c-demo.sh                  |  1 +
+ t/cond35.sh                  |  2 ++
+ t/dist-vs-built-sources.sh   |  1 +
+ t/lex-clean.sh               |  1 +
+ t/lex-multiple.sh            |  4 ++++
+ t/lex-nodist.sh              |  2 ++
+ t/ltcond2.sh                 |  2 ++
+ t/ltconv.sh                  |  6 ++++++
+ t/subobj-clean-lt-pr10697.sh | 10 +++++++++-
+ t/subobj-clean-pr10697.sh    | 10 +++++++++-
+ t/tags-pr12372.sh            |  3 ++-
+ t/yacc-basic.sh              |  1 +
+ t/yacc-clean.sh              |  4 ++++
+ t/yacc-nodist.sh             |  2 ++
+ 14 files changed, 46 insertions(+), 3 deletions(-)
+
+diff --git a/t/c-demo.sh b/t/c-demo.sh
+index 446551958..ee0d5c3ec 100644
+--- a/t/c-demo.sh
+++ b/t/c-demo.sh
+@@ -113,6 +113,7 @@ test -f build-aux/compile # We have per-target flags on C sources.
+ ./configure --enable-dependency-tracking
+ 
+ cat > src/main.c << 'END'
+#include <stdio.h>
+ #include "foo.h"
+ #include "bar.h"
+ int main (void)
+diff --git a/t/cond35.sh b/t/cond35.sh
+index 8b044644e..a00c9e280 100644
+--- a/t/cond35.sh
+++ b/t/cond35.sh
+@@ -71,6 +71,8 @@ END
+ 
+ cat > tparse.y << 'END'
+ %{
+extern int yylex(void);
+
+ void yyerror (const char *s) {}
+ %}
+ %token EOF
+diff --git a/t/dist-vs-built-sources.sh b/t/dist-vs-built-sources.sh
+index da8c8fb23..4c73d53b0 100644
+--- a/t/dist-vs-built-sources.sh
+++ b/t/dist-vs-built-sources.sh
+@@ -41,6 +41,7 @@ foo_SOURCES = foo.c
+ END
+ 
+ cat > foo.c << 'END'
+#include <stdio.h>
+ #include "h.h"
+ int main (void) { printf ("%s\n", F); return 0; }
+ END
+diff --git a/t/lex-clean.sh b/t/lex-clean.sh
+index 4668e97c7..a966b4b07 100644
+--- a/t/lex-clean.sh
+++ b/t/lex-clean.sh
+@@ -60,6 +60,7 @@ cat > lexer.l << 'END'
+ END
+ 
+ cat > main.c << 'END'
+extern int yylex (void);
+ int main (void)
+ {
+   return yylex ();
+diff --git a/t/lex-multiple.sh b/t/lex-multiple.sh
+index 6486a012f..32dd854b6 100644
+--- a/t/lex-multiple.sh
+++ b/t/lex-multiple.sh
+@@ -58,6 +58,10 @@ cat > main.c << 'END'
+ #include <stdlib.h>
+ #include <string.h>
+ 
+extern int yylex (void);
+extern int foolex (void);
+extern int bar_lex (void);
+
+ int main (int argc, char *argv[])
+ {
+   if (argc != 2)
+diff --git a/t/lex-nodist.sh b/t/lex-nodist.sh
+index d499aea7f..29f0cb0ec 100644
+--- a/t/lex-nodist.sh
+++ b/t/lex-nodist.sh
+@@ -61,6 +61,8 @@ CLEANFILES = $(nodist_prog_SOURCES)
+ END
+ 
+ cat > main.c << 'END'
+extern int yylex (void);
+
+ int main ()
+ {
+   return yylex ();
+diff --git a/t/ltcond2.sh b/t/ltcond2.sh
+index 000d0ad34..c9f7af1dc 100644
+--- a/t/ltcond2.sh
+++ b/t/ltcond2.sh
+@@ -73,6 +73,8 @@ void print (void)
+ END
+ 
+ cat > main.c <<'END'
+extern void print(void);
+
+ int main (void)
+ {
+   print();
+diff --git a/t/ltconv.sh b/t/ltconv.sh
+index 64e42949a..3c35f50e7 100644
+--- a/t/ltconv.sh
+++ b/t/ltconv.sh
+@@ -91,6 +91,12 @@ echo 'int sub22 () { return 22; }' > sub2/sub22/sub22.c
+ 
+ cat >test.c <<'EOF'
+ #include <stdio.h>
+
+extern int sub1 (void);
+extern int sub2 (void);
+extern int sub21 (void);
+extern int sub22 (void);
+
+ int main ()
+ {
+   if (1 != sub1 ())
+diff --git a/t/subobj-clean-lt-pr10697.sh b/t/subobj-clean-lt-pr10697.sh
+index 0b4bb10a7..94af0778b 100644
+--- a/t/subobj-clean-lt-pr10697.sh
+++ b/t/subobj-clean-lt-pr10697.sh
+@@ -83,7 +83,15 @@ libfoo_la_SOURCES = \
+ END
+ 
+ mkdir sub1 sub2
+-echo 'int libmain (void)' > main.c
+
+echo "/* Subobj clean: libtool case*/" > main.c
+for i in 1 2; do
+  for j in a b c d e f; do
+    echo "extern void $j$i (void);" >> main.c
+  done
+done
+
+echo 'int libmain (void)' >> main.c
+ echo '{' >> main.c
+ for i in 1 2; do
+   for j in a b c d e f; do
+diff --git a/t/subobj-clean-pr10697.sh b/t/subobj-clean-pr10697.sh
+index 591684bc8..360716ec3 100644
+--- a/t/subobj-clean-pr10697.sh
+++ b/t/subobj-clean-pr10697.sh
+@@ -81,7 +81,15 @@ foo_SOURCES = \
+ END
+ 
+ mkdir sub1 sub2
+-echo 'int main (void)' > main.c
+
+echo "/* Subobj clean: generic case*/" > main.c
+for i in 1 2; do
+  for j in a b c d e f; do
+    echo "extern void $j$i (void);" >> main.c
+  done
+done
+
+echo 'int main (void)' >> main.c
+ echo '{' >> main.c
+ for i in 1 2; do
+   for j in a b c d e f; do
+diff --git a/t/tags-pr12372.sh b/t/tags-pr12372.sh
+index 7e86f7214..19ac07da4 100644
+--- a/t/tags-pr12372.sh
+++ b/t/tags-pr12372.sh
+@@ -53,7 +53,8 @@ noinst_PROGRAMS = zap
+ zap_SOURCES = zardoz.pc
+ END
+ 
+-echo 'int main(void) [ return bar(1); ]' > foo-main.pc
+echo 'extern int bar(int);' > foo-main.pc
+echo 'int main(void) [ return bar(1); ]' >> foo-main.pc
+ echo 'int bar(int x) { return !x; }' > barbar.c
+ echo 'int m@in(void) { return 0; }' > sub/zardoz.pc
+ 
+diff --git a/t/yacc-basic.sh b/t/yacc-basic.sh
+index 51ee5f6a3..be578e14a 100644
+--- a/t/yacc-basic.sh
+++ b/t/yacc-basic.sh
+@@ -51,6 +51,7 @@ a : 'a' { exit(0); };
+ END
+ 
+ cat > foo.c << 'END'
+extern int yyparse(void);
+ int main () { yyparse (); return 1; }
+ END
+ 
+diff --git a/t/yacc-clean.sh b/t/yacc-clean.sh
+index d0f793843..da2e3d5b2 100644
+--- a/t/yacc-clean.sh
+++ b/t/yacc-clean.sh
+@@ -67,6 +67,8 @@ END
+ 
+ cat > sub1/parse.y << 'END'
+ %{
+#include <stdio.h>
+
+ int yylex () { return (getchar ()); }
+ void yyerror (const char *s) {}
+ %}
+@@ -76,6 +78,8 @@ END
+ cp sub1/parse.y sub2/parse.y
+ 
+ cat > sub1/main.c << 'END'
+extern int yyparse(void);
+
+ int main ()
+ {
+   return yyparse ();
+diff --git a/t/yacc-nodist.sh b/t/yacc-nodist.sh
+index 8e5338e94..e3b02b3fa 100644
+--- a/t/yacc-nodist.sh
+++ b/t/yacc-nodist.sh
+@@ -80,6 +80,8 @@ BUILT_SOURCES = parse.h
+ END
+ 
+ cat > sub1/main.c << 'END'
+extern int yyparse(void);
+
+ int main ()
+ {
+   return yyparse ();
+-- 
+2.35.3
+
--- a/tests-don-t-try-to-prevent-flex-from-including-unist.patch
+++ b/tests-don-t-try-to-prevent-flex-from-including-unist.patch