From 9736697d6d8f9e719cae8b22ff842c5098c7edcb Mon Sep 17 00:00:00 2001 From: "Joel E. Denny" Date: Tue, 19 Jan 2010 18:08:48 -0500 Subject: [PATCH] build: require Automake 1.11.1 to avoid a security flaw. * HACKING (Release Procedure): Don't document Automake security flaw here. * configure.ac (AM_INIT_AUTOMAKE): Require 1.11.1, and explain why here. --- ChangeLog | 8 ++++++++ HACKING | 6 ------ configure.ac | 9 +++++++-- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index d9d26fb8..a1df9fd8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2010-01-19 Joel E. Denny + + build: require Automake 1.11.1 to avoid a security flaw. + * HACKING (Release Procedure): Don't document Automake security + flaw here. + * configure.ac (AM_INIT_AUTOMAKE): Require 1.11.1, and explain + why here. + 2010-01-19 Joel E. Denny gnulib: update to latest. diff --git a/HACKING b/HACKING index 8b573866..a926fa95 100644 --- a/HACKING +++ b/HACKING @@ -234,12 +234,6 @@ The log message can be simply: Bison 2.3b -** make distcheck -Be sure to use automake 1.10.3, 1.11.1, or later in order to avoid the -security issue described here: - - http://thread.gmane.org/gmane.comp.sysutils.autotools.announce/131 - ** Push Once `make distcheck' passes, push your changes and the tag. `git push' without arguments will not push the tag. diff --git a/configure.ac b/configure.ac index 72fa8372..4a662176 100644 --- a/configure.ac +++ b/configure.ac @@ -28,11 +28,16 @@ AC_SUBST([PACKAGE_COPYRIGHT_YEAR], [2008]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) -# We don't have a file m4/Makefile.am, so we need Automake 1.8 or later. +# Automake 1.10.3 and 1.11.1 fix a security flaw discussed here: +# +# http://thread.gmane.org/gmane.comp.sysutils.autotools.announce/131 +# +# To avoid 1.11, we make 1.11.1 the minimum version. +# # We want gnits strictness only when rolling a formal release so that we can, # for example, run make dist at other times without being required to add a # bogus NEWS entry. -AM_INIT_AUTOMAKE([1.8 dist-bzip2] +AM_INIT_AUTOMAKE([1.11.1 dist-bzip2] m4_bmatch(m4_defn([AC_PACKAGE_VERSION]), [-], [gnu], [gnits])) AC_CONFIG_HEADERS([lib/config.h:lib/config.hin]) -- 2.47.2