Ensure that "group --version" always prints the current year.

* src/groups.sh (version): Use @CURRENT_YEAR@, rather than 2006.
* src/Makefile.am (.sh): Also substitute for @CURRENT_YEAR@.
Suggestion from Eric Blake.

diff --git a/ChangeLog b/ChangeLog
index 50d56da..ac3be26 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-01-04  Jim Meyering  <jim@meyering.net>
 
+       Ensure that "group --version" always prints the current year.
+       * src/groups.sh (version): Use @CURRENT_YEAR@, rather than 2006.
+       * src/Makefile.am (.sh): Also substitute for @CURRENT_YEAR@.
+       Suggestion from Eric Blake.
+
        When decoding, always allow newlines in input, with almost no
        performance impact.
        * src/base64.c (do_decode): Initialize decode context.

diff --git a/src/Makefile.am b/src/Makefile.am
index 8c39ee0..ddd13ef 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,6 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
 
-## Copyright (C) 1990, 1991, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-## 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+## Copyright (C) 1990, 1991, 1993-2007 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
@@ -120,6 +119,7 @@ SUFFIXES = .sh
        rm -f $@ $@-t
        sed \
          -e 's!@''bindir''@!$(bindir)!' \
+         -e 's/@''CURRENT_YEAR'@/`date +%Y`/ \
          -e 's/@''GNU_PACKAGE''@/$(GNU_PACKAGE)/' \
          -e 's/@''PACKAGE_BUGREPORT''@/$(PACKAGE_BUGREPORT)/' \
          -e 's/@''VERSION''@/$(VERSION)/' $< > $@-t

diff --git a/src/groups.sh b/src/groups.sh
index 86343fc..f416fdb 100755 (executable)
--- a/src/groups.sh
+++ b/src/groups.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # groups -- print the groups a user is in
-# Copyright (C) 1991, 1997, 2000, 2002, 2004, 2006 Free Software Foundation, Inc.
+# Copyright (C) 1991, 1997, 2000, 2002, 2004-2007 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
@@ -32,7 +32,7 @@ Same as id -Gn.  If no USERNAME, use current process.
 Report bugs to <@PACKAGE_BUGREPORT@>."
 
 version='groups (@GNU_PACKAGE@) @VERSION@
-Copyright (C) 2006 Free Software Foundation, Inc.
+Copyright (C) @CURRENT_YEAR@ Free Software Foundation, Inc.
 This is free software.  You may redistribute copies of it under the terms of
 the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
 There is NO WARRANTY, to the extent permitted by law.