9 changed files with 2285 additions and 1502 deletions
--- a/.automake.metadata
+++ b/.automake.metadata
@ -1 +1 @@
-1012bc79956013d53da0890f8493388a6cb20831 SOURCES/automake-1.16.1.tar.xz
+f87fd355c6142e4e87d7a69702697f3a30c922d8 SOURCES/automake-1.16.2.tar.xz
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/automake-1.16.1.tar.xz
+SOURCES/automake-1.16.2.tar.xz
--- a/SOURCES/0001-python-add-3.10-3.15-to-the-version-search-list.patch
+++ b/SOURCES/0001-python-add-3.10-3.15-to-the-version-search-list.patch
@ -13,15 +13,13 @@ extra versions here since this is the fallback logic when the main

 * m4/python.m4: Add python3.10 - python3.15.
 * NEWS: Mention new Python versions.
-
-Conflicts:
- - NEWS (removed)
 ---
+ NEWS         | 3 +++
 m4/python.m4 | 1 +
- 1 file changed, 1 insertion(+)
+ 2 files changed, 4 insertions(+)

 diff --git a/m4/python.m4 b/m4/python.m4
-index 4a007fd75..4bf72286a 100644
+index f5b5371c6..6653e4d89 100644
 --- a/m4/python.m4
 +++ b/m4/python.m4
