automake: update to 1.16.2

This is required in order to build coreutils 8.32.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/rootfiles/common/automake b/config/rootfiles/common/automake
index 21a6720add03cdba35a33f9f25c30b781f87def8..595eaf396e8f659a702bad1212b8c4548011bc9b 100644 (file)
--- a/config/rootfiles/common/automake
+++ b/config/rootfiles/common/automake
@@ -1,130 +1,130 @@
 #usr/bin/aclocal
-#usr/bin/aclocal-1.15
+#usr/bin/aclocal-1.16
 #usr/bin/automake
-#usr/bin/automake-1.15
+#usr/bin/automake-1.16
 #usr/share/aclocal
-#usr/share/aclocal-1.15
-#usr/share/aclocal-1.15/amversion.m4
-#usr/share/aclocal-1.15/ar-lib.m4
-#usr/share/aclocal-1.15/as.m4
-#usr/share/aclocal-1.15/auxdir.m4
-#usr/share/aclocal-1.15/cond-if.m4
-#usr/share/aclocal-1.15/cond.m4
-#usr/share/aclocal-1.15/depend.m4
-#usr/share/aclocal-1.15/depout.m4
-#usr/share/aclocal-1.15/dmalloc.m4
-#usr/share/aclocal-1.15/extra-recurs.m4
-#usr/share/aclocal-1.15/gcj.m4
-#usr/share/aclocal-1.15/init.m4
-#usr/share/aclocal-1.15/install-sh.m4
-#usr/share/aclocal-1.15/internal
-#usr/share/aclocal-1.15/internal/ac-config-macro-dirs.m4
-#usr/share/aclocal-1.15/lead-dot.m4
-#usr/share/aclocal-1.15/lex.m4
-#usr/share/aclocal-1.15/lispdir.m4
-#usr/share/aclocal-1.15/maintainer.m4
-#usr/share/aclocal-1.15/make.m4
-#usr/share/aclocal-1.15/missing.m4
-#usr/share/aclocal-1.15/mkdirp.m4
-#usr/share/aclocal-1.15/obsolete.m4
-#usr/share/aclocal-1.15/options.m4
-#usr/share/aclocal-1.15/prog-cc-c-o.m4
-#usr/share/aclocal-1.15/python.m4
-#usr/share/aclocal-1.15/runlog.m4
-#usr/share/aclocal-1.15/sanity.m4
-#usr/share/aclocal-1.15/silent.m4
-#usr/share/aclocal-1.15/strip.m4
-#usr/share/aclocal-1.15/substnot.m4
-#usr/share/aclocal-1.15/tar.m4
-#usr/share/aclocal-1.15/upc.m4
-#usr/share/aclocal-1.15/vala.m4
+#usr/share/aclocal-1.16
+#usr/share/aclocal-1.16/amversion.m4
+#usr/share/aclocal-1.16/ar-lib.m4
+#usr/share/aclocal-1.16/as.m4
+#usr/share/aclocal-1.16/auxdir.m4
+#usr/share/aclocal-1.16/cond-if.m4
+#usr/share/aclocal-1.16/cond.m4
+#usr/share/aclocal-1.16/depend.m4
+#usr/share/aclocal-1.16/depout.m4
+#usr/share/aclocal-1.16/dmalloc.m4
+#usr/share/aclocal-1.16/extra-recurs.m4
+#usr/share/aclocal-1.16/gcj.m4
+#usr/share/aclocal-1.16/init.m4
+#usr/share/aclocal-1.16/install-sh.m4
+#usr/share/aclocal-1.16/internal
+#usr/share/aclocal-1.16/internal/ac-config-macro-dirs.m4
+#usr/share/aclocal-1.16/lead-dot.m4
+#usr/share/aclocal-1.16/lex.m4
+#usr/share/aclocal-1.16/lispdir.m4
+#usr/share/aclocal-1.16/maintainer.m4
+#usr/share/aclocal-1.16/make.m4
+#usr/share/aclocal-1.16/missing.m4
+#usr/share/aclocal-1.16/mkdirp.m4
+#usr/share/aclocal-1.16/obsolete.m4
+#usr/share/aclocal-1.16/options.m4
+#usr/share/aclocal-1.16/prog-cc-c-o.m4
+#usr/share/aclocal-1.16/python.m4
+#usr/share/aclocal-1.16/runlog.m4
+#usr/share/aclocal-1.16/sanity.m4
+#usr/share/aclocal-1.16/silent.m4
+#usr/share/aclocal-1.16/strip.m4
+#usr/share/aclocal-1.16/substnot.m4
+#usr/share/aclocal-1.16/tar.m4
+#usr/share/aclocal-1.16/upc.m4
+#usr/share/aclocal-1.16/vala.m4
 #usr/share/aclocal/README
