maintainer security fix

[Eric Blake]

As mentioned in the recent automake release, all earlier versions of m4
have had a security hole for anyone that ran 'make dist' or 'make
distcheck' (even m4 1.4.4 and earlier, which did not use automake, but
still followed the GNU Coding Standards of that time by creating the
distribution directory with world-writable permission, is suspect).  But
leading up to that, I am bumping the copyright years, and also removing
the hard-coding of my GPG id.  I'm applying this to branch-1.4 now, and
will get it ported to branch-1.6 and master later this week.

Yes, this change means that you have to have the most recent automake
release (or newer) in order to bootstrap m4.  But think of this as an
incentive to help people realize they need to upgrade automake to get past
its security flaw.  I also used it as an opportunity to enable the
framework for silent builds (for those who want to enable it, although
unlike coreutils, I am not enabling it by default) and colored gnulib test
results.

I'm hoping to release m4 1.4.14 this month.

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

Eric Blake             address@hidden

From 5f42c4dabb6858601abce7b38ca78f4c3069f301 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Fri, 1 Jan 2010 10:49:29 -0700
Subject: [PATCH 1/3] Update copyright year.

All files impacted, via 'make update-copyright'.  Additionally:
* .gitignore: Ignore backup files.

Signed-off-by: Eric Blake <address@hidden>
---
 .gitignore           |    1 +
 AUTHORS              |    3 ++-
 BACKLOG              |    2 +-
 ChangeLog            |    9 ++++++++-
 HACKING              |    2 +-
 Makefile.am          |    4 ++--
 NEWS                 |    4 ++--
 README               |    2 +-
 THANKS               |    4 ++--
 TODO                 |    3 ++-
 acinclude.m4         |    2 +-
 bootstrap            |    2 +-
 c-boxes.el           |    2 +-
 cfg.mk               |    4 ++--
 checks/Makefile.in   |    4 ++--
 checks/check-them    |    4 ++--
 checks/get-them      |    2 +-
 checks/stackovf.test |    4 ++--
 configure.ac         |    4 ++--
 doc/Makefile.am      |    3 ++-
 doc/m4.texinfo       |    2 +-
 examples/COPYING     |    2 +-
 examples/Makefile.am |    3 ++-
 lib/Makefile.am      |    2 +-
 src/Makefile.am      |    3 ++-
 src/builtin.c        |    2 +-
 src/debug.c          |    4 ++--
 src/eval.c           |    4 ++--
 src/format.c         |    2 +-
 src/freeze.c         |    2 +-
 src/input.c          |    2 +-
 src/m4.c             |    2 +-
 src/m4.h             |    2 +-
 src/macro.c          |    4 ++--
 src/output.c         |    2 +-
 src/path.c           |    2 +-
 src/symtab.c         |    2 +-
 tests/Makefile.am    |    2 +-
 38 files changed, 61 insertions(+), 48 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7f5b72e..0ea0794 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 *~
+*.bak
 *.orig
 *.rej
 *.tar.bz2
diff --git a/AUTHORS b/AUTHORS
index 56ad838..f476f30 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -30,7 +30,8 @@ Joel E. Denny               address@hidden            
2009-08-18

 ========================================================================

-Copyright (C) 2000, 2006, 2007, 2009 Free Software Foundation, Inc.
+Copyright (C) 2000, 2006, 2007, 2009, 2010 Free Software Foundation,
+Inc.

 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.2 or
diff --git a/BACKLOG b/BACKLOG
index 557831f..da6110d 100644
--- a/BACKLOG
+++ b/BACKLOG
@@ -50,7 +50,7 @@ rmail/speed
  2. 05 Sep 94 <address@hidden> slowness
  3. 04 Oct 94 <pinard> Autoconf, m4, and dnl's.

-Copyright (C) 2000, 2006, 2009 Free Software Foundation, Inc.
+Copyright (C) 2000, 2006, 2009, 2010 Free Software Foundation, Inc.

 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.2 or