@@ -38,6 +38,7 @@ AC_DEFUN([AM_PATH_PYTHON],
@ -33,5 +31,5 @@ index 4a007fd75..4bf72286a 100644
  python3.2 python3.1 python3.0 dnl
  python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 dnl
 -- 
-2.41.0
+2.40.1

--- a/SOURCES/0001-tests-use-testsuite-directory-in-DejaGnu-tests.patch
+++ b/SOURCES/0001-tests-use-testsuite-directory-in-DejaGnu-tests.patch
@ -0,0 +1,799 @@
+From 7e50be6bce6b662d27e3049170282aaddaaee791 Mon Sep 17 00:00:00 2001
+From: Jacob Bachmeyer <jcb@gnu.org>
+Date: Wed, 14 Jul 2021 20:21:49 -0700
+Subject: [PATCH] tests: use testsuite/ directory in DejaGnu tests
+
+Patch posted:
+https://lists.gnu.org/archive/html/automake-patches/2021-07/msg00009.html
+
+* t/check12.sh: Consistently use the directory name, testsuite/,
+for all DejaGnu tests, and always use recursive make to run
+DejaGnu, for backward and forward compatibility.
+* t/dejagnu3.sh: Likewise.
+* t/dejagnu4.sh: Likewise.
+* t/dejagnu5.sh: Likewise.
+* t/dejagnu6.sh: Likewise.
+* t/dejagnu7.sh: Likewise.
+* t/dejagnu-absolute-builddir.sh: Likewise.
+* t/dejagnu-relative-srcdir.sh: Likewise.
+* t/dejagnu-siteexp-extend.sh: Likewise.
+* t/dejagnu-siteexp-useredit.sh: Likewise.
+* NEWS: mention this.
+* THANKS: new contributor.
+---
+ NEWS                           |   3 +
+ THANKS                         |   1 +
+ t/check12.sh                   |  62 +++++++++++---------
+ t/dejagnu-absolute-builddir.sh |  19 +++++--
+ t/dejagnu-relative-srcdir.sh   |  32 +++++++----
+ t/dejagnu-siteexp-extend.sh    | 101 ++++++++++++++++++---------------
+ t/dejagnu-siteexp-useredit.sh  |  31 ++++++----
+ t/dejagnu3.sh                  |  20 +++++--
+ t/dejagnu4.sh                  |  39 ++++++++-----
+ t/dejagnu5.sh                  |  20 +++++--
+ t/dejagnu6.sh                  |  19 +++++--
+ t/dejagnu7.sh                  |  19 +++++--
+ 12 files changed, 222 insertions(+), 144 deletions(-)
+
+diff --git a/t/check12.sh b/t/check12.sh
+index 31cb4f711..e1621840e 100644
+--- a/t/check12.sh
+++ b/t/check12.sh
+@@ -22,6 +22,7 @@ required=runtest
+ . test-init.sh
+ 
+ cat >> configure.ac << 'END'
+AC_CONFIG_FILES([testsuite/Makefile])
+ AC_OUTPUT
+ END
+ 
+@@ -56,12 +57,17 @@ B_EXIT_STATUS=0; export B_EXIT_STATUS
+ ## DejaGnu tests.
+ 
+ cat >> Makefile.am << 'END'
+-AUTOMAKE_OPTIONS += dejagnu
+SUBDIRS = testsuite
+EXTRA_DIST += hammer spanner
+END
+
+mkdir testsuite
+
+cat >> testsuite/Makefile.am << 'END'
+AUTOMAKE_OPTIONS = dejagnu
+ DEJATOOL = hammer spanner
+-AM_RUNTESTFLAGS = HAMMER=$(srcdir)/hammer SPANNER=$(srcdir)/spanner
+-EXTRA_DIST += $(DEJATOOL)
+-EXTRA_DIST += hammer.test/hammer.exp
+-EXTRA_DIST += spanner.test/spanner.exp
+AM_RUNTESTFLAGS = HAMMER=$(top_srcdir)/hammer SPANNER=$(top_srcdir)/spanner
+EXTRA_DIST = hammer.test/hammer.exp spanner.test/spanner.exp
+ END
+ 
+ cat > hammer << 'END'
+@@ -77,9 +83,9 @@ echo "I'm a right spanner!"
+ END
+ chmod +x hammer spanner
+ 
+-mkdir hammer.test spanner.test
+mkdir testsuite/hammer.test testsuite/spanner.test
+ 
+-cat > hammer.test/hammer.exp << 'END'
+cat > testsuite/hammer.test/hammer.exp << 'END'
+ set test test_hammer
+ spawn $HAMMER
+ expect {
+@@ -88,7 +94,7 @@ expect {
+ }
+ END
+ 
+-cat > spanner.test/spanner.exp << 'END'
+cat > testsuite/spanner.test/spanner.exp << 'END'
+ set test test_spanner
+ spawn $SPANNER
+ expect {
+@@ -133,10 +139,10 @@ for vpath in : false; do
+   $srcdir/configure
+ 
+   $MAKE check
+-  test -f hammer.log
+-  test -f hammer.sum
+-  test -f spanner.log
+-  test -f spanner.sum
+  test -f testsuite/hammer.log
+  test -f testsuite/hammer.sum
+  test -f testsuite/spanner.log
+  test -f testsuite/spanner.sum
+   if test x"$am_serial_tests" != x"yes"; then
+     test -f test-suite.log
+     test -f a.log
+@@ -147,10 +153,10 @@ for vpath in : false; do
+   cp -f config.status config-status.sav
+ 
+   $MAKE distclean
+-  test ! -e hammer.log
+-  test ! -e hammer.sum
+-  test ! -e spanner.log
+-  test ! -e spanner.sum
+  test ! -e testsuite/hammer.log
+  test ! -e testsuite/hammer.sum
+  test ! -e testsuite/spanner.log
+  test ! -e testsuite/spanner.sum
+   test ! -e test-suite.log
+   test ! -e a.log
+   test ! -e b.log
+@@ -160,12 +166,12 @@ for vpath in : false; do
+   ./config.status
+ 
+   NAIL=screw $MAKE check && exit 1
+-  test -f hammer.log
+-  test -f hammer.sum
+-  test -f spanner.log
+-  test -f spanner.sum
+-  grep 'FAIL: test_hammer' hammer.sum
+-  grep 'FAIL:' spanner.sum && exit 1
+  test -f testsuite/hammer.log
+  test -f testsuite/hammer.sum
+  test -f testsuite/spanner.log
+  test -f testsuite/spanner.sum
+  grep 'FAIL: test_hammer' testsuite/hammer.sum
+  grep 'FAIL:' testsuite/spanner.sum && exit 1
+ 
+   B_EXIT_STATUS=1 $MAKE check && exit 1
+   if test x"$am_serial_tests" != x"yes"; then
+@@ -185,12 +191,12 @@ for vpath in : false; do
+ 
+   # Do not trust the exit status of 'make -k'.
+   NAIL=screw B_EXIT_STATUS=23 CHECKLOCAL_EXIT_STATUS=1 $MAKE -k check || :
+-  test -f hammer.log
+-  test -f hammer.sum
+-  test -f spanner.log
+-  test -f spanner.sum
+-  grep 'FAIL: test_hammer' hammer.sum
+-  grep 'FAIL:' spanner.sum && exit 1
+  test -f testsuite/hammer.log
+  test -f testsuite/hammer.sum
+  test -f testsuite/spanner.log
+  test -f testsuite/spanner.sum
+  grep 'FAIL: test_hammer' testsuite/hammer.sum
+  grep 'FAIL:' testsuite/spanner.sum && exit 1
+   if test x"$am_serial_tests" != x"yes"; then
+     cat test-suite.log
+     cat a.log
+diff --git a/t/dejagnu-absolute-builddir.sh b/t/dejagnu-absolute-builddir.sh
+index ac938a44c..0bddb8e3e 100644
+--- a/t/dejagnu-absolute-builddir.sh
+++ b/t/dejagnu-absolute-builddir.sh
+@@ -21,18 +21,25 @@ required=runtest
+ . test-init.sh
+ 
+ cat >> configure.ac << 'END'
+AC_CONFIG_FILES([testsuite/Makefile])
+ AC_OUTPUT
+ END
+ 
+ cat > Makefile.am << 'END'
+SUBDIRS = testsuite
+END
+
+mkdir testsuite
+
+cat > testsuite/Makefile.am << 'END'
+ AUTOMAKE_OPTIONS = dejagnu
+ DEJATOOL = tcl env
+ EXTRA_DIST = tcl.test/tcl.exp
+ END
+ 
+-mkdir tcl.test
+mkdir testsuite/tcl.test
+ 
+-cat > tcl.test/tcl.exp << 'END'
+cat > testsuite/tcl.test/tcl.exp << 'END'
+ send_user "tcl_objdir: $objdir\n"
+ if { [ regexp "^/" $objdir ] } {
+     pass "test_tcl_objdir"
+@@ -50,10 +57,10 @@ $AUTOMAKE --add-missing
+ $MAKE check
+ 
+ # Sanity check: all tests have run.
+-test -f env.log
+-test -f env.sum
+-test -f tcl.log
+-test -f tcl.sum
+test -f testsuite/env.log
+test -f testsuite/env.sum
+test -f testsuite/tcl.log
+test -f testsuite/tcl.sum
+ 
+ $MAKE distcheck
+ 
+diff --git a/t/dejagnu-relative-srcdir.sh b/t/dejagnu-relative-srcdir.sh
+index 1225a1941..6bab70b12 100644
+--- a/t/dejagnu-relative-srcdir.sh
+++ b/t/dejagnu-relative-srcdir.sh
+@@ -21,44 +21,52 @@ required=runtest
+ . test-init.sh
+ 
+ cat >> configure.ac << 'END'
+AC_CONFIG_FILES([testsuite/Makefile])
+ AC_OUTPUT
+ END
+ 
+ cat > Makefile.am << 'END'
+SUBDIRS = testsuite
+END
+
+mkdir testsuite
+
+cat > testsuite/Makefile.am << 'END'
+ AUTOMAKE_OPTIONS = dejagnu
+ DEJATOOL = tcl env
+-EXTRA_DIST = env.test/env.exp tcl.test/tcl.exp lib/tcl.exp
+EXTRA_DIST  = env.test/env.exp tcl.test/tcl.exp
+EXTRA_DIST += lib/tcl.exp
+ END
+ 
+-mkdir env.test tcl.test lib
+mkdir testsuite/env.test testsuite/tcl.test testsuite/lib
+ 
+ # DejaGnu can change $srcdir behind our backs, so we have to
+ # save its original value.  Thanks to Ian Lance Taylor for the
+ # suggestion.
+-cat > lib/tcl.exp << 'END'
+cat > testsuite/lib/tcl.exp << 'END'
+ send_user "tcl_lib_srcdir: $srcdir\n"
+ set orig_srcdir $srcdir
+ END
+ 
+-cat > env.test/env.exp << 'END'
+cat > testsuite/env.test/env.exp << 'END'
+ set env_srcdir $env(srcdir)
+ send_user "env_srcdir: $env_srcdir\n"
+-if { [ regexp "^\.(\./\.\.)?$" $env_srcdir ] } {
+if { [ regexp {^\.(\./\.\./\.\./testsuite)?$} $env_srcdir ] } {
+     pass "test_env_src"
+ } else {
+     fail "test_env_src"
+ }
+ END
+ 
+-cat > tcl.test/tcl.exp << 'END'
+cat > testsuite/tcl.test/tcl.exp << 'END'
+ send_user "tcl_srcdir: $srcdir\n"
+-if { [ regexp "^\.(\./\.\.)?$" $srcdir ] } {
+if { [ regexp {^\.(\./\.\./\.\./testsuite)?$} $srcdir ] } {
+     pass "test_tcl_src"
+ } else {
+     fail "test_tcl_src"
+ }
+ send_user "tcl_orig_srcdir: $orig_srcdir\n"
+-if { [ regexp "^\.(\./\.\.)?$" $orig_srcdir ] } {
+if { [ regexp "^\.(\./\.\./\.\./testsuite)?$" $orig_srcdir ] } {
+     pass "test_tcl_orig_src"
+ } else {
+     fail "test_tcl_orig_src"
+@@ -74,10 +82,10 @@ $AUTOMAKE --add-missing
+ $MAKE check
+ 
+ # Sanity check: all tests have run.
+-test -f env.log
+-test -f env.sum
+-test -f tcl.log
+-test -f tcl.sum
+test -f testsuite/env.log
+test -f testsuite/env.sum
+test -f testsuite/tcl.log
+test -f testsuite/tcl.sum
+ 
+ $MAKE distcheck
+ 
+diff --git a/t/dejagnu-siteexp-extend.sh b/t/dejagnu-siteexp-extend.sh
+index fb17d9d24..67e58c752 100644
+--- a/t/dejagnu-siteexp-extend.sh
+++ b/t/dejagnu-siteexp-extend.sh
+@@ -33,10 +33,17 @@ END
+ }
+ 
+ cat >> configure.ac << 'END'
+AC_CONFIG_FILES([testsuite/Makefile])
+ AC_OUTPUT
+ END
+ 
+ cat > Makefile.am << 'END'
+SUBDIRS = testsuite
+END
+
+mkdir testsuite
+
+cat > testsuite/Makefile.am << 'END'
+ AUTOMAKE_OPTIONS = dejagnu
+ DEJATOOL = tool
+ 
+@@ -46,11 +53,11 @@ EXTRA_DEJAGNU_SITE_CONFIG = foo.exp
+ EXTRA_DIST += foo.exp
+ END
+ 
+-echo 'set foo "/foo/"' > foo.exp
+echo 'set foo "/foo/"' > testsuite/foo.exp
+ 
+-mkdir tool.test
+-write_check_for foo > tool.test/tool.exp
+-cat tool.test/tool.exp
+mkdir testsuite/tool.test
+write_check_for foo > testsuite/tool.test/tool.exp
+cat testsuite/tool.test/tool.exp
+ 
+ $ACLOCAL
+ $AUTOCONF
+@@ -59,31 +66,31 @@ $AUTOMAKE --add-missing
+ ./configure
+ 
+ $MAKE check
+-cat foo.exp
+-cat site.exp
+-grep 'PASS: test_foo' tool.sum
+cat testsuite/foo.exp
+cat testsuite/site.exp
+grep 'PASS: test_foo' testsuite/tool.sum
+ 
+-write_check_for bar >> tool.test/tool.exp
+-write_check_for baz >> tool.test/tool.exp
+-cat tool.test/tool.exp
+write_check_for bar >> testsuite/tool.test/tool.exp
+write_check_for baz >> testsuite/tool.test/tool.exp
+cat testsuite/tool.test/tool.exp
+ 
+ # Ensure that foo.exp will be newer than site.exp, which will
+ # thus have to be remade.
+ $sleep
+ # With this, below we'll also check that settings in files coming later in
+ # $(EXTRA_DEJAGNU_SITE_CONFIG) override those in files coming earlier.
+-cat >> foo.exp <<'END'
+cat >> testsuite/foo.exp <<'END'
+ set bar "/foo/"
+ set baz "/foo/"
+ set qux "/foo/"
+ END
+ 
+-$MAKE check && { cat site.exp; exit 1; }
+-grep 'PASS: test_foo' tool.sum
+-grep 'FAIL: test_bar' tool.sum
+-grep 'FAIL: test_baz' tool.sum
+$MAKE check && { cat testsuite/site.exp; exit 1; }
+grep 'PASS: test_foo' testsuite/tool.sum
+grep 'FAIL: test_bar' testsuite/tool.sum
+grep 'FAIL: test_baz' testsuite/tool.sum
+ 
+-cat >> Makefile.am << 'END'
+cat >> testsuite/Makefile.am << 'END'
+ EXTRA_DEJAGNU_SITE_CONFIG += bar bar.dir/bar
+ EXTRA_DIST += bar
+ DISTCLEANFILES = bar.dir/bar
+@@ -92,41 +99,41 @@ bar.dir/bar:
+ 	echo 'set baz "/baz/"' > $@
+ END
+ 
+-echo 'set bar "/bar/"' > bar
+echo 'set bar "/bar/"' > testsuite/bar
+ # This will allow us to check one more time that settings in files
+ # coming later in $(EXTRA_DEJAGNU_SITE_CONFIG) override those in
+ # files coming earlier.
+-echo 'set baz "/xyz/"' >> bar
+echo 'set baz "/xyz/"' >> testsuite/bar
+ 
+ # Ensure that the Makefile will be newer than site.exp, which will
+ # thus have to be remade.
+ $sleep
+-$AUTOMAKE Makefile
+-./config.status Makefile
+-
+-$MAKE check || { cat site.exp; exit 1; }
+-cat site.exp
+-cat bar.dir/bar
+-$FGREP '/bar/' site.exp
+-$FGREP '/baz/' site.exp
+-grep 'PASS: test_foo' tool.sum
+-grep 'PASS: test_bar' tool.sum
+-grep 'PASS: test_baz' tool.sum
+$AUTOMAKE testsuite/Makefile
+./config.status testsuite/Makefile
+
+$MAKE check || { cat testsuite/site.exp; exit 1; }
+cat testsuite/site.exp
+cat testsuite/bar.dir/bar
+$FGREP '/bar/' testsuite/site.exp
+$FGREP '/baz/' testsuite/site.exp
+grep 'PASS: test_foo' testsuite/tool.sum
+grep 'PASS: test_bar' testsuite/tool.sum
+grep 'PASS: test_baz' testsuite/tool.sum
+ 
+ # Check that the features we're testing behave well in VPATH builds.
+ $MAKE distcheck
+ 
+ # Check that the user can edit the site.exp file, and that his edits
+ # are retained.
+-write_check_for zardoz >> tool.test/tool.exp
+-cat tool.test/tool.exp
+-echo 'set zardoz "/zardoz/"' >> site.exp
+write_check_for zardoz >> testsuite/tool.test/tool.exp
+cat testsuite/tool.test/tool.exp
+echo 'set zardoz "/zardoz/"' >> testsuite/site.exp
+ 
+ $MAKE check
+-cat site.exp
+-grep 'PASS: test_zardoz' tool.sum
+cat testsuite/site.exp
+grep 'PASS: test_zardoz' testsuite/tool.sum
+ 
+-cat >> Makefile.am << 'END'
+cat >> testsuite/Makefile.am << 'END'
+ EXTRA_DEJAGNU_SITE_CONFIG += quux.exp
+ quux.exp:
+ 	echo 'set zardoz "/quux/"' > $@
+@@ -135,25 +142,25 @@ END
+ # Ensure that the Makefile will be newer than on site.exp, which will
+ # thus have to be remade.
+ $sleep
+-$AUTOMAKE Makefile
+-./config.status Makefile
+-grep 'zardoz.*/quux/' Makefile
+$AUTOMAKE testsuite/Makefile
+./config.status testsuite/Makefile
+grep 'zardoz.*/quux/' testsuite/Makefile
+ 
+-$MAKE site.exp
+-cat site.exp
+-cat quux.exp
+-grep 'zardoz.*/quux/' site.exp
+(cd testsuite/ && $MAKE site.exp)
+cat testsuite/site.exp
+cat testsuite/quux.exp
+grep 'zardoz.*/quux/' testsuite/site.exp
+ 
+ $MAKE check
+-grep 'PASS: test_zardoz' tool.sum
+-grep 'zardoz: /zardoz/' tool.log
+-grep 'zardoz.*quux' tool.log && exit 1
+grep 'PASS: test_zardoz' testsuite/tool.sum
+grep 'zardoz: /zardoz/' testsuite/tool.log
+grep 'zardoz.*quux' testsuite/tool.log && exit 1
+ 
+ # Check that files in $(EXTRA_DEJAGNU_SITE_CONFIG) are not distributed
+ # by default.
+ $MAKE distdir
+ ls -l $distdir
+-test ! -e $distdir/bar.dir/bar
+-test ! -e $distdir/quux.exp
+test ! -e $distdir/testsuite/bar.dir/bar
+test ! -e $distdir/testsuite/quux.exp
+ 
+ :
+diff --git a/t/dejagnu-siteexp-useredit.sh b/t/dejagnu-siteexp-useredit.sh
+index 835f8e8f7..f121ec926 100644
+--- a/t/dejagnu-siteexp-useredit.sh
+++ b/t/dejagnu-siteexp-useredit.sh
+@@ -20,18 +20,25 @@
+ . test-init.sh
+ 
+ cat >> configure.ac << 'END'
+AC_CONFIG_FILES([testsuite/Makefile])
+ AC_OUTPUT
+ END
+ 
+ cat > Makefile.am << 'END'
+SUBDIRS = testsuite
+END
+
+mkdir testsuite
+
+cat > testsuite/Makefile.am << 'END'
+ AUTOMAKE_OPTIONS = dejagnu
+ DEJATOOL = foo
+ END
+ 
+ # Deliberately select a variable defined automatically by
+ # the Makefile-generated site.exp.
+-mkdir foo.test
+-cat > foo.test/foo.exp << 'END'
+mkdir testsuite/foo.test
+cat > testsuite/foo.test/foo.exp << 'END'
+ send_user "objdir: $objdir\n"
+ set pipe "|"
+ if { $objdir == "${pipe}objdir${pipe}" } {
+@@ -47,21 +54,21 @@ $AUTOMAKE --add-missing
+ 
+ ./configure
+ 
+-$MAKE site.exp
+-echo 'set objdir "|objdir|"' >> site.exp
+-cat site.exp
+(cd testsuite/ && $MAKE site.exp)
+echo 'set objdir "|objdir|"' >> testsuite/site.exp
+cat testsuite/site.exp
+ $sleep
+-touch Makefile
+-$MAKE site.exp
+-cat site.exp
+-is_newest site.exp Makefile  # Sanity check.
+-grep '|objdir|' site.exp
+-test $($FGREP -c '|objdir|' site.exp) -eq 1
+touch testsuite/Makefile
+(cd testsuite/ && $MAKE site.exp)
+cat testsuite/site.exp
+is_newest testsuite/site.exp testsuite/Makefile  # Sanity check.
+grep '|objdir|' testsuite/site.exp
+test $($FGREP -c '|objdir|' testsuite/site.exp) -eq 1
+ 
+ # We can do a "more semantic" check if DejaGnu is available.
+ if runtest SOMEPROGRAM=someprogram --version; then
+   $MAKE check
+-  grep 'PASS: test_obj' foo.sum
+  grep 'PASS: test_obj' testsuite/foo.sum
+ fi
+ 
+ :
+diff --git a/t/dejagnu3.sh b/t/dejagnu3.sh
+index a215e2829..d93c42a26 100644
+--- a/t/dejagnu3.sh
+++ b/t/dejagnu3.sh
+@@ -27,19 +27,27 @@ END
+ chmod +x hammer
+ 
+ cat >> configure.ac << 'END'
+AC_CONFIG_FILES([testsuite/Makefile])
+ AC_OUTPUT
+ END
+ 
+ cat > Makefile.am << 'END'
+SUBDIRS = testsuite
+EXTRA_DIST = hammer
+END
+
+mkdir testsuite
+
+cat > testsuite/Makefile.am << 'END'
+ AUTOMAKE_OPTIONS = dejagnu
+ DEJATOOL = hammer
+-AM_RUNTESTFLAGS = HAMMER=$(srcdir)/hammer
+-EXTRA_DIST = hammer hammer.test/hammer.exp
+AM_RUNTESTFLAGS = HAMMER=$(top_srcdir)/hammer
+EXTRA_DIST = hammer.test/hammer.exp
+ END
+ 
+-mkdir hammer.test
+mkdir testsuite/hammer.test
+ 
+-cat > hammer.test/hammer.exp << 'END'
+cat > testsuite/hammer.test/hammer.exp << 'END'
+ set test test
+ spawn $HAMMER
+ expect {
+@@ -55,8 +63,8 @@ $AUTOMAKE --add-missing
+ ./configure
+ 
+ $MAKE check
+-test -f hammer.log
+-test -f hammer.sum
+test -f testsuite/hammer.log
+test -f testsuite/hammer.sum
+ 
+ $MAKE distcheck
+ 
+diff --git a/t/dejagnu4.sh b/t/dejagnu4.sh
+index ca2e6e89f..7306e9f8d 100644
+--- a/t/dejagnu4.sh
+++ b/t/dejagnu4.sh
+@@ -39,23 +39,31 @@ END
+ chmod +x spanner
+ 
+ cat >> configure.ac << 'END'
+AC_CONFIG_FILES([testsuite/Makefile])
+ AC_OUTPUT
+ END
+ 
+ cat > Makefile.am << 'END'
+SUBDIRS = testsuite
+EXTRA_DIST = hammer spanner
+END
+
+mkdir testsuite
+
+cat > testsuite/Makefile.am << 'END'
+ AUTOMAKE_OPTIONS = dejagnu
+ 
+ DEJATOOL = hammer spanner
+ 
+-AM_RUNTESTFLAGS = HAMMER=$(srcdir)/hammer SPANNER=$(srcdir)/spanner
+AM_RUNTESTFLAGS = HAMMER=$(top_srcdir)/hammer SPANNER=$(top_srcdir)/spanner
+ 
+-EXTRA_DIST  = hammer  hammer.test/hammer.exp
+-EXTRA_DIST += spanner spanner.test/spanner.exp
+EXTRA_DIST  = hammer.test/hammer.exp
+EXTRA_DIST += spanner.test/spanner.exp
+ END
+ 
+-mkdir hammer.test spanner.test
+mkdir testsuite/hammer.test testsuite/spanner.test
+ 
+-cat > hammer.test/hammer.exp << 'END'
+cat > testsuite/hammer.test/hammer.exp << 'END'
+ set test test
+ spawn $HAMMER
+ expect {
+@@ -64,7 +72,7 @@ expect {
+ }
+ END
+ 
+-cat > spanner.test/spanner.exp << 'END'
+cat > testsuite/spanner.test/spanner.exp << 'END'
+ set test test
+ spawn $SPANNER
+ expect {
+@@ -80,10 +88,10 @@ $AUTOMAKE --add-missing
+ ./configure
+ 
+ $MAKE check
+-test -f hammer.log
+-test -f hammer.sum
+-test -f spanner.log
+-test -f spanner.sum
+test -f testsuite/hammer.log
+test -f testsuite/hammer.sum
+test -f testsuite/spanner.log
+test -f testsuite/spanner.sum
+ 
+ $MAKE distcheck
+ 
+@@ -92,11 +100,12 @@ sed 's/E\(verything\)/Not e\1/' hammer > thammer
+ mv -f thammer hammer
+ chmod +x hammer
+ 
+-rm -f hammer.log hammer.sum spanner.log spanner.sum
+rm -f testsuite/hammer.log testsuite/hammer.sum
+rm -f testsuite/spanner.log testsuite/spanner.sum
+ $MAKE check && exit 1
+-test -f hammer.log
+-test -f hammer.sum
+-test -f spanner.log
+-test -f spanner.sum
+test -f testsuite/hammer.log
+test -f testsuite/hammer.sum
+test -f testsuite/spanner.log
+test -f testsuite/spanner.sum
+ 
+ :
+diff --git a/t/dejagnu5.sh b/t/dejagnu5.sh
+index b750d36cd..63f11afd8 100644
+--- a/t/dejagnu5.sh
+++ b/t/dejagnu5.sh
+@@ -29,17 +29,25 @@ END
+ chmod +x $package
+ 
+ cat >> configure.ac << 'END'
+AC_CONFIG_FILES([testsuite/Makefile])
+ AC_OUTPUT
+ END
+ 
+ cat > Makefile.am << END
+SUBDIRS = testsuite
+EXTRA_DIST = $package
+END
+
+mkdir testsuite
+
+cat > testsuite/Makefile.am << END
+ AUTOMAKE_OPTIONS = dejagnu
+-EXTRA_DIST = $package $package.test/$package.exp
+-AM_RUNTESTFLAGS = PACKAGE=\$(srcdir)/$package
+EXTRA_DIST = $package.test/$package.exp
+AM_RUNTESTFLAGS = PACKAGE=\$(top_srcdir)/$package
+ END
+ 
+-mkdir $package.test
+-cat > $package.test/$package.exp << 'END'
+mkdir testsuite/$package.test
+cat > testsuite/$package.test/$package.exp << 'END'
+ set test "a_dejagnu_test"
+ spawn $PACKAGE
+ expect {
+@@ -55,8 +63,8 @@ $AUTOMAKE --add-missing
+ ./configure
+ 
+ $MAKE check
+-test -f $package.log
+-test -f $package.sum
+test -f testsuite/$package.log
+test -f testsuite/$package.sum
+ 
+ $MAKE distcheck
+ 
+diff --git a/t/dejagnu6.sh b/t/dejagnu6.sh
+index 19ae23a81..95054ed78 100644
+--- a/t/dejagnu6.sh
+++ b/t/dejagnu6.sh
+@@ -26,17 +26,24 @@ END
+ chmod +x faildeja
+ 
+ cat >> configure.ac << 'END'
+AC_CONFIG_FILES([testsuite/Makefile])
+ AC_OUTPUT
+ END
+ 
+ cat > Makefile.am << 'END'
+SUBDIRS = testsuite
+END
+
+mkdir testsuite
+
+cat > testsuite/Makefile.am << 'END'
+ AUTOMAKE_OPTIONS = dejagnu
+ DEJATOOL = faildeja
+-AM_RUNTESTFLAGS = FAILDEJA=$(srcdir)/faildeja
+AM_RUNTESTFLAGS = FAILDEJA=$(top_srcdir)/faildeja
+ END
+ 
+-mkdir faildeja.test
+-cat > faildeja.test/faildeja.exp << 'END'
+mkdir testsuite/faildeja.test
+cat > testsuite/faildeja.test/faildeja.exp << 'END'
+ set test failing_deja_test
+ spawn $FAILDEJA
+ expect {
+@@ -51,8 +58,8 @@ $AUTOMAKE --add-missing
+ ./configure
+ 
+ $MAKE check && exit 1
+-test -f faildeja.log
+-test -f faildeja.sum
+-$FGREP 'FAIL: failing_deja_test' faildeja.sum
+test -f testsuite/faildeja.log
+test -f testsuite/faildeja.sum
+$FGREP 'FAIL: failing_deja_test' testsuite/faildeja.sum
+ 
+ :
+diff --git a/t/dejagnu7.sh b/t/dejagnu7.sh
+index 2bbce0e99..b57341e50 100644
+--- a/t/dejagnu7.sh
+++ b/t/dejagnu7.sh
+@@ -30,17 +30,24 @@ END
+ chmod +x failtcl
+ 
+ cat >> configure.ac << 'END'
+AC_CONFIG_FILES([testsuite/Makefile])
+ AC_OUTPUT
+ END
+ 
+ cat > Makefile.am << 'END'
+SUBDIRS = testsuite
+END
+
+mkdir testsuite
+
+cat > testsuite/Makefile.am << 'END'
+ AUTOMAKE_OPTIONS = dejagnu
+ DEJATOOL = failtcl
+-AM_RUNTESTFLAGS = --status FAILTCL=$(srcdir)/failtcl
+AM_RUNTESTFLAGS = --status FAILTCL=$(top_srcdir)/failtcl
+ END
+ 
+-mkdir failtcl.test
+-cat > failtcl.test/failtcl.exp << 'END'
+mkdir testsuite/failtcl.test
+cat > testsuite/failtcl.test/failtcl.exp << 'END'
+ set test test
+ spawn $FAILTCL
+ expect {
+@@ -55,8 +62,8 @@ $AUTOMAKE --add-missing
+ ./configure
+ 
+ $MAKE check && exit 1
+-test -f failtcl.log
+-test -f failtcl.sum
+-$FGREP 'missing close-brace' failtcl.sum
+test -f testsuite/failtcl.log
+test -f testsuite/failtcl.sum
+$FGREP 'missing close-brace' testsuite/failtcl.sum
+ 
+ :
+-- 
+2.40.1
+
--- a/SOURCES/automake-1.16-pep3147-tweak-fix.patch
+++ b/SOURCES/automake-1.16-pep3147-tweak-fix.patch
@ -1,48 +0,0 @@
-diff --git a/lib/am/python.am b/lib/am/python.am
-index 21e6f842c..e29ecfcd0 100644
--- a/lib/am/python.am
-+++ b/lib/am/python.am
-@@ -97,7 +97,7 @@ endif %?INSTALL%
- if %?INSTALL%
- 
- ?FIRST?am__pep3147_tweak = \
-?FIRST?  sed -e 's|\.py$$||' -e 's|[^/]*$$|&.*.pyc\n&.*.pyo|'
-+?FIRST?  sed -e 's|\.py$$||' -e 's|[^/]*$$|__pycache__/&.*.py|'
- 
- .PHONY uninstall-am: uninstall-%DIR%PYTHON
- uninstall-%DIR%PYTHON:
-@@ -108,19 +108,26 @@ uninstall-%DIR%PYTHON:
- 	test -n "$$py_files" || exit 0; \
- 	dir='$(DESTDIR)$(%NDIR%dir)'; \
- ## Also remove the .pyc and .pyo byte compiled versions.
-+## This is somewhat tricky, because for newer pythons we have to take
-+## PEP-3147 into account.
- 	pyc_files=`echo "$$py_files" | sed 's|$$|c|'`; \
- 	pyo_files=`echo "$$py_files" | sed 's|$$|o|'`; \
-+	py_files_pep3147=`echo "$$py_files" | $(am__pep3147_tweak)`; \
-+	echo "$$py_files_pep3147";\
-+	pyc_files_pep3147=`echo "$$py_files_pep3147" | sed 's|$$|c|'`; \
-+	pyo_files_pep3147=`echo "$$py_files_pep3147" | sed 's|$$|o|'`; \
- 	st=0; \
-	for files in "$$py_files" "$$pyc_files" "$$pyo_files"; do \
-+	for files in \
-+	  "$$py_files" \
-+	  "$$pyc_files" \
-+	  "$$pyo_files" \
-+## Installation of '.py' files is not influenced by PEP-3147, so it
-+## is correct *not* to have $pyfiles_pep3147 here.
-+	  "$$pyc_files_pep3147" \
-+	  "$$pyo_files_pep3147" \
-+	; do \
- 	  $(am__uninstall_files_from_dir) || st=$$?; \
- 	done; \
-## This is somewhat tricky, because for newer pythons we have to take PEP-3147
-## into account.  Avoid exceeding the command-line length limit.
-	dir='$(DESTDIR)$(%NDIR%dir)/__pycache__'; \
-	echo "$$py_files" | $(am__pep3147_tweak) | $(am__base_list) | \
-	  while read files; do \
-	    $(am__uninstall_files_from_dir) || st=$$?; \
-	  done || exit $$?; \
- 	exit $$st
- endif %?INSTALL%
- 
--- a/SOURCES/automake-1.16.2-python-version-multiple-digits.patch
+++ b/SOURCES/automake-1.16.2-python-version-multiple-digits.patch
@ -12,20 +12,18 @@ numbers are treated as numbers.
 * t/python-vars.sh (PYTHON_VERSION): Likewise.
 * doc/automake.texi: Document it.
 * NEWS: mention it. (Minor tweaks from Karl Berry.)
-
-Conflicts:
- - NEWS (Removed)
 ---
+ NEWS              |  2 ++
 doc/automake.texi |  2 +-
 m4/python.m4      | 12 +++++++-----
 t/python-vars.sh  |  4 +++-
- 3 files changed, 11 insertions(+), 7 deletions(-)
+ 4 files changed, 13 insertions(+), 7 deletions(-)

 diff --git a/doc/automake.texi b/doc/automake.texi
-index 2df214a01..1b9d5d0f6 100644
+index ed7e2e242..17bc2dae6 100644
 --- a/doc/automake.texi
 +++ b/doc/automake.texi
-@@ -7761,7 +7761,7 @@ AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
+@@ -7861,7 +7861,7 @@ AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
 @item PYTHON_VERSION
 The Python version number, in the form @var{major}.@var{minor}
 (e.g., @samp{2.5}).  This is currently the value of
@ -35,7 +33,7 @@ index 2df214a01..1b9d5d0f6 100644
 @item PYTHON_PREFIX
 The string @samp{$@{prefix@}}.  This term may be used in future work
 diff --git a/m4/python.m4 b/m4/python.m4
-index 63c0a0e04..4a007fd75 100644
+index 16c2f4f1a..b2302baa3 100644
 --- a/m4/python.m4
 +++ b/m4/python.m4
@@ -1,7 +1,7 @@
@ -45,7 +43,7 @@ index 63c0a0e04..4a007fd75 100644
 -## Updated by James Henstridge
 +## Updated by James Henstridge and other contributors.
 ## ------------------------
- # Copyright (C) 1999-2018 Free Software Foundation, Inc.
+ # Copyright (C) 1999-2020 Free Software Foundation, Inc.
 #
@@ -86,12 +86,14 @@ AC_DEFUN([AM_PATH_PYTHON],
     m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])])
@ -67,7 +65,7 @@ index 63c0a0e04..4a007fd75 100644
 
   dnl Use the values of $prefix and $exec_prefix for the corresponding
 diff --git a/t/python-vars.sh b/t/python-vars.sh
-index 51107be48..13616101a 100644
+index 5c748bcf1..b53018b37 100644
 --- a/t/python-vars.sh
 +++ b/t/python-vars.sh
@@ -28,7 +28,9 @@ CONFIG_SITE=/dev/null; export CONFIG_SITE
@ -82,5 +80,5 @@ index 51107be48..13616101a 100644
 PYTHON_EXEC_PREFIX='${exec_prefix}'
 PYTHON_PREFIX='${prefix}'
 -- 
-2.41.0
+2.29.0

--- a/SOURCES/config.guess
+++ b/SOURCES/config.guess
@ -2,7 +2,7 @@
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2018 Free Software Foundation, Inc.

-timestamp='2018-03-08'
+timestamp='2018-08-29'

 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@ -84,8 +84,6 @@ if test $# != 0; then
  exit 1
 fi

-trap 'exit 1' 1 2 15
-
 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
 # compiler to aid in system detection is discouraged as it requires
 # temporary files to be created and, as you can see below, it is a
@ -96,34 +94,39 @@ trap 'exit 1' 1 2 15

 # Portable tmp directory creation inspired by the Autoconf team.

-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > "$dummy.c" ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
+tmp=
+# shellcheck disable=SC2172
+trap 'test -z "$tmp" || rm -fr "$tmp"' 1 2 13 15
+trap 'exitcode=$?; test -z "$tmp" || rm -fr "$tmp"; exit $exitcode' 0
+
+set_cc_for_build() {
+    : "${TMPDIR=/tmp}"
+    # shellcheck disable=SC2039
+    { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+	{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } ||
+	{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+	{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; }
+    dummy=$tmp/dummy
+    case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
+	,,)    echo "int x;" > "$dummy.c"
+	       for driver in cc gcc c89 c99 ; do
+		   if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
+		       CC_FOR_BUILD="$driver"
+		       break
+		   fi
+	       done
+	       if test x"$CC_FOR_BUILD" = x ; then
+		   CC_FOR_BUILD=no_compiler_found
+	       fi
+	       ;;
+	,,*)   CC_FOR_BUILD=$CC ;;
+	,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+    esac
+}

 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+if test -f /.attbin/uname ; then
 	PATH=$PATH:/.attbin ; export PATH
 fi

@ -138,7 +141,7 @@ Linux|GNU|GNU/*)
 	# We could probably try harder.
 	LIBC=gnu

-	eval "$set_cc_for_build"
+	set_cc_for_build
 	cat <<-EOF > "$dummy.c"
 	#include <features.h>
 	#if defined(__UCLIBC__)
@ -199,7 +202,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
 		os=netbsdelf
 		;;
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval "$set_cc_for_build"
+		set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 			| grep -q __ELF__
 		then
@ -237,7 +240,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "$machine-${os}${release}${abi}"
+	echo "$machine-${os}${release}${abi-}"
 	exit ;;
    *:Bitrig:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
@ -389,20 +392,15 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
 	echo i386-pc-auroraux"$UNAME_RELEASE"
 	exit ;;
    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	eval "$set_cc_for_build"
-	SUN_ARCH=i386
-	# If there is a compiler, see if it is configured for 64-bit objects.
-	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
-	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-		grep IS_64BIT_ARCH >/dev/null
-	    then
-		SUN_ARCH=x86_64
-	    fi
-	fi
-	echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+	UNAME_REL="`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
+	case `isainfo -b` in
+	    32)
+		echo i386-pc-solaris2"$UNAME_REL"
+		;;
+	    64)
+		echo x86_64-pc-solaris2"$UNAME_REL"
+		;;
+	esac
 	exit ;;
    sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
@ -482,7 +480,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
 	echo clipper-intergraph-clix"$UNAME_RELEASE"
 	exit ;;
    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval "$set_cc_for_build"
+	set_cc_for_build
 	sed 's/^	//' << EOF > "$dummy.c"
 #ifdef __cplusplus
 #include <stdio.h>  /* for printf() prototype */
@ -579,7 +577,7 @@ EOF
 	exit ;;
    *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval "$set_cc_for_build"
+		set_cc_for_build
 		sed 's/^		//' << EOF > "$dummy.c"
 		#include <sys/systemcfg.h>

@ -660,7 +658,7 @@ EOF
 		    esac
 		fi
 		if [ "$HP_ARCH" = "" ]; then
-		    eval "$set_cc_for_build"
+		    set_cc_for_build
 		    sed 's/^		//' << EOF > "$dummy.c"

 		#define _HPUX_SOURCE
@ -700,7 +698,7 @@ EOF
 	esac
 	if [ "$HP_ARCH" = hppa2.0w ]
 	then
-	    eval "$set_cc_for_build"
+	    set_cc_for_build

 	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
 	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
@ -726,7 +724,7 @@ EOF
 	echo ia64-hp-hpux"$HPUX_REV"
 	exit ;;
    3050*:HI-UX:*:*)
-	eval "$set_cc_for_build"
+	set_cc_for_build
 	sed 's/^	//' << EOF > "$dummy.c"
 	#include <unistd.h>
 	int
@ -840,6 +838,17 @@ EOF
    *:BSD/OS:*:*)
 	echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
 	exit ;;
+    arm:FreeBSD:*:*)
+	UNAME_PROCESSOR=`uname -p`
+	set_cc_for_build
+	if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_PCS_VFP
+	then
+	    echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabi
+	else
+	    echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabihf
+	fi
+	exit ;;
    *:FreeBSD:*:*)
 	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	case "$UNAME_PROCESSOR" in
@ -894,8 +903,8 @@ EOF
 	# other systems with GNU libc and userland
 	echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
 	exit ;;
-    i*86:Minix:*:*)
-	echo "$UNAME_MACHINE"-pc-minix
+    *:Minix:*:*)
+	echo "$UNAME_MACHINE"-unknown-minix
 	exit ;;
    aarch64:Linux:*:*)
 	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
@ -922,7 +931,7 @@ EOF
 	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 	exit ;;
    arm*:Linux:*:*)
-	eval "$set_cc_for_build"
+	set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
@ -971,7 +980,7 @@ EOF
 	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 	exit ;;
    mips:Linux:*:* | mips64:Linux:*:*)
-	eval "$set_cc_for_build"
+	set_cc_for_build
 	sed 's/^	//' << EOF > "$dummy.c"
 	#undef CPU
 	#undef ${UNAME_MACHINE}
@ -1285,7 +1294,7 @@ EOF
 	exit ;;
    *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	eval "$set_cc_for_build"
+	set_cc_for_build
 	if test "$UNAME_PROCESSOR" = unknown ; then
 	    UNAME_PROCESSOR=powerpc
 	fi
@ -1358,6 +1367,7 @@ EOF
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
 	# operating systems.
+	# shellcheck disable=SC2154
 	if test "$cputype" = 386; then
 	    UNAME_MACHINE=i386
 	else
--- a/SOURCES/config.sub
+++ b/SOURCES/config.sub
--- a/SPECS/automake.spec
+++ b/SPECS/automake.spec
@ -1,5 +1,8 @@
 %global api_version 1.16

+# do not mangle shebang in files which are part of bootstraped project
+%global __brp_mangle_shebangs_exclude_from /usr/share/automake-%{api_version}
+
 # run "make check" by default
 %bcond_without check
 # Run optional test
@ -10,7 +13,8 @@

 Summary:    A GNU tool for automatically creating Makefiles
 Name:       automake
-Version:    %{api_version}.1
+# Any bump here requires libtool rebuild, rhbz#1813010
+Version:    %{api_version}.2
 Release:    8%{?dist}

 # docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT
@ -21,20 +25,26 @@ Source2:    http://git.savannah.gnu.org/cgit/config.git/plain/config.sub
 Source3:    http://git.savannah.gnu.org/cgit/config.git/plain/config.guess

 # Keep those patches in 'git format-patch' format (with docs).
-
-
 %if %{with check} && !%{without automake_enables_optional_test}
 Patch0:     automake-1.15-disable-vala-tests.patch
 %endif

-# BZ#1759942
-# automake bug#31222 - Don't use '\n' in sed substitution
-# http://git.savannah.gnu.org/cgit/automake.git/commit/?id=a348d830659fffd2cfc42994524783b07e69b4b5
-Patch1:     automake-1.16-pep3147-tweak-fix.patch
+# Support multiple digits in Python version, e.g. Python 3.10
+# Taken from upstream commit (NEWS hunks removed due to conflicts)
+# https://debbugs.gnu.org/cgi/bugreport.cgi?bug=44239
+Patch1:     automake-1.16.2-python-version-multiple-digits.patch

-# BZ#2209821
-# Backport fixes for automake bugs 44239 and 53530
-Patch2:     automake-1.16.1-python-version-multiple-digits.patch
+# Backport 7e50be6bce6b662d27e3049170282aaddaaee791
+# tests: use testsuite/ directory in DejaGnu tests
+# Stripped from NEWS/THANKS changes
+# Fixes: RHBZ#2215991
+Patch2:     0001-tests-use-testsuite-directory-in-DejaGnu-tests.patch
+
+# Backport 930a9a73f4bb776ec334eff4cf6e182802841daa
+# Stripped from NEWS updates.
+# Ensures python 3.1x can be found even if it is not the default system
+# interpreter.
+# See RHBZ#2210304
 Patch3:     0001-python-add-3.10-3.15-to-the-version-search-list.patch

 URL:        http://www.gnu.org/software/automake/
@ -59,14 +69,27 @@ BuildArch:  noarch
 # for better tests coverage:
 %if %{with check}
 %if %{with automake_enables_optional_test}
-BuildRequires: automake libtool gettext-devel flex bison texinfo-tex texlive-dvips
-BuildRequires: java-devel-openjdk gcc-gfortran
-BuildRequires: dejagnu expect emacs vala
-BuildRequires: cscope ncompress sharutils
+BuildRequires: automake
+BuildRequires: bison
+BuildRequires: cscope
+BuildRequires: dejagnu
+BuildRequires: emacs
+BuildRequires: expect
+BuildRequires: flex
+BuildRequires: gcc-gfortran
+BuildRequires: gettext-devel
+BuildRequires: java-11-openjdk-devel
+BuildRequires: libtool
+BuildRequires: ncompress
+BuildRequires: sharutils
+BuildREquires: texlive-dvips
+BuildRequires: texinfo-tex
+BuildRequires: vala
 %if !0%{?rhel:1}
-BuildRequires: lzip
-BuildRequires: gcc-objc gcc-objc++
+BuildRequires: gcc-objc
+BuildRequires: gcc-objc++
 BuildRequires: imake
+BuildRequires: lzip
 %endif
 %endif
 %endif
@ -101,13 +124,13 @@ done
 # disable replacing config.guess and config.sub from redhat-rpm-config
 %global _configure_gnuconfig_hack 0
 %configure
-make %{?_smp_mflags}
+%make_build
 cp m4/acdir/README README.aclocal
 cp contrib/multilib/README README.multilib


 %install
-make install DESTDIR=%{buildroot}
+%make_install


 %check
@ -132,12 +155,58 @@ make -k %{?_smp_mflags} check %{?TESTS_FLAGS: TESTS="%{TESTS_FLAGS}"} \


 %changelog
-* Wed Jun 28 2023 Frederic Berat <fberat@redhat.com> - 1.16.1-8
- Fix support for detection of python 3.1x (RHBZ#2209821)
+* Fri Jun 23 2023 Frederic Berat <fberat@redhat.com> - 1.16.2-8
+- Backport python: add 3.10 - 3.15 to the version search list
+- Fixes: RHBZ#2210304

-* Tue May 05 2020 Patrik Novotný <panovotn@redhat.com> - 1.16.1-7
+* Wed Jun 21 2023 Frederic Berat <fberat@redhat.com> - 1.16.2-7
+- Backport: tests: use testsuite/ directory in DejaGnu tests
+- Fixes: RHBZ#2215991
+
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.16.2-6
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.16.2-5
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Thu Oct 22 2020 Miro Hrončok <mhroncok@redhat.com> - 1.16.2-3
+- Support multiple digits in Python version, e.g. Python 3.10
+- Fixes: rhbz#1889732
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Apr 21 2020 Patrik Novotný <panovotn@redhat.com> - 1.16.2-1
+- Rebase to upstream version 1.16.2
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.1-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.1-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Tue Jun 18 2019 Patrik Novotný <panovotn@redhat.com> - 1.16.1-12
+- Fix patch for pep3147 tweak
+
+* Tue Jun 04 2019 Patrik Novotný <panovotn@redhat.com> - 1.16.1-11
 - Upstream patch fixing automake bug#31222

+* Mon May 13 2019 Jakub Janco <jjanco@redhat.com> - 1.16.1-10
+- do not mangle shebang in files which are part of bootstraped project
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.1-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Oct 12 2018 Pavel Raiskup <praiskup@redhat.com> - 1.16.1-8
+- split BR to separate lines, use %%make_* macros
+
+* Mon Sep 17 2018 Pavel Raiskup <praiskup@redhat.com> - 1.16.1-7
+- update config.{guess,sub} to gnuconfig git HEAD
+
 * Wed Aug 15 2018 Pavel Raiskup <praiskup@redhat.com> - 1.16.1-6
 - BR imake for tests only on Fedora