testing/automake
SHA256
3
0
Fork 0
forked from pool/automake
Code Pull Requests Activity

Accepting request 1187534 from devel:tools:building

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1187534
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/automake?expand=0&rev=61
This commit is contained in:
Ana Guerrero 2024-07-18 17:14:58 +00:00 committed by Git OBS Bridge
commit 7e1bfee51e
14 changed files with 133 additions and 1651 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
0001-correct-parameter-parsing-in-test-driver-script.patch
View File

@ -14,9 +14,9 @@ Index: automake-1.16.3/lib/test-driver
=================================================================== ===================================================================
--- automake-1.16.3.orig/lib/test-driver --- automake-1.16.3.orig/lib/test-driver
+++ automake-1.16.3/lib/test-driver +++ automake-1.16.3/lib/test-driver
@@ -58,21 +58,26 @@ trs_file= # Where to save the metadata @@ -64,22 +64,27 @@ expect_failure=no
expect_failure=no
color_tests=no color_tests=no
collect_skipped_logs=yes
enable_hard_errors=yes enable_hard_errors=yes
-while test $# -gt 0; do -while test $# -gt 0; do
- case $1 in - case $1 in
@ -29,11 +29,12 @@ Index: automake-1.16.3/lib/test-driver
+ fi + fi
+ case $arg in + case $arg in
--help) print_usage; exit $?;; --help) print_usage; exit $?;;
--version) echo "test-driver $scriptversion"; exit $?;; --version) echo "test-driver (GNU Automake) $scriptversion"; exit $?;;
- --test-name) test_name=$2; shift;; - --test-name) test_name=$2; shift;;
- --log-file) log_file=$2; shift;; - --log-file) log_file=$2; shift;;
- --trs-file) trs_file=$2; shift;; - --trs-file) trs_file=$2; shift;;
- --color-tests) color_tests=$2; shift;; - --color-tests) color_tests=$2; shift;;
- --collect-skipped-logs) collect_skipped_logs=$2; shift;;
- --expect-failure) expect_failure=$2; shift;; - --expect-failure) expect_failure=$2; shift;;
- --enable-hard-errors) enable_hard_errors=$2; shift;; - --enable-hard-errors) enable_hard_errors=$2; shift;;
- --) shift; break;; - --) shift; break;;
@ -41,6 +42,7 @@ Index: automake-1.16.3/lib/test-driver
+ --log-file) log_file=$val;; + --log-file) log_file=$val;;
+ --trs-file) trs_file=$val;; + --trs-file) trs_file=$val;;
+ --color-tests) color_tests=$val;; + --color-tests) color_tests=$val;;
+ --collect-skipped-logs) collect_skipped_logs=$val;;
+ --expect-failure) expect_failure=$val;; + --expect-failure) expect_failure=$val;;
+ --enable-hard-errors) enable_hard_errors=$val;; + --enable-hard-errors) enable_hard_errors=$val;;
+ --) break;; + --) break;;

26
automake-1.13.4-fix-primary-prefix-invalid-couples-test.patch
View File

@ -1,26 +0,0 @@
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

BIN
automake-1.16.5.tar.xz (Stored with Git LFS)
View File

Binary file not shown.

16
automake-1.16.5.tar.xz.sig
View File

@ -1,16 +0,0 @@
-----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-----

BIN
automake-1.17.tar.xz (Stored with Git LFS) Normal file
View File

Binary file not shown.

16
automake-1.17.tar.xz.sig Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEFV0/xQDINEhtHupnf9n8ywAL7u4FAmaQvW4ACgkQf9n8ywAL
7u7+WA/9EezHCJlBRweh9SWSA9GFKWpZ0UCGWHOi98bUCglxnuiSCfK5hsV5iw2Z
JRvKujnP/0fKFjkHoQF0HLYGgSEKp9NOH5efurqd1XexGhpgtt9vsHLxukOWFnp7
eoWOUw0q2OYat9ENunxfi5w06mdOL2QS6u6IcimYQO//XWb38lqxTs5SY617YbIk
dzhsE8E9Tk137NSsJPtopIDStMahz6B29wPgWBS4BiPwzyLMeANYudmt1epQjW/d
xkW131Pe/pDwuRs89eVMDXBVroVv+kv1Dqzm9byXOQFLsjSRLV6Ej83narg+wlUf
h4UFXIBHoyHh7k0zXIpPXje9td6hCankmEFnn52yOR1h9fFQ1gse4XGqan2AR/LK
qlWVDbfzeplUc+t6jd4WKA+q2NI3XzUk020SiMbGmsmE1EKCOfTaMGDHdOK/bdEy
DhN5rpqsK4fP5G1sJ0EXwNcyVTU9Sv91Lg7pohIv3W0JkyqLqT6D53Owc9FD05wI
Oit5V64XFdYZ989L5UXZbe+AD3FPnZoOBpSqSXpA1Ifi3BZrGDyiK5uaUgDKnc44
BQvNeUGjCpRu4fNPPhSfuqaKjqUCm4PKwymtGA8ZC1QSVmTNdyJfn1V5WqWk2dLe
EpoPY9Yz0UtOvIcbwm6YqzzdX8Rbgy6Io24ooxDFckqupx232Ng=
=Agm1
-----END PGP SIGNATURE-----