diff --git a/ChangeLog b/ChangeLog
index ba96302..ec83470 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-01  Eric Blake  <address@hidden>
+
+       Update copyright year.
+       All files impacted, via 'make update-copyright'.  Additionally:
+       * .gitignore: Ignore backup files.
+
 2009-12-29  Eric Blake  <address@hidden>

        Document new indentation policy.
@@ -5058,7 +5064,8 @@ Mon Jan 22 21:08:52 1990  Rene' Seindal (seindal at 
diku.dk)
        End:

        Copyright (C) 1990, 1991, 1992, 1993, 1994, 2000, 2001, 2003,
-       2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+       2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+       Inc.

        Copying and distribution of this file, with or without
        modification, are permitted provided the copyright notice
diff --git a/HACKING b/HACKING
index 2d28787..86f9192 100644
--- a/HACKING
+++ b/HACKING
@@ -317,7 +317,7 @@ yyyy-mm-dd  Name of Author  <address@hidden>  (tiny change)
   After making edits, mail the diff to <address@hidden>.

 
-Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
 Foundation, Inc.

 The canonical source of this file is maintained with the
diff --git a/Makefile.am b/Makefile.am
index 1d50592..4a8cbfc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ## Makefile.am - template for generating Makefile via Automake
 ##
-## Copyright (C) 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-## Free Software Foundation, Inc.
+## Copyright (C) 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+## 2010 Free Software Foundation, Inc.
 ##
 ## This file is part of GNU M4.
 ##
diff --git a/NEWS b/NEWS
index bfb7ab7..eb51b11 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 GNU M4 NEWS - User visible changes.
-Copyright (C) 1992, 1993, 1994, 2004, 2005, 2006, 2007, 2008, 2009 Free
-Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+Free Software Foundation, Inc.

 * Noteworthy changes in Version 1.4.14 (2009-??-??) [stable]
   Released by Eric Blake, based on git version 1.4.13.*
diff --git a/README b/README
index 2197a2c..7461fdb 100644
--- a/README
+++ b/README
@@ -63,7 +63,7 @@ solution, from which the problem might be uneasy to infer.

 ========================================================================

-Copyright (C) 2000, 2005, 2006, 2007, 2008, 2009 Free Software
+Copyright (C) 2000, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
 Foundation, Inc.

 Permission is granted to copy, distribute and/or modify this document
diff --git a/THANKS b/THANKS
index 949322a..652a3f8 100644
--- a/THANKS
+++ b/THANKS
@@ -129,8 +129,8 @@ Local Variables:
 coding: utf-8
 End:

-Copyright (C) 2000, 2006, 2007, 2008, 2009 Free Software Foundation,
-Inc.
+Copyright (C) 2000, 2006, 2007, 2008, 2009, 2010 Free Software
+Foundation, Inc.

 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.2 or
diff --git a/TODO b/TODO
index 134f4c3..a6b6d97 100644
--- a/TODO
+++ b/TODO
@@ -37,7 +37,8 @@ mode: outline
 outline-regexp: " *[-+*.] \\|"
 End:

-Copyright (C) 2000, 2006, 2007, 2009 Free Software Foundation, Inc.
+Copyright (C) 2000, 2006, 2007, 2009, 2010 Free Software Foundation,
+Inc.

 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.2 or
diff --git a/acinclude.m4 b/acinclude.m4
index cb4fc2f..4322e94 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,5 +1,5 @@
 # Local additions to Autoconf macros.
-# Copyright (C) 1992, 1994, 2004, 2006, 2008, 2009 Free Software
+# Copyright (C) 1992, 1994, 2004, 2006, 2008, 2009, 2010 Free Software
 # Foundation, Inc.
 # Francois Pinard <address@hidden>, 1992.
 #
diff --git a/bootstrap b/bootstrap
index 56c2ed1..791627e 100755
--- a/bootstrap
+++ b/bootstrap
@@ -3,7 +3,7 @@
 # bootstrap (GNU M4) version 2009-12-14
 # Written by Gary V. Vaughan  <address@hidden>

-# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
 # Foundation, Inc.

 # This file is part of GNU M4.
diff --git a/c-boxes.el b/c-boxes.el
index 0dcd1fc..453e51a 100644
--- a/c-boxes.el
+++ b/c-boxes.el
@@ -1,5 +1,5 @@
 ;;; Boxed comments for C mode.
