From bb64793a95ea0576c817a8e01f0a689d9547de4a Mon Sep 17 00:00:00 2001 From: Mathieu Lirzin Date: Tue, 29 Aug 2017 11:27:52 +0200 Subject: build: Move wrapped scripts in "bin" directory Those scripts are used both in the build process and for the tests, so it seems clearer to not hide them in "t/wrap" directory. * t/wrap/aclocal.in: Rename to ... * bin/wrap-aclocal.in: ... this. * t/wrap/automake.in: Rename to ... * bin/wrap-automake.in: ... this. * configure.ac: Generate "bin/aclocal-${APIVERSION}" and "bin/automake-${APIVERSION}" at configure time. * t/Makefile.inc (nodist_noinst_SCRIPTS): Move wrapped scripts ... * bin/Makefile.inc (nodist_noinst_SCRIPTS): ... here. * Makefile.am (extend_PATH): Use "bin" directory. * t/ax/test-defs.in (am_bindir): Likewise. * t/get-sysconf.sh: Likewise. * .gitignore: Update. --- t/ax/test-defs.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 't/ax/test-defs.in') diff --git a/t/ax/test-defs.in b/t/ax/test-defs.in index 2465c61c1..b4a690fc6 100644 --- a/t/ax/test-defs.in +++ b/t/ax/test-defs.in @@ -56,7 +56,7 @@ case ${am_running_installcheck:=no} in no) am_amdir=$am_top_srcdir/lib/am am_automake_acdir=$am_top_srcdir/m4 - am_bindir=$am_top_builddir/t/wrap + am_bindir=$am_top_builddir/bin am_datadir=$am_top_srcdir am_docdir=$am_top_srcdir/doc am_pkgvdatadir=$am_top_srcdir/lib -- cgit v1.2.1 From ab2d33e635f85f8f215b7e8f14571ec6360d2243 Mon Sep 17 00:00:00 2001 From: Mathieu Lirzin Date: Tue, 29 Aug 2017 21:15:14 +0200 Subject: aclocal: Support ACLOCAL_AUTOMAKE_DIR environment variable * bin/aclocal.in: Reset '@automake_includes' and '@system_includes' in for build environment. Allow setting '@automake_includes' with ACLOCAL_AUTOMAKE_DIR environment variable. (parse_arguments): Ignore 'dirlist' when '@system_includes' is empty. * doc/automake.texi (aclocal Options): Document ACLOCAL_AUTOMAKE_DIR. * bin/wrap-aclocal.in: Remove extra command line options. * pre-inst-env.in: Set ACLOCAL_AUTOMAKE_DIR and ACLOCAL_PATH environment variables. * t/ax/test-defs.in: Adapt. * t/ansi2knr-no-more.sh (warn_rx): Likewise. --- t/ax/test-defs.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 't/ax/test-defs.in') diff --git a/t/ax/test-defs.in b/t/ax/test-defs.in index b4a690fc6..8cace053b 100644 --- a/t/ax/test-defs.in +++ b/t/ax/test-defs.in @@ -55,13 +55,13 @@ case ${am_running_installcheck:=no} in ;; no) am_amdir=$am_top_srcdir/lib/am - am_automake_acdir=$am_top_srcdir/m4 + am_automake_acdir="" am_bindir=$am_top_builddir/bin am_datadir=$am_top_srcdir am_docdir=$am_top_srcdir/doc am_pkgvdatadir=$am_top_srcdir/lib am_scriptdir=$am_top_srcdir/lib - am_system_acdir=$am_top_srcdir/m4/acdir + am_system_acdir="" ;; *) echo "$me: variable 'am_running_installcheck' has invalid" -- cgit v1.2.1 From 3562e384f43bbd9d48598904a82a792039f4ce33 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 16 Sep 2017 13:03:36 -0700 Subject: Prefer https: URLs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Gnulib, Emacs, etc. we are changing ftp: and http: URLs to use https:, to discourage man-in-the-middle attacks when downloading software. The attached patch propagates these changes upstream to Automake. This patch does not affect files that Automake is downstream of, which I'll patch separately. Althouth the resources are not secret, plain HTTP is vulnerable to malicious routers that tamper with responses from GNU servers, and this sort of thing is all too common when people in some other countries browse US-based websites. See, for example: Aceto G, Botta A, Pescapé A, Awan MF, Ahmad T, Qaisar S. Analyzing internet censorship in Pakistan. RTSI 2016. https://dx.doi.org/10.1109/RTSI.2016.7740626 HTTPS is not a complete solution here, but it can be a significant help. The GNU project regularly serves up code to users, so we should take some care here. --- t/ax/test-defs.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 't/ax/test-defs.in') diff --git a/t/ax/test-defs.in b/t/ax/test-defs.in index 8cace053b..04d952133 100644 --- a/t/ax/test-defs.in +++ b/t/ax/test-defs.in @@ -14,7 +14,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # Defines and minimal setup for Automake testing environment. @@ -187,7 +187,7 @@ sleep='sleep ''@MODIFICATION_DELAY@' # An old timestamp that can be given to a file, in "touch -t" format. # The time stamp should be portable to all file systems of interest. # Just for fun, choose the exact time of the announcement of the GNU project -# in UTC; see . +# in UTC; see . old_timestamp=198309271735.59 # Make our wrapper script (or installed scripts, if running under -- cgit v1.2.1 From bbaa4cdcd310aef4ae8190e19bf46a27689284b6 Mon Sep 17 00:00:00 2001 From: Mathieu Lirzin Date: Thu, 4 Jan 2018 16:19:30 +0100 Subject: maint: Update copyright years to 2018 This update has been made with 'make update-copyright'. --- t/ax/test-defs.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 't/ax/test-defs.in') diff --git a/t/ax/test-defs.in b/t/ax/test-defs.in index 04d952133..5dc2a61af 100644 --- a/t/ax/test-defs.in +++ b/t/ax/test-defs.in @@ -1,7 +1,7 @@ # -*- shell-script -*- # @configure_input@ # -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # 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 -- cgit v1.2.1