24
automake-require_file.patch
View File

@ -1,24 +0,0 @@
---
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;
}

123
automake-suse-vendor.patch
View File

@ -1,8 +1,8 @@
Index: automake-1.16.5/lib/config.guess diff --git a/lib/config.guess b/lib/config.guess
=================================================================== index f6d217a49..67f9aa0fb 100755
--- automake-1.16.5.orig/lib/config.guess --- a/lib/config.guess
+++ automake-1.16.5/lib/config.guess +++ b/lib/config.guess
@@ -188,6 +188,17 @@ Linux|GNU|GNU/*) @@ -194,6 +194,17 @@ Linux|GNU|GNU/*)
;; ;;
esac esac
@ -20,7 +20,7 @@ Index: automake-1.16.5/lib/config.guess
# Note: order is significant - the case branches are not exclusive. # Note: order is significant - the case branches are not exclusive.
case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
@@ -269,46 +280,46 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME @@ -275,46 +286,46 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
;; ;;
*:Bitrig:*:*) *:Bitrig:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
@ -80,7 +80,7 @@ Index: automake-1.16.5/lib/config.guess
;; ;;
mips:OSF1:*.*) mips:OSF1:*.*)
GUESS=mips-dec-osf1 GUESS=mips-dec-osf1
@@ -370,13 +381,13 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME @@ -376,13 +387,13 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
GUESS=$UNAME_MACHINE-dec-osf$OSF_REL GUESS=$UNAME_MACHINE-dec-osf$OSF_REL
;; ;;
Amiga*:UNIX_System_V:4.0:*) Amiga*:UNIX_System_V:4.0:*)
@ -97,7 +97,7 @@ Index: automake-1.16.5/lib/config.guess
;; ;;
*:OS/390:*:*) *:OS/390:*:*)
GUESS=i370-ibm-openedition GUESS=i370-ibm-openedition
@@ -391,7 +402,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME @@ -397,7 +408,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
GUESS=arm-acorn-riscix$UNAME_RELEASE GUESS=arm-acorn-riscix$UNAME_RELEASE
;; ;;
arm*:riscos:*:*|arm*:RISCOS:*:*) arm*:riscos:*:*|arm*:RISCOS:*:*)
@ -106,7 +106,7 @@ Index: automake-1.16.5/lib/config.guess
;; ;;
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
GUESS=hppa1.1-hitachi-hiuxmpp GUESS=hppa1.1-hitachi-hiuxmpp
@@ -505,7 +516,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME @@ -511,7 +522,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
GUESS=m68k-hades-mint$UNAME_RELEASE GUESS=m68k-hades-mint$UNAME_RELEASE
;; ;;
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
@ -115,7 +115,7 @@ Index: automake-1.16.5/lib/config.guess
;; ;;
m68k:machten:*:*) m68k:machten:*:*)
GUESS=m68k-apple-machten$UNAME_RELEASE GUESS=m68k-apple-machten$UNAME_RELEASE
@@ -818,9 +829,9 @@ EOF @@ -824,9 +835,9 @@ EOF
;; ;;
i*86:OSF1:*:*) i*86:OSF1:*:*)
if test -x /usr/sbin/sysversion ; then if test -x /usr/sbin/sysversion ; then
@ -127,7 +127,7 @@ Index: automake-1.16.5/lib/config.guess
fi fi
;; ;;
parisc*:Lites*:*:*) parisc*:Lites*:*:*)
@@ -885,10 +896,10 @@ EOF @@ -891,10 +902,10 @@ EOF
GUESS=$UNAME_MACHINE-pc-bsdi$UNAME_RELEASE GUESS=$UNAME_MACHINE-pc-bsdi$UNAME_RELEASE
;; ;;
sparc*:BSD/OS:*:*) sparc*:BSD/OS:*:*)
@ -140,7 +140,7 @@ Index: automake-1.16.5/lib/config.guess
;; ;;
arm:FreeBSD:*:*) arm:FreeBSD:*:*)
UNAME_PROCESSOR=`uname -p` UNAME_PROCESSOR=`uname -p`
@@ -897,10 +908,10 @@ EOF @@ -903,10 +914,10 @@ EOF
| grep -q __ARM_PCS_VFP | grep -q __ARM_PCS_VFP
then then
FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
@ -153,7 +153,7 @@ Index: automake-1.16.5/lib/config.guess
fi fi
;; ;;
*:FreeBSD:*:*) *:FreeBSD:*:*)
@@ -912,7 +923,7 @@ EOF @@ -918,7 +929,7 @@ EOF
UNAME_PROCESSOR=i586 ;; UNAME_PROCESSOR=i586 ;;
esac esac
FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
@ -162,7 +162,7 @@ Index: automake-1.16.5/lib/config.guess
;; ;;
i*:CYGWIN*:*) i*:CYGWIN*:*)
GUESS=$UNAME_MACHINE-pc-cygwin GUESS=$UNAME_MACHINE-pc-cygwin
@@ -935,10 +946,10 @@ EOF @@ -944,10 +955,10 @@ EOF
GUESS=i586-pc-interix$UNAME_RELEASE GUESS=i586-pc-interix$UNAME_RELEASE
;; ;;
authenticamd | genuineintel | EM64T) authenticamd | genuineintel | EM64T)
@ -175,7 +175,7 @@ Index: automake-1.16.5/lib/config.guess
;; ;;
esac ;; esac ;;
i*:UWIN*:*) i*:UWIN*:*)
@@ -949,29 +960,29 @@ EOF @@ -958,7 +969,7 @@ EOF
;; ;;
prep*:SunOS:5.*:*) prep*:SunOS:5.*:*)
SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
@ -184,25 +184,25 @@ Index: automake-1.16.5/lib/config.guess
;; ;;
*:GNU:*:*) *:GNU:*:*)
# the GNU system # the GNU system
GNU_ARCH=`echo "$UNAME_MACHINE" | sed -e 's,[-/].*$,,'` @@ -976,10 +987,10 @@ EOF
GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's,/.*$,,'` GUESS="$UNAME_MACHINE-pc-managarm-mlibc"
- GUESS=$GNU_ARCH-unknown-$LIBC$GNU_REL
+ GUESS=$GNU_ARCH-${VENDOR}-$LIBC$GNU_REL
;; ;;
*:GNU/*:*:*) *:[Mm]anagarm:*:*)
# other systems with GNU libc and userland - GUESS="$UNAME_MACHINE-unknown-managarm-mlibc"
GNU_SYS=`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"` + GUESS="$UNAME_MACHINE-${VENDOR}-managarm-mlibc"
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:*:*) *:Minix:*:*)
- GUESS=$UNAME_MACHINE-unknown-minix - GUESS=$UNAME_MACHINE-unknown-minix
+ GUESS=$UNAME_MACHINE-${VENDOR}-minix + GUESS=$UNAME_MACHINE-${VENDOR}-minix
;; ;;
aarch64:Linux:*:*) aarch64:Linux:*:*)
- GUESS=$UNAME_MACHINE-unknown-linux-$LIBC set_cc_for_build
+ GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC @@ -1002,11 +1013,11 @@ EOF
eabi | eabihf) CPU=armv8l; LIBCABI=$LIBC$ABI ;;
esac
fi
- GUESS=$CPU-unknown-linux-$LIBCABI
+ GUESS=$CPU-${VENDOR}-linux-$LIBCABI
;; ;;
aarch64_be:Linux:*:*) aarch64_be:Linux:*:*)
UNAME_MACHINE=aarch64_be UNAME_MACHINE=aarch64_be
@ -211,7 +211,7 @@ Index: automake-1.16.5/lib/config.guess
;; ;;
alpha:Linux:*:*) alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in
@@ -985,29 +996,29 @@ EOF @@ -1020,29 +1031,29 @@ EOF
esac esac
objdump --private-headers /bin/sh | grep -q ld.so.1 objdump --private-headers /bin/sh | grep -q ld.so.1
if test "$?" = 0 ; then LIBC=gnulibc1 ; fi if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
@ -247,7 +247,7 @@ Index: automake-1.16.5/lib/config.guess
;; ;;
cris:Linux:*:*) cris:Linux:*:*)
GUESS=$UNAME_MACHINE-axis-linux-$LIBC GUESS=$UNAME_MACHINE-axis-linux-$LIBC
@@ -1016,31 +1027,31 @@ EOF @@ -1051,40 +1062,40 @@ EOF
GUESS=$UNAME_MACHINE-axis-linux-$LIBC GUESS=$UNAME_MACHINE-axis-linux-$LIBC
;; ;;
e2k:Linux:*:*) e2k:Linux:*:*)
@ -263,8 +263,7 @@ Index: automake-1.16.5/lib/config.guess
+ GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC + GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
;; ;;
i*86:Linux:*:*) i*86:Linux:*:*)
- GUESS=$UNAME_MACHINE-pc-linux-$LIBC GUESS=$UNAME_MACHINE-pc-linux-$LIBC
+ GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
;; ;;
ia64:Linux:*:*) ia64:Linux:*:*)
- GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
@ -274,7 +273,19 @@ Index: automake-1.16.5/lib/config.guess
- GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC + GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
;; ;;
loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*) 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:*:*)
- GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC + GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
;; ;;
@ -288,12 +299,8 @@ Index: automake-1.16.5/lib/config.guess
;; ;;
mips:Linux:*:* | mips64:Linux:*:*) mips:Linux:*:* | mips64:Linux:*:*)
set_cc_for_build set_cc_for_build
@@ -1088,60 +1099,60 @@ EOF @@ -1135,57 +1146,57 @@ EOF
EOF test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; }
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:*:*) mips64el:Linux:*:*)
- GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
@ -367,12 +374,8 @@ Index: automake-1.16.5/lib/config.guess
;; ;;
vax:Linux:*:*) vax:Linux:*:*)
GUESS=$UNAME_MACHINE-dec-linux-$LIBC GUESS=$UNAME_MACHINE-dec-linux-$LIBC
@@ -1157,10 +1168,10 @@ EOF @@ -1215,7 +1226,7 @@ EOF
LIBCABI=${LIBC}x32 GUESS=$CPU-pc-linux-$LIBCABI
fi
fi
- GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI
+ GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBCABI
;; ;;
xtensa*:Linux:*:*) xtensa*:Linux:*:*)
- GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
@ -380,7 +383,7 @@ Index: automake-1.16.5/lib/config.guess
;; ;;
i*86:DYNIX/ptx:4*:*) i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1182,16 +1193,16 @@ EOF @@ -1237,16 +1248,16 @@ EOF
GUESS=$UNAME_MACHINE-pc-os2-emx GUESS=$UNAME_MACHINE-pc-os2-emx
;; ;;
i*86:XTS-300:*:STOP) i*86:XTS-300:*:STOP)
@ -400,7 +403,7 @@ Index: automake-1.16.5/lib/config.guess
;; ;;
i*86:*DOS:*:*) i*86:*DOS:*:*)
GUESS=$UNAME_MACHINE-pc-msdosdjgpp GUESS=$UNAME_MACHINE-pc-msdosdjgpp
@@ -1211,7 +1222,7 @@ EOF @@ -1266,7 +1277,7 @@ EOF
*Pentium) UNAME_MACHINE=i586 ;; *Pentium) UNAME_MACHINE=i586 ;;
*Pent*|*Celeron) UNAME_MACHINE=i686 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
esac esac
@ -409,7 +412,7 @@ Index: automake-1.16.5/lib/config.guess
;; ;;
i*86:*:3.2:*) i*86:*:3.2:*)
if test -f /usr/options/cb.name; then if test -f /usr/options/cb.name; then
@@ -1250,7 +1261,7 @@ EOF @@ -1305,7 +1316,7 @@ EOF
if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
GUESS=i860-stardent-sysv$UNAME_RELEASE # Stardent Vistra i860-SVR4 GUESS=i860-stardent-sysv$UNAME_RELEASE # Stardent Vistra i860-SVR4
else # Add other i860-SVR4 vendors below as they are discovered. else # Add other i860-SVR4 vendors below as they are discovered.
@ -418,7 +421,7 @@ Index: automake-1.16.5/lib/config.guess
fi fi
;; ;;
mini*:CTIX:SYS*5:*) mini*:CTIX:SYS*5:*)
@@ -1287,19 +1298,19 @@ EOF @@ -1342,19 +1353,19 @@ EOF
/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
&& { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
@ -442,7 +445,7 @@ Index: automake-1.16.5/lib/config.guess
;; ;;
SM[BE]S:UNIX_SV:*:*) SM[BE]S:UNIX_SV:*:*)
GUESS=mips-dde-sysv$UNAME_RELEASE GUESS=mips-dde-sysv$UNAME_RELEASE
@@ -1349,7 +1360,7 @@ EOF @@ -1404,7 +1415,7 @@ EOF
if test -d /usr/nec; then if test -d /usr/nec; then
GUESS=mips-nec-sysv$UNAME_RELEASE GUESS=mips-nec-sysv$UNAME_RELEASE
else else
@ -451,16 +454,16 @@ Index: automake-1.16.5/lib/config.guess
fi fi
;; ;;
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
@@ -1365,7 +1376,7 @@ EOF @@ -1423,7 +1434,7 @@ EOF
GUESS=i586-pc-haiku GUESS=powerpc-apple-haiku
;; ;;
x86_64:Haiku:*:*) *:Haiku:*:*) # Haiku modern gcc (not bound by BeOS compat)
- GUESS=x86_64-unknown-haiku - GUESS=$UNAME_MACHINE-unknown-haiku
+ GUESS=x86_64-${VENDOR}-haiku + GUESS=$UNAME_MACHINE-${VENDOR}-haiku
;; ;;
SX-4:SUPER-UX:*:*) SX-4:SUPER-UX:*:*)
GUESS=sx4-nec-superux$UNAME_RELEASE GUESS=sx4-nec-superux$UNAME_RELEASE
@@ -1478,13 +1489,13 @@ EOF @@ -1536,13 +1547,13 @@ EOF
elif test "x${cputype-}" != x; then elif test "x${cputype-}" != x; then
UNAME_MACHINE=$cputype UNAME_MACHINE=$cputype
fi fi
@ -477,7 +480,7 @@ Index: automake-1.16.5/lib/config.guess
;; ;;
KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
GUESS=pdp10-dec-tops20 GUESS=pdp10-dec-tops20
@@ -1493,17 +1504,17 @@ EOF @@ -1551,17 +1562,17 @@ EOF
GUESS=pdp10-xkl-tops20 GUESS=pdp10-xkl-tops20
;; ;;
*:TOPS-20:*:*) *:TOPS-20:*:*)
@ -498,8 +501,8 @@ Index: automake-1.16.5/lib/config.guess
;; ;;
*:*VMS:*:*) *:*VMS:*:*)
UNAME_MACHINE=`(uname -p) 2>/dev/null` UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -1523,16 +1534,16 @@ EOF @@ -1584,19 +1595,19 @@ EOF
GUESS=$UNAME_MACHINE-pc-rdos GUESS=$UNAME_MACHINE-pc-fiwix
;; ;;
*:AROS:*:*) *:AROS:*:*)
- GUESS=$UNAME_MACHINE-unknown-aros - GUESS=$UNAME_MACHINE-unknown-aros
@ -517,5 +520,9 @@ Index: automake-1.16.5/lib/config.guess
- GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE - GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE
+ GUESS=$UNAME_MACHINE-${VENDOR}-unleashed$UNAME_RELEASE + GUESS=$UNAME_MACHINE-${VENDOR}-unleashed$UNAME_RELEASE
;; ;;
*:Ironclad:*:*)
- GUESS=$UNAME_MACHINE-unknown-ironclad
+ GUESS=$UNAME_MACHINE-${VENDOR}-ironclad
;;
esac esac

43
automake.changes
View File

@ -1,3 +1,46 @@
-------------------------------------------------------------------
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> Tue May 7 15:46:57 UTC 2024 - Valentin Lefebvre <valentin.lefebvre@suse.com>

9
automake.spec
View File

@ -26,7 +26,7 @@
%define nsuffix %{nil} %define nsuffix %{nil}
%endif %endif
Name: automake%{nsuffix} Name: automake%{nsuffix}
Version: 1.16.5 Version: 1.17
Release: 0 Release: 0
Summary: A Program for Automatically Generating GNU-Style Makefile.in Files Summary: A Program for Automatically Generating GNU-Style Makefile.in Files
# docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT # docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT
@ -38,14 +38,7 @@ 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 # taken from https://savannah.gnu.org/project/release-gpgkeys.php?group=automake&download=1
Source2: automake.keyring Source2: automake.keyring
Source3: automake-rpmlintrc 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 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 Patch100: automake-suse-vendor.patch
BuildRequires: autoconf >= 2.69 BuildRequires: autoconf >= 2.69
BuildRequires: bison BuildRequires: bison

31
tests-Fix-type-defaults-error-in-link_cond.patch
View File

@ -1,31 +0,0 @@
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

56
tests-avoid-implicit-function-declaration-in-depcomp.patch
View File

@ -1,56 +0,0 @@
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

260
tests-avoid-implicit-function-declarations.patch
View File

@ -1,260 +0,0 @@
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

1166
tests-don-t-try-to-prevent-flex-from-including-unist.patch
View File

File diff suppressed because it is too large Load Diff