-#usr/share/automake-1.15
-#usr/share/automake-1.15/Automake
-#usr/share/automake-1.15/Automake/ChannelDefs.pm
-#usr/share/automake-1.15/Automake/Channels.pm
-#usr/share/automake-1.15/Automake/Condition.pm
-#usr/share/automake-1.15/Automake/Config.pm
-#usr/share/automake-1.15/Automake/Configure_ac.pm
-#usr/share/automake-1.15/Automake/DisjConditions.pm
-#usr/share/automake-1.15/Automake/FileUtils.pm
-#usr/share/automake-1.15/Automake/General.pm
-#usr/share/automake-1.15/Automake/Getopt.pm
-#usr/share/automake-1.15/Automake/Item.pm
-#usr/share/automake-1.15/Automake/ItemDef.pm
-#usr/share/automake-1.15/Automake/Language.pm
-#usr/share/automake-1.15/Automake/Location.pm
-#usr/share/automake-1.15/Automake/Options.pm
-#usr/share/automake-1.15/Automake/Rule.pm
-#usr/share/automake-1.15/Automake/RuleDef.pm
-#usr/share/automake-1.15/Automake/VarDef.pm
-#usr/share/automake-1.15/Automake/Variable.pm
-#usr/share/automake-1.15/Automake/Version.pm
-#usr/share/automake-1.15/Automake/Wrap.pm
-#usr/share/automake-1.15/Automake/XFile.pm
-#usr/share/automake-1.15/COPYING
-#usr/share/automake-1.15/INSTALL
-#usr/share/automake-1.15/am
-#usr/share/automake-1.15/am/check.am
-#usr/share/automake-1.15/am/check2.am
-#usr/share/automake-1.15/am/clean-hdr.am
-#usr/share/automake-1.15/am/clean.am
-#usr/share/automake-1.15/am/compile.am
-#usr/share/automake-1.15/am/configure.am
-#usr/share/automake-1.15/am/data.am
-#usr/share/automake-1.15/am/dejagnu.am
-#usr/share/automake-1.15/am/depend.am
-#usr/share/automake-1.15/am/depend2.am
-#usr/share/automake-1.15/am/distdir.am
-#usr/share/automake-1.15/am/footer.am
-#usr/share/automake-1.15/am/header-vars.am
-#usr/share/automake-1.15/am/header.am
-#usr/share/automake-1.15/am/inst-vars.am
-#usr/share/automake-1.15/am/install.am
-#usr/share/automake-1.15/am/java.am
-#usr/share/automake-1.15/am/lang-compile.am
-#usr/share/automake-1.15/am/lex.am
-#usr/share/automake-1.15/am/library.am
-#usr/share/automake-1.15/am/libs.am
-#usr/share/automake-1.15/am/libtool.am
-#usr/share/automake-1.15/am/lisp.am
-#usr/share/automake-1.15/am/ltlib.am
-#usr/share/automake-1.15/am/ltlibrary.am
-#usr/share/automake-1.15/am/mans-vars.am
-#usr/share/automake-1.15/am/mans.am
-#usr/share/automake-1.15/am/program.am
-#usr/share/automake-1.15/am/progs.am
-#usr/share/automake-1.15/am/python.am
-#usr/share/automake-1.15/am/remake-hdr.am
-#usr/share/automake-1.15/am/scripts.am
-#usr/share/automake-1.15/am/subdirs.am
-#usr/share/automake-1.15/am/tags.am
-#usr/share/automake-1.15/am/texi-vers.am
-#usr/share/automake-1.15/am/texibuild.am
-#usr/share/automake-1.15/am/texinfos.am
-#usr/share/automake-1.15/am/vala.am
-#usr/share/automake-1.15/am/yacc.am
-#usr/share/automake-1.15/ar-lib
-#usr/share/automake-1.15/compile
-#usr/share/automake-1.15/config.guess
-#usr/share/automake-1.15/config.sub
-#usr/share/automake-1.15/depcomp
-#usr/share/automake-1.15/install-sh
-#usr/share/automake-1.15/mdate-sh
-#usr/share/automake-1.15/missing
-#usr/share/automake-1.15/mkinstalldirs
-#usr/share/automake-1.15/py-compile
-#usr/share/automake-1.15/tap-driver.sh
-#usr/share/automake-1.15/test-driver
-#usr/share/automake-1.15/texinfo.tex
-#usr/share/automake-1.15/ylwrap
+#usr/share/automake-1.16
+#usr/share/automake-1.16/Automake
+#usr/share/automake-1.16/Automake/ChannelDefs.pm
+#usr/share/automake-1.16/Automake/Channels.pm
+#usr/share/automake-1.16/Automake/Condition.pm
+#usr/share/automake-1.16/Automake/Config.pm
+#usr/share/automake-1.16/Automake/Configure_ac.pm
+#usr/share/automake-1.16/Automake/DisjConditions.pm
+#usr/share/automake-1.16/Automake/FileUtils.pm
+#usr/share/automake-1.16/Automake/General.pm
+#usr/share/automake-1.16/Automake/Getopt.pm
+#usr/share/automake-1.16/Automake/Item.pm
+#usr/share/automake-1.16/Automake/ItemDef.pm
+#usr/share/automake-1.16/Automake/Language.pm
+#usr/share/automake-1.16/Automake/Location.pm
+#usr/share/automake-1.16/Automake/Options.pm
+#usr/share/automake-1.16/Automake/Rule.pm
+#usr/share/automake-1.16/Automake/RuleDef.pm
+#usr/share/automake-1.16/Automake/VarDef.pm
+#usr/share/automake-1.16/Automake/Variable.pm
+#usr/share/automake-1.16/Automake/Version.pm
+#usr/share/automake-1.16/Automake/Wrap.pm
+#usr/share/automake-1.16/Automake/XFile.pm
+#usr/share/automake-1.16/COPYING
+#usr/share/automake-1.16/INSTALL
+#usr/share/automake-1.16/am
+#usr/share/automake-1.16/am/check.am
+#usr/share/automake-1.16/am/check2.am
+#usr/share/automake-1.16/am/clean-hdr.am
+#usr/share/automake-1.16/am/clean.am
+#usr/share/automake-1.16/am/compile.am
+#usr/share/automake-1.16/am/configure.am
+#usr/share/automake-1.16/am/data.am
+#usr/share/automake-1.16/am/dejagnu.am
+#usr/share/automake-1.16/am/depend.am
+#usr/share/automake-1.16/am/depend2.am
+#usr/share/automake-1.16/am/distdir.am
+#usr/share/automake-1.16/am/footer.am
+#usr/share/automake-1.16/am/header-vars.am
+#usr/share/automake-1.16/am/header.am
+#usr/share/automake-1.16/am/inst-vars.am
+#usr/share/automake-1.16/am/install.am
+#usr/share/automake-1.16/am/java.am
+#usr/share/automake-1.16/am/lang-compile.am
+#usr/share/automake-1.16/am/lex.am
+#usr/share/automake-1.16/am/library.am
+#usr/share/automake-1.16/am/libs.am
+#usr/share/automake-1.16/am/libtool.am
+#usr/share/automake-1.16/am/lisp.am
+#usr/share/automake-1.16/am/ltlib.am
+#usr/share/automake-1.16/am/ltlibrary.am
+#usr/share/automake-1.16/am/mans-vars.am
+#usr/share/automake-1.16/am/mans.am
+#usr/share/automake-1.16/am/program.am
+#usr/share/automake-1.16/am/progs.am
+#usr/share/automake-1.16/am/python.am
+#usr/share/automake-1.16/am/remake-hdr.am
+#usr/share/automake-1.16/am/scripts.am
+#usr/share/automake-1.16/am/subdirs.am
+#usr/share/automake-1.16/am/tags.am
+#usr/share/automake-1.16/am/texi-vers.am
+#usr/share/automake-1.16/am/texibuild.am
+#usr/share/automake-1.16/am/texinfos.am
+#usr/share/automake-1.16/am/vala.am
+#usr/share/automake-1.16/am/yacc.am
+#usr/share/automake-1.16/ar-lib
+#usr/share/automake-1.16/compile
+#usr/share/automake-1.16/config.guess
+#usr/share/automake-1.16/config.sub
+#usr/share/automake-1.16/depcomp
+#usr/share/automake-1.16/install-sh
+#usr/share/automake-1.16/mdate-sh
+#usr/share/automake-1.16/missing
+#usr/share/automake-1.16/mkinstalldirs
+#usr/share/automake-1.16/py-compile
+#usr/share/automake-1.16/tap-driver.sh
+#usr/share/automake-1.16/test-driver
+#usr/share/automake-1.16/texinfo.tex
+#usr/share/automake-1.16/ylwrap
 #usr/share/doc/automake
 #usr/share/doc/automake/amhello-1.0.tar.gz
 #usr/share/info/automake-history.info
 #usr/share/info/automake.info
 #usr/share/info/automake.info-1
 #usr/share/info/automake.info-2