-;;; Copyright (C) 1991, 1992, 1993, 1994, 2008, 2009 Free Software
+;;; Copyright (C) 1991, 1992, 1993, 1994, 2008, 2009, 2010 Free Software
 ;;; Foundation, Inc.
 ;;; Francois Pinard <address@hidden>, April 1991.
 ;;;
diff --git a/cfg.mk b/cfg.mk
index 10fdcc5..2f99b04 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -1,6 +1,6 @@
 # Customize maint.mk.                           -*- makefile -*-
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
-# Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 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
diff --git a/checks/Makefile.in b/checks/Makefile.in
index b2903ff..d19cf2b 100644
--- a/checks/Makefile.in
+++ b/checks/Makefile.in
@@ -1,7 +1,7 @@
 ## Makefile.in - template for building Makefile for M4 testsuite.
 ##
-## Copyright (C) 1992, 1993, 1994, 2006, 2007, 2008, 2009 Free Software
-## Foundation, Inc.
+## Copyright (C) 1992, 1993, 1994, 2006, 2007, 2008, 2009, 2010 Free
+## Software Foundation, Inc.
 ##
 ## This file is part of GNU M4.
 ##
diff --git a/checks/check-them b/checks/check-them
index 58ab9d1..cf73603 100755
--- a/checks/check-them
+++ b/checks/check-them
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Check GNU m4 against examples from the manual source.
-# Copyright (C) 1992, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1992, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
 #
 # This file is part of GNU M4.
 #
diff --git a/checks/get-them b/checks/get-them
index de1c506..d4f27f3 100755
--- a/checks/get-them
+++ b/checks/get-them
@@ -1,7 +1,7 @@
 #!/bin/sh
 # -*- AWK -*-
 # Extract all examples from the manual source.
-# Copyright (C) 1992, 2005, 2006, 2007, 2008, 2009 Free Software
+# Copyright (C) 1992, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
 # Foundation, Inc.
 #
 # This file is part of GNU M4.
diff --git a/checks/stackovf.test b/checks/stackovf.test
index baf0414..da8756a 100755
--- a/checks/stackovf.test
+++ b/checks/stackovf.test
@@ -1,7 +1,7 @@
 #!/bin/sh
 # This file is part of the GNU m4 testsuite
-# Copyright (C) 2000, 2003, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 2000, 2003, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
 #
 # This file is part of GNU M4.
 #
diff --git a/configure.ac b/configure.ac
index a917a65..c93d9d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 # Configure template for GNU M4.                       -*-Autoconf-*-
-# Copyright (C) 1991, 1993, 1994, 2004, 2005, 2006, 2007, 2008, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1991, 1993, 1994, 2004, 2005, 2006, 2007, 2008, 2009,
+# 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU M4.
 #
diff --git a/doc/Makefile.am b/doc/Makefile.am
index e217237..7eaa5a9 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,7 @@
 ## Makefile.am - template for generating Makefile via Automake
 ##
-## Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+## Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+## Inc.
 ##
 ## This file is part of GNU M4.
 ##
diff --git a/doc/m4.texinfo b/doc/m4.texinfo
index 550fa4a..a44a437 100644
--- a/doc/m4.texinfo
+++ b/doc/m4.texinfo
@@ -44,7 +44,7 @@
 language.

 Copyright @copyright{} 1989, 1990, 1991, 1992, 1993, 1994, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.

 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/examples/COPYING b/examples/COPYING
index c79fe3e..452416d 100644
--- a/examples/COPYING
+++ b/examples/COPYING
@@ -2,7 +2,7 @@ The files in this directory provide example uses of GNU M4.
 The following copyright notice applies to each of these
 description files.

-Copyright (C) 2006 Free Software Foundation, Inc.
+Copyright (C) 2006, 2010 Free Software Foundation, Inc.
 This file is free software; the Free Software Foundation
 gives unlimited permission to copy and/or distribute it,
 with or without modifications, as long as this notice is preserved.
