2013-08-28 16:13:40 +00:00
|
|
|
From b2338d71549462c1dfbb434111b5c46701f54261 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Stefano Lattarini <stefano.lattarini@gmail.com>
|
|
|
|
Date: Thu, 30 Aug 2012 18:53:19 +0200
|
2014-03-25 00:09:24 +00:00
|
|
|
Subject: [PATCH 16/89] build: require Automake >= 1.11.6
|
2013-08-28 16:13:40 +00:00
|
|
|
|
|
|
|
Now that we use AM_TESTS_ENVIRONMENT, we should require at least
|
|
|
|
Automake >= 1.11.2; but since all the Automake version until 1.11.5
|
|
|
|
are vulnerable to CVE-2012-3386:
|
|
|
|
|
|
|
|
<https://lists.gnu.org/archive/html/automake/2012-07/msg00023.html>
|
|
|
|
|
|
|
|
it's even better to require 1.11.6.
|
|
|
|
|
|
|
|
* configure.ac (AM_INIT_AUTOMAKE): Bump version requirement to 1.11.6.
|
|
|
|
* bootstrap.conf ($buildreq): Likewise.
|
|
|
|
|
|
|
|
Copyright-paperwork-exempt: yes
|
|
|
|
---
|
|
|
|
bootstrap.conf | 2 +-
|
|
|
|
configure.ac | 2 +-
|
|
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
|
|
|
|
diff --git a/bootstrap.conf b/bootstrap.conf
|
|
|
|
index b4456b2..39a5506 100644
|
|
|
|
--- a/bootstrap.conf
|
|
|
|
+++ b/bootstrap.conf
|
|
|
|
@@ -130,7 +130,7 @@ mkdir -p gnulib-tests
|
|
|
|
# Build prerequisites
|
|
|
|
buildreq="\
|
|
|
|
autoconf 2.61
|
|
|
|
-automake 1.11
|
|
|
|
+automake 1.11.6
|
|
|
|
autopoint -
|
|
|
|
bc -
|
|
|
|
gettext -
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
|
|
index 49ef75c..832fc20 100644
|
|
|
|
--- a/configure.ac
|
|
|
|
+++ b/configure.ac
|
|
|
|
@@ -52,7 +52,7 @@ AC_SUBST([LT_CURRENT])
|
|
|
|
AC_SUBST([LT_REVISION])
|
|
|
|
AC_SUBST([LT_AGE])
|
|
|
|
|
|
|
|
-AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz color-tests parallel-tests
|
|
|
|
+AM_INIT_AUTOMAKE([1.11.6 no-dist-gzip dist-xz color-tests parallel-tests
|
|
|
|
subdir-objects])
|
|
|
|
AM_SILENT_RULES([yes]) # make --enable-silent-rules the default.
|
|
|
|
|
|
|
|
--
|
2014-03-25 00:09:24 +00:00
|
|
|
1.8.5.3
|
2013-08-28 16:13:40 +00:00
|
|
|
|