Re: maintainer security fix

[Eric Blake]

According to Eric Blake on 1/5/2010 6:41 AM:
> I'm applying this to branch-1.4 now, and
> will get it ported to branch-1.6 and master later this week.

And this followup.

-- 
Don't work too hard, make some time for fun as well!

Eric Blake             address@hidden

From 36c382bdf8c55629d2cf9c9e5d44f80c6e886e7c Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Tue, 5 Jan 2010 10:43:20 -0700
Subject: [PATCH] Clarify minimum bootstrap requirements.

* bootstrap: Avoid out-of-date duplicated data.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog |    3 +++
 bootstrap |   11 ++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index da50c55..d60f293 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-01-05  Eric Blake  <address@hidden>

+       Clarify minimum bootstrap requirements.
+       * bootstrap: Avoid out-of-date duplicated data.
+
        Security fix by requiring newer automake features.
        * configure.ac (AM_INIT_AUTOMAKE): Add dist-xz, color-tests,
        parallel-tests, and silent-rules.
diff --git a/bootstrap b/bootstrap
index 791627e..25c07f0 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh

-# bootstrap (GNU M4) version 2009-12-14
+# bootstrap (GNU M4) version 2010-01-05
 # Written by Gary V. Vaughan  <address@hidden>

 # Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
@@ -31,10 +31,11 @@
 # locate the right tools:
 #   AUTORECONF, CONFIG_SHELL, GNULIB_SRCDIR, M4, RM, SED

-# This script bootstraps a git or CVS checkout of GNU M4 by correctly
-# calling out to parts of the GNU Build Platform.  Currently this
-# requires GNU Autoconf 2.60, GNU Automake 1.10.1, and bleeding edge
-# git or CVS snapshots of GNU Gnulib.
+# This script bootstraps a git checkout of GNU M4 by correctly calling
+# out to parts of the GNU Build Platform.  See HACKING for a list of
+# prerequisite tools and versions required.  If you are re-running
+# bootstrap on a release tarball rather than using a git checkout,
+# then see the release announcement for the prerequisite tools used.

 # Report bugs to <address@hidden>

-- 
1.6.4.2

signature.asc
Description: OpenPGP digital signature