diff --git a/examples/Makefile.am b/examples/Makefile.am
index fd2a289..351e214 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,6 +1,7 @@
 ## Makefile.am - template for generating Makefile via Automake
 ##
-## Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+## Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+## Inc.
 ##
 ## This file is part of GNU M4.
 ##
diff --git a/lib/Makefile.am b/lib/Makefile.am
index eb04128..cec3f9a 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am - template for generating Makefile via Automake
 ##
-## Copyright (C) 2009 Free Software Foundation, Inc.
+## Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 ##
 ## This file is part of GNU M4.
 ##
diff --git a/src/Makefile.am b/src/Makefile.am
index bdf52de..6380a88 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,7 @@
 ## Makefile.am - template for generating Makefile via Automake
 ##
-## Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+## Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+## Inc.
 ##
 ## This file is part of GNU M4.
 ##
diff --git a/src/builtin.c b/src/builtin.c
index da90e1d..d84edb5 100644
--- a/src/builtin.c
+++ b/src/builtin.c
@@ -1,7 +1,7 @@
 /* GNU m4 -- A simple macro processor

    Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2000, 2004, 2006,
-   2007, 2008, 2009 Free Software Foundation, Inc.
+   2007, 2008, 2009, 2010 Free Software Foundation, Inc.

    This file is part of GNU M4.

diff --git a/src/debug.c b/src/debug.c
index 507642c..54402f3 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -1,7 +1,7 @@
 /* GNU m4 -- A simple macro processor

-   Copyright (C) 1991, 1992, 1993, 1994, 2004, 2006, 2007, 2009 Free
-   Software Foundation, Inc.
+   Copyright (C) 1991, 1992, 1993, 1994, 2004, 2006, 2007, 2009, 2010
+   Free Software Foundation, Inc.

    This file is part of GNU M4.

diff --git a/src/eval.c b/src/eval.c
index 9d4c9e1..526d3f6 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1,7 +1,7 @@
 /* GNU m4 -- A simple macro processor

-   Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2006, 2007, 2009
-   Free Software Foundation, Inc.
+   Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2006, 2007, 2009,
+   2010 Free Software Foundation, Inc.

    This file is part of GNU M4.

diff --git a/src/format.c b/src/format.c
index 54b7584..7faa793 100644
--- a/src/format.c
+++ b/src/format.c
@@ -1,7 +1,7 @@
 /* GNU m4 -- A simple macro processor

    Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2006, 2007, 2008,
-   2009 Free Software Foundation, Inc.
+   2009, 2010 Free Software Foundation, Inc.

    This file is part of GNU M4.

diff --git a/src/freeze.c b/src/freeze.c
index b59ed0d..be46361 100644
--- a/src/freeze.c
+++ b/src/freeze.c
@@ -1,7 +1,7 @@
 /* GNU m4 -- A simple macro processor

    Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2006, 2007, 2008,
-   2009 Free Software Foundation, Inc.
+   2009, 2010 Free Software Foundation, Inc.

    This file is part of GNU M4.

diff --git a/src/input.c b/src/input.c
index 1fa3a77..abf2ed1 100644
--- a/src/input.c
+++ b/src/input.c
@@ -1,7 +1,7 @@
 /* GNU m4 -- A simple macro processor

    Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2004, 2005, 2006,
-   2007, 2008, 2009 Free Software Foundation, Inc.
+   2007, 2008, 2009, 2010 Free Software Foundation, Inc.

    This file is part of GNU M4.

diff --git a/src/m4.c b/src/m4.c
index 63517bb..a2e5c59 100644
--- a/src/m4.c
+++ b/src/m4.c
@@ -1,7 +1,7 @@
 /* GNU m4 -- A simple macro processor

    Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2004, 2005, 2006,
-   2007, 2008, 2009 Free Software Foundation, Inc.
+   2007, 2008, 2009, 2010 Free Software Foundation, Inc.

    This file is part of GNU M4.

diff --git a/src/m4.h b/src/m4.h
index c53cb1c..5c3dedb 100644
--- a/src/m4.h
+++ b/src/m4.h
@@ -1,7 +1,7 @@
 /* GNU m4 -- A simple macro processor

    Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2004, 2005, 2006,
-   2007, 2008, 2009 Free Software Foundation, Inc.
+   2007, 2008, 2009, 2010 Free Software Foundation, Inc.

    This file is part of GNU M4.

diff --git a/src/macro.c b/src/macro.c
index 43a999f..7def8b0 100644
--- a/src/macro.c
+++ b/src/macro.c
@@ -1,7 +1,7 @@
 /* GNU m4 -- A simple macro processor

-   Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2006, 2007, 2009
-   Free Software Foundation, Inc.
+   Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2006, 2007, 2009,
+   2010 Free Software Foundation, Inc.

    This file is part of GNU M4.

diff --git a/src/output.c b/src/output.c
index 65af2eb..9e5957e 100644
--- a/src/output.c
+++ b/src/output.c
@@ -1,7 +1,7 @@
 /* GNU m4 -- A simple macro processor

    Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2004, 2005, 2006,
-   2007, 2008, 2009 Free Software Foundation, Inc.
+   2007, 2008, 2009, 2010 Free Software Foundation, Inc.

    This file is part of GNU M4.

diff --git a/src/path.c b/src/path.c
index d10752e..f8c1b5a 100644
--- a/src/path.c
+++ b/src/path.c
@@ -1,7 +1,7 @@
 /* GNU m4 -- A simple macro processor

    Copyright (C) 1989, 1990, 1991, 1992, 1993, 2004, 2006, 2007, 2008,
-   2009 Free Software Foundation, Inc.
+   2009, 2010 Free Software Foundation, Inc.

    This file is part of GNU M4.

diff --git a/src/symtab.c b/src/symtab.c
index e0ee93d..46e7d22 100644
--- a/src/symtab.c
+++ b/src/symtab.c
@@ -1,7 +1,7 @@
 /* GNU m4 -- A simple macro processor

    Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2003, 2006, 2007,
-   2008, 2009 Free Software Foundation, Inc.
+   2008, 2009, 2010 Free Software Foundation, Inc.

    This file is part of GNU M4.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2cdfaf0..904ae1d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am - template for generating Makefile via Automake
 ##
-## Copyright (C) 2009 Free Software Foundation, Inc.
+## Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 ##
 ## This file is part of GNU M4.
 ##
-- 
1.6.4.2


From 30e611c67724bf8dafc01d65622242bcb354ed7e Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Sat, 2 Jan 2010 08:29:33 -0700
Subject: [PATCH 2/3] Drop hard-coding of GPG id.

* gnulib: Update to latest.
* m4/gnulib-cache.m4: Regenerate.
* cfg.mk (gpg_key_ID): Delete, now that maint.mk provides a
sensible default.
(update-copyright-env): Don't let environment interfere with wrap
column.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog          |   10 ++++++++++
 cfg.mk             |    7 +++----
 gnulib             |    2 +-
 m4/gnulib-cache.m4 |    2 +-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ec83470..2e08b0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-05  Eric Blake  <address@hidden>
+
+       Drop hard-coding of GPG id.
+       * gnulib: Update to latest.
+       * m4/gnulib-cache.m4: Regenerate.
+       * cfg.mk (gpg_key_ID): Delete, now that maint.mk provides a
+       sensible default.
+       (update-copyright-env): Don't let environment interfere with wrap
+       column.
+
 2010-01-01  Eric Blake  <address@hidden>

        Update copyright year.
diff --git a/cfg.mk b/cfg.mk
index 2f99b04..c38a45d 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -18,11 +18,10 @@
 # Used in maint.mk's web-manual rule
 manual_title = GNU macro processor

-# The GnuPG ID of the key used to sign the tarballs.
-gpg_key_ID = F4850180
-
 # Always use longhand copyrights.
-update-copyright-env = UPDATE_COPYRIGHT_USE_INTERVALS=0
+update-copyright-env = \
+  UPDATE_COPYRIGHT_USE_INTERVALS=0 \
+  UPDATE_COPYRIGHT_MAX_LINE_LENGTH=72

 # Tests not to run as part of "make syntax-check".
 # M4 intentionally uses a coding style that compiles under C++.
diff --git a/gnulib b/gnulib
index 9c40f34..51983dc 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 9c40f34443ba034ee7890ab10c369a903417765d
+Subproject commit 51983dcb2ce9d20eb1f72d0b877e40fe0de07e87
diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index c81e67f..97d3890 100644
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2009 Free Software Foundation, Inc.
+# Copyright (C) 2002-2010 Free Software Foundation, Inc.
 #
 # This file is free software, distributed under the terms of the GNU
 # General Public License.  As a special exception to the GNU General
-- 
1.6.4.2


From e673fde780548fcdd5bd13358cc5a8a46e27d8e0 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Mon, 4 Jan 2010 16:04:24 -0700
Subject: [PATCH 3/3] Security fix by requiring newer automake features.

* configure.ac (AM_INIT_AUTOMAKE): Add dist-xz, color-tests,
parallel-tests, and silent-rules.
(AC_PREREQ): Bump autoconf requirement to 2.62, per automake.
* HACKING: Update minimum requirements.
* NEWS: Document the fix.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog    |    7 +++++++
 HACKING      |    4 ++--
 NEWS         |    6 +++++-
 configure.ac |    5 +++--
 4 files changed, 17 insertions(+), 5 deletions(-)

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

+       Security fix by requiring newer automake features.
+       * configure.ac (AM_INIT_AUTOMAKE): Add dist-xz, color-tests,
+       parallel-tests, and silent-rules.
+       (AC_PREREQ): Bump autoconf requirement to 2.62, per automake.
+       * HACKING: Update minimum requirements.
+       * NEWS: Document the fix.
+
        Drop hard-coding of GPG id.
        * gnulib: Update to latest.
        * m4/gnulib-cache.m4: Regenerate.
diff --git a/HACKING b/HACKING
index 86f9192..2b090f0 100644
--- a/HACKING
+++ b/HACKING
@@ -42,8 +42,8 @@ and is not part of a release distribution.

 * Before you can build from git, you need to bootstrap.  This requires:
   - A pre-installed version of GNU M4 1.4 or later, built from a package
-  - Autoconf 2.60 or later
-  - Automake 1.10.1 or later
+  - Autoconf 2.62 or later
+  - Automake 1.11.1 or later
   - Help2man 1.29 or later
   - Xz 4.999.8beta or later (from <http://tukaani.org/xz/>)
   - Texinfo 4.8 or later
diff --git a/NEWS b/NEWS
index eb51b11..5605144 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,7 @@ GNU M4 NEWS - User visible changes.
 Copyright (C) 1992, 1993, 1994, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 Free Software Foundation, Inc.

-* Noteworthy changes in Version 1.4.14 (2009-??-??) [stable]
+* Noteworthy changes in Version 1.4.14 (2010-??-??) [stable]
   Released by Eric Blake, based on git version 1.4.13.*

 ** Fix regression introduced in 1.4.12 where executing with stdout closed
@@ -12,6 +12,10 @@ Free Software Foundation, Inc.
    closed file descriptors could interfere with child execution, and where
    a child status of 127 made m4 print a spurious message to stderr.

+** Fix a security hole in 'make dist', present since at least M4 1.4, that
+   could affect anybody attempting to redistribute modified sources (see
+   Automake CVE-2009-4029).
+
 ** A number of portability improvements inherited from gnulib.

 * Noteworthy changes in Version 1.4.13 (2009-04-01) [stable]
diff --git a/configure.ac b/configure.ac
index c93d9d4..63e3ae0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,12 +17,13 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

-AC_PREREQ([2.60])
+AC_PREREQ([2.62])
 AC_INIT([GNU M4], m4_esyscmd([build-aux/git-version-gen .tarball-version]),
   address@hidden)
 AC_CONFIG_AUX_DIR([build-aux])

-AM_INIT_AUTOMAKE([1.10.1 dist-bzip2 gnu])
+AM_INIT_AUTOMAKE([1.11.1 dist-bzip2 dist-xz color-tests parallel-tests
+silent-rules gnu])

 m4_pattern_forbid([^M4_[A-Z]])

-- 
1.6.4.2

signature.asc
Description: OpenPGP digital signature