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.
(cherry picked from commit 9736697d6d8f9e719cae8b22ff842c5098c7edcb)

diff --git a/ChangeLog b/ChangeLog
index 0718b1e7fde270116fd2b38726c4cf21fa38b96b..370ac3bf1ae14b8b7ad8694c6bd321e35e20eb2b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-19  Joel E. Denny  <jdenny@clemson.edu>
+
+       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  <jdenny@clemson.edu>
 
        gnulib: update to latest.
 2010-01-19  Joel E. Denny  <jdenny@clemson.edu>
 
        gnulib: update to latest.

diff --git a/HACKING b/HACKING
index 062952cc4d074a69de9c05c585a9ea526f5ca04a..ad3b7ee21d27c42c428acdaf463463303c3a45d7 100644 (file)
--- a/HACKING
+++ b/HACKING
@@ -237,12 +237,6 @@ The log message can be simply:
 
   Bison 2.3b
 
 
   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.
 ** 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 2dcd975f61de8c703f75693f79cb37eb59d8f5ae..76561ec13a6af4e3f19940fd23254eeb06164389 100644 (file)
--- 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])
 
 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.
 # 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])
 
                  m4_bmatch(m4_defn([AC_PACKAGE_VERSION]), [-], [gnu], [gnits]))
 AC_CONFIG_HEADERS([lib/config.h:lib/config.hin])