-#usr/share/man/man1/aclocal-1.15.1
+#usr/share/man/man1/aclocal-1.16.1
 #usr/share/man/man1/aclocal.1
-#usr/share/man/man1/automake-1.15.1
+#usr/share/man/man1/automake-1.16.1
 #usr/share/man/man1/automake.1

diff --git a/lfs/automake b/lfs/automake
index 26d17f5406e00f65e60f8195506389f9fe2738b2..0dcb58983619ffd580e9f10fc2ab8ad22cc09a93 100644 (file)
--- a/lfs/automake
+++ b/lfs/automake
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.15
+VER        = 1.16.2
 
 THISAPP    = automake-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 9a1ddb0e053474d9d1105cfe39b0c48d
+$(DL_FILE)_MD5 = 6cb234c86f3f984df29ce758e6d0d1d7
 
 install : $(TARGET)
 
@@ -78,7 +78,6 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/automake-1.15_perl_warning.patch
        cd $(DIR_APP) && ./configure --prefix=$(PREFIX)
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install

diff --git a/src/patches/automake-1.15_perl_warning.patch b/src/patches/automake-1.15_perl_warning.patch
deleted file mode 100644 (file)
index 9a031e8..0000000
--- a/src/patches/automake-1.15_perl_warning.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- automake-1.15/bin/automake.in
-+++ automake-1.15/bin/automake.in
-@@ -3878,7 +3878,7 @@
- sub substitute_ac_subst_variables
- {
-   my ($text) = @_;
--  $text =~ s/\${([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
-+  $text =~ s/\$\{([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
-   return $text;
- }