From patchwork Sat Apr 11 17:22:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 2938 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4901sQ6dVGz3yBy for ; Sat, 11 Apr 2020 17:22:18 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4901sP54hlz2Pv; Sat, 11 Apr 2020 17:22:17 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4901sP3qD4z2yZy; Sat, 11 Apr 2020 17:22:17 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4901sN3b6zz2yNV for ; Sat, 11 Apr 2020 17:22:16 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4901sM0lVQz2Pv for ; Sat, 11 Apr 2020 17:22:14 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1586625735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DNAc7tuZ5KT9JQwgVNvnevSow8Y+TqN08z0+Gk4LgX4=; b=DY5EcIxHu8JQWVE9iGmxb8O7yFkkrRekI0V/6IVXcB6VsbdJ6NXQ68Kt6ZxkJD4l3v47S7 AuOrynMLyA47j+BA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1586625735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DNAc7tuZ5KT9JQwgVNvnevSow8Y+TqN08z0+Gk4LgX4=; b=Wqw/m/fsBvxxQiH25huuVpaN7q1y6trA7pETPPrr19xMkzUz4IxMkJQP7AKYsKffOWavIo 5L4Zcsd41n332ZIuN3bPIgk2xzIUcM3KG3U70C8ynPnkK+Jlw38i3dasAsDc6UO+beZp3M w2G6Vp28TS9+oVtYnoniGe+guz0FFxU00inyTasmS+BG6GXEMzT7BQYbbjBXh2Ic8/SfUX VGBD5uaBFzpjjkObi83D2m4Z++Xym7OoSTj7fWeSHiUcOgzo7fntngo0oSjkOUkVKSTJsS WgqFtgYySDNR/t2mKK8vXlYp5J9KmubEqrZ52MyeSOySrG4AvAdHoRhZBRnRnw== To: "IPFire: Development-List" From: =?utf-8?q?Peter_M=C3=BCller?= Subject: [PATCH 1/2] automake: update to 1.16.2 Message-ID: <6e03889e-090a-3209-f580-eb2798f6ebf6@ipfire.org> Date: Sat, 11 Apr 2020 19:22:12 +0200 MIME-Version: 1.0 Content-Language: en-US Authentication-Results: mail01.ipfire.org; auth=pass smtp.mailfrom=peter.mueller@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This is required in order to build coreutils 8.32. Signed-off-by: Peter Müller --- config/rootfiles/common/automake | 236 +++++++++++++-------------- lfs/automake | 7 +- src/patches/automake-1.15_perl_warning.patch | 10 -- 3 files changed, 121 insertions(+), 132 deletions(-) delete mode 100644 src/patches/automake-1.15_perl_warning.patch diff --git a/config/rootfiles/common/automake b/config/rootfiles/common/automake index 21a6720ad..595eaf396 100644 --- 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 26d17f540..0dcb58983 100644 --- a/lfs/automake +++ b/lfs/automake @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # +# Copyright (C) 2007-2020 IPFire Team # # # # 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 index 9a031e8da..000000000 --- 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; - }