Generate the ChangeLog from commit logs.

* scripts/gitlog-to-changelog: New script.  Taken from gnulib.
* scripts/git-log-fix: New file.
* scripts/git-log-footer: New file.
* scripts/git-hooks/commit-msg: New script.
* autogen.sh: Install commit-msg hook for git.
* doc/HACKING: Describe the ChangeLog policy.
* ChangeLog: New file.
* Makefile.am (EXTRA_DIST): Add new files.
(gen-ChangeLog): New.
(dist-hook): Run gen-ChangeLog.

Rename all ChangeLog files to ChangeLog-2011.

Makefile.am

@@ -1,18 +1,18 @@
 # Makefile.am - main makefile for NewPG/GnuPG
 #     	Copyright (C) 2001, 2004 Free Software Foundation, Inc.
-# 
+#
 # This file is part of GnuPG.
-# 
+#
 # GnuPG is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # GnuPG is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
@@ -22,8 +22,10 @@ ACLOCAL_AMFLAGS = -I m4 -I gl/m4
 AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
 DISTCHECK_CONFIGURE_FLAGS = --enable-symcryptrun --enable-mailto --enable-gpgtar
 
-EXTRA_DIST = scripts/config.rpath autogen.sh README.SVN
+EXTRA_DIST = scripts/config.rpath autogen.sh README.SVN              \
-DISTCLEANFILES = g10defs.h 
+	     ChangeLog-2011 po/ChangeLog-2011 scripts/ChangeLog-2011
+
+DISTCLEANFILES = g10defs.h
 
 if BUILD_GPGSM
 kbx = kbx
@@ -37,7 +39,7 @@ gpg = g10
 keyserver = keyserver
 else
 gpg =
-keyserver = 
+keyserver =
 endif
 if BUILD_GPGSM
 sm = sm
@@ -77,10 +79,25 @@ SUBDIRS = m4 gl include jnlib common ${kbx} \
 dist_doc_DATA = README
 
 
-dist-hook:
+dist-hook: gen-ChangeLog
 	echo "$(VERSION)" > $(distdir)/VERSION
 
-stowinstall: 
+
+gen_start_date = 2011-12-01T06:00:00
+.PHONY: gen-ChangeLog
+gen-ChangeLog:
+	if test -d $(top_srcdir)/.git; then				\
+	  (cd $(top_srcdir) &&                      			\
+	    ./scripts/gitlog-to-changelog				\
+	    --amend=scripts/git-log-fix	 				\
+	    --since=$(gen_start_date) ) > $(distdir)/cl-t;		\
+          cat $(top_srcdir)/scripts/git-log-footer >> $(distdir)/cl-t;  \
+	  rm -f $(distdir)/ChangeLog;					\
+	  mv $(distdir)/cl-t $(distdir)/ChangeLog;			\
+	fi
+
+
+stowinstall:
 	$(MAKE) $(AM_MAKEFLAGS) install prefix=/usr/local/stow/gnupg
 
 

agent/ChangeLog-2011

@@ -1,3 +1,10 @@
+2011-12-02  Werner Koch  <wk@g10code.com>
+
+	NB: ChangeLog files are no longer manually maintained.  Starting
+	on December 1st, 2011 we put change information only in the GIT
+	commit log, and generate a top-level ChangeLog file from logs at
+	"make dist".  See doc/HACKING for details.
+
 2011-08-04  Werner Koch  <wk@g10code.com>
 
 	* command.c (cmd_keyinfo, do_one_keyinfo): Support options --data
@@ -1038,7 +1045,7 @@
 
 2006-09-14  Werner Koch  <wk@g10code.com>
 
- 	Replaced all call gpg_error_from_errno(errno) by
+	Replaced all call gpg_error_from_errno(errno) by
 	gpg_error_from_syserror().
 
 	* call-pinentry.c (start_pinentry): Replaced pipe_connect2 by

agent/Makefile.am

@@ -6,12 +6,12 @@
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # GnuPG is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
@@ -22,6 +22,7 @@ libexec_PROGRAMS = gpg-protect-tool gpg-preset-passphrase
 noinst_PROGRAMS = $(TESTS)
 
 # EXTRA_DIST = gpg-agent.ico gpg-agent-resource.rc
+EXTRA_DIST = ChangeLog-2011
 
 AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common -I$(top_srcdir)/intl
 
@@ -72,7 +73,7 @@ gpg_agent_DEPENDENCIES = $(gpg_agent_res_deps)
 gpg_protect_tool_SOURCES = \
 	protect-tool.c \
 	protect.c \
-	minip12.c minip12.h 
+	minip12.c minip12.h
 
 gpg_protect_tool_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS)
 gpg_protect_tool_LDADD = $(common_libs) $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) \
@@ -101,7 +102,7 @@ TESTS = t-protect
 t_common_ldadd = $(common_libs) \
                  $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV)
 
-t_protect_SOURCES = t-protect.c protect.c 
+t_protect_SOURCES = t-protect.c protect.c
 t_protect_LDADD = $(t_common_ldadd)
 
 

autogen.sh

@@ -199,7 +199,7 @@ EOF
 fi
 
 
-# Check the git setup.
+# Update the git setup.
 if [ -d .git ]; then
   if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
     cat <<EOF >&2
@@ -219,6 +219,13 @@ EOF
     git config --add filter.cleanpo.clean \
         "awk '/^\"POT-Creation-Date:/&&!s{s=1;next};!/^#: /{print}'"
   fi
+  if [ -f scripts/git-hooks/commit-msg -a ! -f .git/hooks/commit-msg ] ; then
+    cat <<EOF >&2
+*** Activating commit log message check hook. ***
+EOF
+      cp -av scripts/git-hooks/commit-msg .git/hooks/commit-msg
+      chmod -c +x  .git/hooks/commit-msg
+  fi
 fi
 
 

common/ChangeLog-2011

@@ -1,3 +1,10 @@
+2011-12-02  Werner Koch  <wk@g10code.com>
+
+	NB: ChangeLog files are no longer manually maintained.  Starting
+	on December 1st, 2011 we put change information only in the GIT
+	commit log, and generate a top-level ChangeLog file from logs at
+	"make dist".  See doc/HACKING for details.
+
 2011-08-04  Werner Koch  <wk@g10code.com>
 
 	* ssh-utils.c, ssh-utils.h: New.

common/Makefile.am

@@ -19,7 +19,7 @@
 ## Process this file with automake to produce Makefile.in
 
 EXTRA_DIST = mkstrtable.awk exaudit.awk exstatus.awk \
-             audit-events.h status-codes.h
+             audit-events.h status-codes.h ChangeLog-2011
 
 noinst_LIBRARIES = libcommon.a libcommonpth.a libsimple-pwquery.a libgpgrl.a
 noinst_PROGRAMS = $(module_tests) $(module_maint_tests)

doc/ChangeLog-2011

@@ -1,3 +1,10 @@
+2011-12-02  Werner Koch  <wk@g10code.com>
+
+	NB: ChangeLog files are no longer manually maintained.  Starting
+	on December 1st, 2011 we put change information only in the GIT
+	commit log, and generate a top-level ChangeLog file from logs at
+	"make dist".  See doc/HACKING for details.
+
 2011-01-13  Werner Koch  <wk@g10code.com>
 
 	* FAQ: Make it a static file with a pointer to the online location.
@@ -139,7 +146,7 @@
 
 	* qualified.txt: Add new BnetzA certs 12R and 13R.
 	* com-certs.pem: Ditto.
-	* examples/trustlist.txt: Ditto. 
+	* examples/trustlist.txt: Ditto.
 
 2008-06-19  Werner Koch  <wk@g10code.com>
 
@@ -425,7 +432,7 @@
 
 2007-02-18  Werner Koch  <wk@g10code.com>
 
-	* gpg.texi (GPG Esoteric Options): No card reader options for gpg2. 
+	* gpg.texi (GPG Esoteric Options): No card reader options for gpg2.
 
 2007-02-14  Werner Koch  <wk@g10code.com>
 
@@ -500,7 +507,7 @@
 
 	* instguide.texi (Installation): New.
 	* assuan.texi (Assuan): Removed.  Use the libassuan manual instead.
-	* gnupg.texi: Reflect these changes. 
+	* gnupg.texi: Reflect these changes.
 
 	* gpg.texi: Make some parts depend on the "gpgone" set
 	command. This allows us to use the same source for gpg1 and gpg2.
@@ -655,7 +662,7 @@
 	* gnupg.texi: Include gpg.texi
 
 	* tools.texi: Add a few @command markups.
-	* gpgsm.texi: Ditto 
+	* gpgsm.texi: Ditto.
 	* gpg-agent.texi: Ditto.
 	* scdaemon.texi: Ditto.
 
@@ -673,7 +680,7 @@
 	expected pinentry filename.
 
         Changed license of the manual stuff to GPL.
-	
+
 	* gnupg.texi (Top): New menu item Helper Tools.
 
 	* tools.texi (Helper Tools): New.
@@ -779,7 +786,7 @@
 2002-05-14  Werner Koch  <wk@gnupg.org>
 
 	* Makefile.am, gpgsm.texi: New.
-	
+
  Copyright 2002, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
  This file is free software; as a special exception the author gives

doc/HACKING

@@ -3,7 +3,31 @@
 		   (Some notes on GNUPG internals.)
 
 
-		   ===> Under construction <=======
+* No more ChangeLog files
+
+Do not modify any of the ChangeLog files in GnuPG.  Starting on
+December 1st, 2011 we put change information only in the GIT commit
+log, and generate a top-level ChangeLog file from logs at "make dist"
+time.  As such, there are strict requirements on the form of the
+commit log messages.  The old ChangeLog files have all be renamed to
+ChangeLog-2011
+
+
+* Commit log requirements
+
+Your commit log should always start with a one-line summary, the second
+line should be blank, and the remaining lines are usually ChangeLog-style
+entries for all affected files.  However, it's fine -- even recommended --
+to write a few lines of prose describing the change, when the summary
+and ChangeLog entries don't give enough of the big picture.  Omit the
+leading TABs that you're used to seeing in a "real" ChangeLog file, but
+keep the maximum line length at 72 or smaller, so that the generated
+ChangeLog lines, each with its leading TAB, will not exceed 80 columns.
+
+
+
+===> What follows is probably out of date <===
+
 
 
 RFCs
@@ -63,7 +87,7 @@ g10/keydb.h
 g10/keyid.c	Helper functions to get the keyid, fingerprint etc.
 
 
-g10/trustdb.c    
+g10/trustdb.c
 g10/trustdb.h
 g10/tdbdump.c
                Management of the trustdb.gpg
@@ -74,7 +98,7 @@ g10/delkey.c   Delete a key
 g10/kbnode.c   Helper for the KBNODE linked list
 g10/main.h     Prototypes and some constants
 g10/mainproc.c Message processing
-g10/armor.c    Ascii armor filter 
+g10/armor.c    Ascii armor filter
 g10/mdfilter.c Filter to calculate hashs
 g10/textfilter.c Filter to handle CR/LF and trailing white space
 g10/cipher.c   En-/Decryption filter
@@ -88,7 +112,7 @@ g10/hkp.h      Keyserver access
 g10/hkp.c
 g10/packet.h   Defintion of OpenPGP structures.
 g10/passphrase.c  Passphrase handling code
-g10/pubkey-enc.c  
+g10/pubkey-enc.c
 g10/seckey-cert.c
 g10/seskey.c
 g10/import.c

doc/Makefile.am

@@ -28,7 +28,7 @@ helpfiles = help.txt help.be.txt help.ca.txt help.cs.txt		\
             help.pt_BR.txt help.ro.txt help.ru.txt help.sk.txt		\
             help.sv.txt help.tr.txt help.zh_CN.txt help.zh_TW.txt
 
-EXTRA_DIST = samplekeys.asc \
+EXTRA_DIST = samplekeys.asc ChangeLog-2011 \
 	     gnupg-logo.eps gnupg-logo.pdf gnupg-logo.png \
              gnupg-card-architecture.eps gnupg-card-architecture.png \
              gnupg-card-architecture.pdf \

g10/ChangeLog-2011

@@ -1,3 +1,10 @@
+2011-12-02  Werner Koch  <wk@g10code.com>
+
+	NB: ChangeLog files are no longer manually maintained.  Starting
+	on December 1st, 2011 we put change information only in the GIT
+	commit log, and generate a top-level ChangeLog file from logs at
+	"make dist".  See doc/HACKING for details.
+
 2011-08-04  Werner Koch  <wk@g10code.com>
 
 	* keyedit.c (show_key_with_all_names): Remove set but unused var
@@ -1377,7 +1384,7 @@
 	* status.h (STATUS_ERROR): New status code.
 	* status.c (get_status_string): Ditto.
 	* mainproc.c (proc_plaintext): Emit it if multiple messages are
- 	detected. Error out if more than one plaintext packet is
+	detected. Error out if more than one plaintext packet is
         encountered.
 	* mainproc.c (literals_seen): New.
 
@@ -1714,7 +1721,7 @@
 
 2006-09-14  Werner Koch  <wk@g10code.com>
 
- 	Replaced all call gpg_error_from_errno(errno) by
+	Replaced all call gpg_error_from_errno(errno) by
 	gpg_error_from_syserror().
 
 2006-09-13  Werner Koch  <wk@g10code.com>
@@ -3783,7 +3790,7 @@
 	* tdbio.c (MY_O_BINARY): Need binary mode with Cygwin.  From
 	Werner on stable branch.
 
-       	* g10.c, gpgv.c (main) [__CYGWIN32__]: Don't get the homedir from
+	* g10.c, gpgv.c (main) [__CYGWIN32__]: Don't get the homedir from
 	the registry.  From Werner on stable branch.
 
 	* keyedit.c (show_key_with_all_names_colon): Make --with-colons
@@ -7244,7 +7251,7 @@
 	(pk_from_block): Removed the namehash arg and changed all callers.
 	(merge_selfsigs): Copy prefs to all keys.
 	* trustdb.c (get_pref_data): Removed.
- 	(is_algo_in_prefs): Removed.
+	(is_algo_in_prefs): Removed.
 	(make_pref_record): Deleted and removed all class.
 	* pkclist.c (select_algo_from_prefs): Adjusted for the new
 	preference implementation.

g10/Makefile.am

@@ -7,27 +7,27 @@
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # GnuPG is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 ## Process this file with automake to produce Makefile.in
 
-EXTRA_DIST = options.skel
+EXTRA_DIST = options.skel ChangeLog-2011
 
 AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common \
-              -I$(top_srcdir)/include -I$(top_srcdir)/intl 
+              -I$(top_srcdir)/include -I$(top_srcdir)/intl
 
 include $(top_srcdir)/am/cmacros.am
 
 AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS)
 
-needed_libs = $(libcommon) ../jnlib/libjnlib.a ../gl/libgnu.a 
+needed_libs = $(libcommon) ../jnlib/libjnlib.a ../gl/libgnu.a
 
 bin_PROGRAMS = gpg2 gpgv2
 noinst_PROGRAMS = $(module_tests)
@@ -69,7 +69,7 @@ common_source =  \
 	      plaintext.c	\
 	      sig-check.c	\
 	      keylist.c 	\
-	      pkglue.c pkglue.h 
+	      pkglue.c pkglue.h
 
 gpg2_SOURCES  = gpg.c		\
 	      server.c          \
@@ -107,7 +107,7 @@ gpg2_SOURCES  = gpg.c		\
 
 gpgv2_SOURCES = gpgv.c           \
 	      $(common_source)  \
-	      verify.c          
+	      verify.c
 
 #gpgd_SOURCES = gpgd.c \
 #	       ks-proto.h \
@@ -124,7 +124,7 @@ gpg2_LDADD =  $(LDADD) $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \
 gpgv2_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \
 	      $(LIBICONV)
 
-t_common_ldadd = 
+t_common_ldadd =
 module_tests = t-rmd160
 t_rmd160_SOURCES = t-rmd160.c rmd160.c
 t_rmd160_LDADD = $(t_common_ldadd)
@@ -138,4 +138,4 @@ install-data-local:
 				$(DESTDIR)$(pkgdatadir)/gpg-conf.skel
 
 uninstall-local:
-	-@rm $(DESTDIR)$(pkgdatadir)/gpg-conf.skel        
+	-@rm $(DESTDIR)$(pkgdatadir)/gpg-conf.skel

include/ChangeLog-2011

@@ -1,3 +1,10 @@
+2011-12-02  Werner Koch  <wk@g10code.com>
+
+	NB: ChangeLog files are no longer manually maintained.  Starting
+	on December 1st, 2011 we put change information only in the GIT
+	commit log, and generate a top-level ChangeLog file from logs at
+	"make dist".  See doc/HACKING for details.
+
 2011-07-01  Werner Koch  <wk@g10code.com>
 
 	* cipher.h (PUBKEY_ALGO_ECDH, PUBKEY_ALGO_ECDSA): New.

include/Makefile.am

@@ -1 +1 @@
-EXTRA_DIST = cipher.h types.h host2net.h _regex.h 
+EXTRA_DIST = cipher.h types.h host2net.h _regex.h ChangeLog-2011

jnlib/ChangeLog-2011

@@ -1,3 +1,10 @@
+2011-12-02  Werner Koch  <wk@g10code.com>
+
+	NB: ChangeLog files are no longer manually maintained.  Starting
+	on December 1st, 2011 we put change information only in the GIT
+	commit log, and generate a top-level ChangeLog file from logs at
+	"make dist".  See doc/HACKING for details.
+
 2009-08-26  Werner Koch  <wk@g10code.com>
 
 	* stringhelp.c (do_make_filename): Factor some code out to ..
@@ -52,7 +59,7 @@
 
 2009-01-22  Werner Koch  <wk@g10code.com>
 
-	* t-support.c (gpg_err_code_from_errno) 
+	* t-support.c (gpg_err_code_from_errno)
 	(gpg_err_code_from_syserror): New.
 
 2008-11-20  Werner Koch  <wk@g10code.com>
@@ -95,7 +102,7 @@
 
 	* stringhelp.c (make_basename): Silent gcc warning about unused arg.
 	* argparse.c (store_alias): Ditto.
-	(find_long_option): 
+	(find_long_option):
 
 2008-10-15  Werner Koch  <wk@g10code.com>
 
@@ -282,7 +289,7 @@
 	* stringhelp.c (strsep): New. Copied from gnupg 1.4.5
 	util/strgutil.c.
 
-	* strlist.h (STRLIST): Removed deprecated typedef. 
+	* strlist.h (STRLIST): Removed deprecated typedef.
 
 	* types.h: Made cpp commands work with old compilers.  Also shows
 	up nicer with Emacs' font locking.
@@ -292,14 +299,14 @@
         Changed license from GPL to LGPL.  Note that all code has either
 	been written by me, David, employees of g10 Code or taken from
 	glibc.
-	
+
 	* libjnlib-config.h, stringhelp.c, stringhelp.h:
 	* strlist.c, strlist.h,	utf8conv.c, utf8conv.h:
 	* argparse.c, argparse.h, logging.c, logging.h:
 	* dotlock.c, dotlock.h, types.h, mischelp.h:
         * xmalloc.c, xmalloc.h, w32-pth.c, w32-pth.h:
 	* w32-afunix.c, w32-afunix.h: Tagged them to be long to jnlib
-	which is a part of GnuPG but also used by other projetcs. 
+	which is a part of GnuPG but also used by other projetcs.
 
 2006-09-22  Werner Koch  <wk@g10code.com>
 
@@ -427,10 +434,10 @@
 	(_pth_strerror): New.
 	(do_pth_wait): Before we enter the loop we check if there
 	are too much events in the ring.
-	
+
 2004-12-14  Werner Koch  <wk@g10code.com>
 
-	* w32-pth.h (pth_event_occured): Removed macro. 
+	* w32-pth.h (pth_event_occured): Removed macro.
 	* w32-pth.c: Fixed license statement; its under the LGPL.
 	(enter_pth, leave_pth): Use them to bracket almost all public
 	functions.
@@ -442,7 +449,7 @@
 	(pth_kill): Release global mutex section.
 	(helper_thread): New.
 	(pth_spawn): Make sure only one thread is running.
-	
+
 2004-12-13  Werner Koch  <wk@g10code.com>
 
 	* stringhelp.c (w32_strerror) [W32]: New.
@@ -462,7 +469,7 @@
 
 	* w32-afunix.c: New. AF_UNIX emulation for W32.
 	* w32-afunix.h: Likewise.
-	
+
 2004-11-22  Werner Koch  <wk@g10code.com>
 
 	* logging.c (log_test_fd): Add test on LOGSTREAM.  Reported by
@@ -573,7 +580,7 @@
 
 2003-06-13  Werner Koch  <wk@gnupg.org>
 
-	* mischelp.h (wipememory2,wipememory): New. Taken from GnuPG 1.3.2. 
+	* mischelp.h (wipememory2,wipememory): New. Taken from GnuPG 1.3.2.
 
 2002-06-04  Werner Koch  <wk@gnupg.org>
 
@@ -627,7 +634,7 @@
 	* logging.c (log_set_prefix): New.
 	(do_logv): Include prefix and pid only if enabled. Print time only
 	when explicitly enabled.
-	(log_logv): New.  
+	(log_logv): New.
 	* logging.h: Include log_logv() only when requested.
 
 2001-11-06  Werner Koch  <wk@gnupg.org>
@@ -688,8 +695,8 @@ Mon Jan 24 13:04:28 CET 2000  Werner Koch  <wk@gnupg.de>
      ***********************************************************
      * Please note that JNLIB is maintained as part of GnuPG.  *
      * You may find it source-copied in other packages.        *
-     ***********************************************************	
+     ***********************************************************
-	
+
  Copyright 2000, 2001, 2002, 2003, 2004,
 	   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 

jnlib/Makefile.am

@@ -1,26 +1,26 @@
 # Makefile for the JNLIB part of GnuPG
 # Copyright (C) 1999, 2000, 2001, 2004,
 #               2006 Feee Software Soundation, Inc.
-# 
+#
 # This file is part of JNLIB.
-# 
+#
 # JNLIB is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as
 # published by the Free Software Foundation; either version 3 of
 # the License, or (at your option) any later version.
-# 
+#
 # JNLIB is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Lesser General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public
 # License along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 
 ## Process this file with automake to produce Makefile.in
 
-EXTRA_DIST = README
+EXTRA_DIST = README ChangeLog-2011
 noinst_PROGRAMS = $(module_tests)
 TESTS = $(module_tests)
 
@@ -49,7 +49,7 @@ endif
 
 
 # For GnuPG we don't need the xmalloc stuff.
-#       xmalloc.c xmalloc.h       
+#       xmalloc.c xmalloc.h
 
 
 #
@@ -62,7 +62,7 @@ endif
 #
 module_tests = t-stringhelp
 
-t_jnlib_src = t-support.c t-support.h 
+t_jnlib_src = t-support.c t-support.h
 t_jnlib_ldadd = libjnlib.a $(LIBINTL) $(LIBICONV)
 
 t_stringhelp_SOURCES = t-stringhelp.c $(t_jnlib_src)

kbx/ChangeLog-2011

@@ -1,3 +1,10 @@
+2011-12-02  Werner Koch  <wk@g10code.com>
+
+	NB: ChangeLog files are no longer manually maintained.  Starting
+	on December 1st, 2011 we put change information only in the GIT
+	commit log, and generate a top-level ChangeLog file from logs at
+	"make dist".  See doc/HACKING for details.
+
 2011-08-04  Werner Koch  <wk@g10code.com>
 
 	* keybox-openpgp.c (parse_key): Remove set but unused vars
@@ -117,7 +124,7 @@
 
 2006-09-14  Werner Koch  <wk@g10code.com>
 
- 	Replaced all call gpg_error_from_errno(errno) by
+	Replaced all call gpg_error_from_errno(errno) by
 	gpg_error_from_syserror().
 
 2005-10-08  Marcus Brinkmann  <marcus@g10code.de>

kbx/Makefile.am

@@ -1,4 +1,4 @@
-# Keybox Makefile 
+# Keybox Makefile
 # Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
 #
 # This file is part of GnuPG.
@@ -7,12 +7,12 @@
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # GnuPG is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
@@ -21,7 +21,7 @@
 localedir = $(datadir)/locale
 INCLUDES = -I../intl -DLOCALEDIR=\"$(localedir)\"
 
-EXTRA_DIST = mkerrors
+EXTRA_DIST = mkerrors ChangeLog-2011
 AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common -I$(top_srcdir)/intl \
 	       $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS)
 
@@ -37,7 +37,7 @@ common_sources = \
 	keybox-search.c \
 	keybox-update.c \
 	keybox-openpgp.c \
-	keybox-dump.c 
+	keybox-dump.c
 
 
 libkeybox_a_SOURCES = $(common_sources)
@@ -50,4 +50,4 @@ kbxutil_LDADD   = ../common/libcommon.a ../jnlib/libjnlib.a ../gl/libgnu.a \
                   $(KSBA_LIBS) $(LIBGCRYPT_LIBS) \
                   $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV) $(W32SOCKLIBS)
 
-$(PROGRAMS) : ../common/libcommon.a ../jnlib/libjnlib.a ../gl/libgnu.a 
+$(PROGRAMS) : ../common/libcommon.a ../jnlib/libjnlib.a ../gl/libgnu.a

keyserver/ChangeLog-2011

@@ -1,3 +1,10 @@
+2011-12-02  Werner Koch  <wk@g10code.com>
+
+	NB: ChangeLog files are no longer manually maintained.  Starting
+	on December 1st, 2011 we put change information only in the GIT
+	commit log, and generate a top-level ChangeLog file from logs at
+	"make dist".  See doc/HACKING for details.
+
 2009-08-26  Werner Koch  <wk@g10code.com>
 
 	* gpgkeys_hkp.c: Include util.h.
@@ -86,7 +93,7 @@
 	* curl-shim.c (curl_easy_init) [HAVE_W32_SYSTEM]: Call it.
 	* gpgkeys_finger.c: s/_WIN32/HAVE_W32_SYSTEM/.
 	(init_sockets): Remove.
-	(connect_server) [HAVE_W32_SYSTEM]: Call new function.  
+	(connect_server) [HAVE_W32_SYSTEM]: Call new function.
 
 2008-04-14  David Shaw  <dshaw@jabberwocky.com>
 
@@ -99,7 +106,7 @@
 2008-04-07  Werner Koch  <wk@g10code.com>
 
 	* gpgkeys_kdns.c: New.
-	* Makefile.am: Support kdns. 
+	* Makefile.am: Support kdns.
 
 	* no-libgcrypt.c (gcry_strdup): Fix.  It was not used.
 
@@ -111,7 +118,7 @@
 2007-10-25  David Shaw  <dshaw@jabberwocky.com>  (wk)
 
 	From 1.4 (July):
-	
+
 	* gpgkeys_ldap.c (main): Fix bug in setting up whether to verify
 	peer SSL cert.  This used to work with older OpenLDAP, but is now
 	more strictly handled.
@@ -223,7 +230,7 @@
 	to OpenSSL.  This is considered a bug fix and forgives all
 	possible violations, pertaining to this issue, possibly occured in
 	the past.
-	
+
 	* no-libgcrypt.c: Changed license to a simple all permissive one.
 
 	* Makefile.am (gpg2keys_ldap_LDADD): For license reasons do not
@@ -239,7 +246,7 @@
 	mismatch.
 
 2006-09-19  Werner Koch  <wk@g10code.com>
-	
+
 	* no-libgcrypt.c: New. Taken from ../tools.
 	* Makefile.am: Add no-libgcrypt to all sources.
 
@@ -708,7 +715,7 @@
 
 2004-10-28  Werner Koch  <wk@g10code.com>
 
-	* Makefile.am (other_libs): 
+	* Makefile.am (other_libs):
 
 2004-10-18  David Shaw  <dshaw@jabberwocky.com>
 

keyserver/Makefile.am

@@ -1,5 +1,5 @@
 # Makefile.am - Makefile for keyservers
-# Copyright (C) 2001, 2002, 2004, 2005, 2006, 
+# Copyright (C) 2001, 2002, 2004, 2005, 2006,
 #               2009 Free Software Foundation, Inc.
 #
 # This file is part of GnuPG.
@@ -8,12 +8,12 @@
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # GnuPG is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 ## Process this file with automake to produce Makefile.in
@@ -26,7 +26,9 @@ EXTRA_PROGRAMS = gpg2keys_ldap gpg2keys_hkp gpg2keys_finger gpg2keys_curl \
 		 gpg2keys_kdns
 EXTRA_SCRIPTS = gpg2keys_mailto
 
-AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common -I$(top_srcdir)/intl 
+EXTRA_DIST = ChangeLog-2011
+
+AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common -I$(top_srcdir)/intl
 
 AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS)
 
@@ -62,11 +64,11 @@ if FAKE_CURL
 gpg2keys_curl_SOURCES += curl-shim.c curl-shim.h
 gpg2keys_curl_CPPFLAGS = $(AM_CPPFLAGS)
 gpg2keys_curl_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(NETLIBS) $(DNSLIBS) \
-	              $(other_libs) 
+	              $(other_libs)
 gpg2keys_hkp_SOURCES += curl-shim.c curl-shim.h
 gpg2keys_hkp_CPPFLAGS = $(AM_CPPFLAGS)
 gpg2keys_hkp_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(NETLIBS) $(DNSLIBS) \
-	             $(other_libs) 
+	             $(other_libs)
 else
 # Note that we need to include all other libs here as well because
 # some compilers don't care about inline functions and insert

m4/ChangeLog-2011

@@ -1,3 +1,10 @@
+2011-12-02  Werner Koch  <wk@g10code.com>
+
+	NB: ChangeLog files are no longer manually maintained.  Starting
+	on December 1st, 2011 we put change information only in the GIT
+	commit log, and generate a top-level ChangeLog file from logs at
+	"make dist".  See doc/HACKING for details.
+
 2011-09-12  Werner Koch  <wk@g10code.com>
 
 	* libcurl.m4: Fix lost hash sign introduced by previous change.
@@ -150,4 +157,3 @@
 	* uintmax_t.m4: New file, from gettext-0.11.5.
 	* ulonglong.m4: New file, from gettext-0.11.5.
 	* Makefile.am: New file.
-

m4/Makefile.am

@@ -12,6 +12,8 @@ EXTRA_DIST += estream.m4
 
 EXTRA_DIST += sys_socket_h.m4 socklen.m4
 
+EXTRA_DIST += ChangeLog-2011
+
 
 
 

po/ChangeLog-2011

@@ -1,3 +1,10 @@
+2011-12-02  Werner Koch  <wk@g10code.com>
+
+	NB: ChangeLog files are no longer manually maintained.  Starting
+	on December 1st, 2011 we put change information only in the GIT
+	commit log, and generate a top-level ChangeLog file from logs at
+	"make dist".  See doc/HACKING for details.
+
 2011-01-12  Jakub Bogusz <qboosh@pld-linux.org>  (wk)
 
 	* pl.po: Update.
@@ -193,7 +200,7 @@
 	package name mangling breaks make distcheck as it tries to rebuild
 	the po file with the "correct" name.  The upshot is never to use
 	GNU in you po directory.
- 
+
 	* de.po: Fix a few fuzzy entries and translate new strings.
 
 2007-07-04  Werner Koch  <wk@g10code.com>
@@ -317,7 +324,7 @@
 	* POTFILES.in: New.
 	* de.po: New.
 
-	
+
  Copyright 2002, 2003, 2004, 2005, 2009 Free Software Foundation, Inc.
 
  This file is free software; as a special exception the author gives
@@ -327,5 +334,3 @@
  This file is distributed in the hope that it will be useful, but
  WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-		
-

scd/ChangeLog-2011

@@ -1,3 +1,10 @@
+2011-12-02  Werner Koch  <wk@g10code.com>
+
+	NB: ChangeLog files are no longer manually maintained.  Starting
+	on December 1st, 2011 we put change information only in the GIT
+	commit log, and generate a top-level ChangeLog file from logs at
+	"make dist".  See doc/HACKING for details.
+
 2011-08-04  Werner Koch  <wk@g10code.com>
 
 	* pcsc-wrapper.c (handle_open): Remove unused var LISTLEN.
@@ -931,7 +938,7 @@
 
 2006-09-14  Werner Koch  <wk@g10code.com>
 
- 	Replaced all call gpg_error_from_errno(errno) by
+	Replaced all call gpg_error_from_errno(errno) by
 	gpg_error_from_syserror().
 
 	* command.c (scd_command_handler): Replaced

scd/Makefile.am

@@ -6,22 +6,24 @@
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # GnuPG is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 ## Process this file with automake to produce Makefile.in
 
-bin_PROGRAMS = scdaemon 
+bin_PROGRAMS = scdaemon
 if ! HAVE_W32_SYSTEM
 libexec_PROGRAMS = gnupg-pcsc-wrapper
 endif
 
+EXTRA_DIST = ChangeLog-2011
+
 AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/common
 
 include $(top_srcdir)/am/cmacros.am
@@ -66,4 +68,4 @@ scdaemon_LDADD = $(libcommonpth) ../jnlib/libjnlib.a ../gl/libgnu.a \
 #
 gnupg_pcsc_wrapper_SOURCES = pcsc-wrapper.c
 gnupg_pcsc_wrapper_LDADD = $(DL_LIBS)
-gnupg_pcsc_wrapper_CFLAGS = 
+gnupg_pcsc_wrapper_CFLAGS =

scripts/ChangeLog-2011

@@ -1,3 +1,10 @@
+2011-12-02  Werner Koch  <wk@g10code.com>
+
+	NB: ChangeLog files are no longer manually maintained.  Starting
+	on December 1st, 2011 we put change information only in the GIT
+	commit log, and generate a top-level ChangeLog file from logs at
+	"make dist".  See doc/HACKING for details.
+
 2011-07-22  Werner Koch  <wk@g10code.com>
 
 	* config.sub, config.guess: Update to version 2011-06-03.
@@ -43,5 +50,3 @@
  This file is distributed in the hope that it will be useful, but
  WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-

scripts/git-hooks/commit-msg

@@ -0,0 +1,127 @@
+eval '(exit $?0)' && eval 'exec perl -w "$0" ${1+"$@"}'
+  & eval 'exec perl -w "$0" $argv:q'
+    if 0;
+
+# An hook script to check the commit log message.
+# Called by "git commit" with one argument, the name of the file
+# that has the commit message.  The hook should exit with non-zero
+# status after issuing an appropriate message if it wants to stop the
+# commit.  The hook is allowed to edit the commit message file.
+#
+# To enable this hook, copy it to "~/.git/hooks/commit-msg".
+#
+# This script is based on the one from GNU coreutils.
+
+use strict;
+use warnings;
+(my $ME = $0) =~ s|.*/||;
+
+my $editor = $ENV{EDITOR} || 'vi';
+$ENV{PATH} = '/bin:/usr/bin';
+
+# Rewrite the $LOG_FILE (old contents in @$LINE_REF) with an additional
+# commented diagnostic "# $ERR" line at the top.
+sub rewrite($$$)
+{
+  my ($log_file, $err, $line_ref) = @_;
+  local *LOG;
+  open LOG, '>', $log_file
+    or die "$ME: $log_file: failed to open for writing: $!";
+  print LOG "# $err";
+  print LOG @$line_ref;
+  close LOG
+    or die "$ME: $log_file: failed to rewrite: $!\n";
+}
+
+sub re_edit($)
+{
+  my ($log_file) = @_;
+
+  warn "Interrupt (Ctrl-C) to abort...\n";
+
+  system 'sh', '-c', "$editor $log_file";
+  ($? & 127) || ($? >> 8)
+    and die "$ME: $log_file: the editor ($editor) failed, aborting\n";
+}
+
+# Given a $LOG_FILE name and a \@LINE buffer,
+# read the contents of the file into the buffer and analyze it.
+# If the log message passes muster, return the empty string.
+# If not, return a diagnostic.
+sub check_msg($$)
+{
+  my ($log_file, $line_ref) = @_;
+
+  local *LOG;
+  open LOG, '<', $log_file
+    or return "failed to open for reading: $!";
+  @$line_ref = <LOG>;
+  close LOG;
+
+  my @line = @$line_ref;
+  chomp @line;
+
+  # Don't filter out blank or comment lines; git does that already,
+  # and if we were to ignore them here, it could lead to committing
+  # with lines that start with "#" in the log.
+
+  # Filter out leading blank and comment lines.
+  # while (@line && $line[0] =~ /^(?:#.*|[ \t]*)$/) { shift @line; }
+
+  # Filter out blank and comment lines at EOF.
+  # while (@line && $line[$#line] =~ /^(?:#.*|[ \t]*)$/) { pop @line; }
+
+  @line == 0
+    and return 'no log message';
+
+  # The first line should not be too short
+  8 < length $line[0] || return 'summary line too short';
+
+  # The first line should not start with an asterisk or a hash sign.
+  # An asterisk might indicate that a change entry was started right
+  # at the first line.
+  $line[0] =~ /^[*#]/ && return "summary line starts with an * or #";
+
+  # Second line should be blank or not present.
+  2 <= @line && length $line[1]
+    and return 'second line must be empty';
+
+  # Limit line length to allow for the ChangeLog's leading TAB.
+  foreach my $line (@line)
+    {
+      72 < length $line && $line =~ /^[^#]/
+        and return 'line longer than 72 characters';
+    }
+
+  return '';
+}
+
+{
+  @ARGV == 1
+    or die;
+
+  my $log_file = $ARGV[0];
+
+  while (1)
+    {
+      my @line;
+      my $err = check_msg $log_file, \@line;
+      $err eq ''
+        and last;
+      $err = "$ME: $err\n";
+      warn $err;
+      exit 1;
+
+      # Insert the diagnostic as a comment on the first line of $log_file.
+      #rewrite $log_file, $err, \@line;
+      #re_edit $log_file;
+      #
+      ## Stop if our parent is killed.
+      #getppid() == 1
+      #  and last;
+    }
+}
+
+# Local Variables:
+# mode: perl
+# End:

scripts/git-log-fix

@@ -0,0 +1,3 @@
+# This file is expected to be used via gitlog-to-changelog's --amend=FILE
+# option.  It specifies what changes to make to each given SHA1's commit
+# log and metadata, using Perl-eval'able expressions.

scripts/git-log-footer

@@ -0,0 +1,15 @@
+
+2011-12-01  Werner Koch  <wk@gnupg.org>
+
+	NB: Changes done before December 1st, 2011 are described in
+	per directory files named ChangeLog-2011.  See doc/HACKING for
+	details.
+
+        -----
+	Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+	              2010, 2011 Free Software Foundation, Inc.
+
+	Copying and distribution of this file and/or the original GIT
+	commit log messages, with or without modification, are
+	permitted provided the copyright notice and this notice are
+	preserved.

scripts/gitlog-to-changelog

@@ -0,0 +1,345 @@
+eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}'
+  & eval 'exec perl -wS "$0" $argv:q'
+    if 0;
+# Convert git log output to ChangeLog format.
+
+my $VERSION = '2011-11-02 07:53'; # UTC
+# The definition above must lie within the first 8 lines in order
+# for the Emacs time-stamp write hook (at end) to update it.
+# If you change this file with Emacs, please let the write hook
+# do its job.  Otherwise, update this string manually.
+
+# Copyright (C) 2008-2011 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Written by Jim Meyering
+
+use strict;
+use warnings;
+use Getopt::Long;
+use POSIX qw(strftime);
+
+(my $ME = $0) =~ s|.*/||;
+
+# use File::Coda; # http://meyering.net/code/Coda/
+END {
+  defined fileno STDOUT or return;
+  close STDOUT and return;
+  warn "$ME: failed to close standard output: $!\n";
+  $? ||= 1;
+}
+
+sub usage ($)
+{
+  my ($exit_code) = @_;
+  my $STREAM = ($exit_code == 0 ? *STDOUT : *STDERR);
+  if ($exit_code != 0)
+    {
+      print $STREAM "Try `$ME --help' for more information.\n";
+    }
+  else
+    {
+      print $STREAM <<EOF;
+Usage: $ME [OPTIONS] [ARGS]
+
+Convert git log output to ChangeLog format.  If present, any ARGS
+are passed to "git log".  To avoid ARGS being parsed as options to
+$ME, they may be preceded by '--'.
+
+OPTIONS:
+
+   --amend=FILE FILE maps from an SHA1 to perl code (i.e., s/old/new/) that
+                  makes a change to SHA1's commit log text or metadata.
+   --append-dot append a dot to the first line of each commit message if
+                  there is no other punctuation or blank at the end.
+   --since=DATE convert only the logs since DATE;
+                  the default is to convert all log entries.
+   --format=FMT set format string for commit subject and body;
+                  see 'man git-log' for the list of format metacharacters;
+                  the default is '%s%n%b%n'
+
+   --help       display this help and exit
+   --version    output version information and exit
+
+EXAMPLE:
+
+  $ME --since=2008-01-01 > ChangeLog
+  $ME -- -n 5 foo > last-5-commits-to-branch-foo
+
+In a FILE specified via --amend, comment lines (starting with "#") are ignored.
+FILE must consist of <SHA,CODE+> pairs where SHA is a 40-byte SHA1 (alone on
+a line) referring to a commit in the current project, and CODE refers to one
+or more consecutive lines of Perl code.  Pairs must be separated by one or
+more blank line.
+
+Here is sample input for use with --amend=FILE, from coreutils:
+
+3a169f4c5d9159283548178668d2fae6fced3030
+# fix typo in title:
+s/all tile types/all file types/
+
+1379ed974f1fa39b12e2ffab18b3f7a607082202
+# Due to a bug in vc-dwim, I mis-attributed a patch by Paul to myself.
+# Change the author to be Paul.  Note the escaped "@":
+s,Jim .*>,Paul Eggert <eggert\@cs.ucla.edu>,
+
+EOF
+    }
+  exit $exit_code;
+}
+
+# If the string $S is a well-behaved file name, simply return it.
+# If it contains white space, quotes, etc., quote it, and return the new string.
+sub shell_quote($)
+{
+  my ($s) = @_;
+  if ($s =~ m![^\w+/.,-]!)
+    {
+      # Convert each single quote to '\''
+      $s =~ s/\'/\'\\\'\'/g;
+      # Then single quote the string.
+      $s = "'$s'";
+    }
+  return $s;
+}
+
+sub quoted_cmd(@)
+{
+  return join (' ', map {shell_quote $_} @_);
+}
+
+# Parse file F.
+# Comment lines (starting with "#") are ignored.
+# F must consist of <SHA,CODE+> pairs where SHA is a 40-byte SHA1
+# (alone on a line) referring to a commit in the current project, and
+# CODE refers to one or more consecutive lines of Perl code.
+# Pairs must be separated by one or more blank line.
+sub parse_amend_file($)
+{
+  my ($f) = @_;
+
+  open F, '<', $f
+    or die "$ME: $f: failed to open for reading: $!\n";
+
+  my $fail;
+  my $h = {};
+  my $in_code = 0;
+  my $sha;
+  while (defined (my $line = <F>))
+    {
+      $line =~ /^\#/
+        and next;
+      chomp $line;
+      $line eq ''
+        and $in_code = 0, next;
+
+      if (!$in_code)
+        {
+          $line =~ /^([0-9a-fA-F]{40})$/
+            or (warn "$ME: $f:$.: invalid line; expected an SHA1\n"),
+              $fail = 1, next;
+          $sha = lc $1;
+          $in_code = 1;
+          exists $h->{$sha}
+            and (warn "$ME: $f:$.: duplicate SHA1\n"),
+              $fail = 1, next;
+        }
+      else
+        {
+          $h->{$sha} ||= '';
+          $h->{$sha} .= "$line\n";
+        }
+    }
+  close F;
+
+  $fail
+    and exit 1;
+
+  return $h;
+}
+
+{
+  my $since_date;
+  my $format_string = '%s%n%b%n';
+  my $amend_file;
+  my $append_dot = 0;
+  GetOptions
+    (
+     help => sub { usage 0 },
+     version => sub { print "$ME version $VERSION\n"; exit },
+     'since=s' => \$since_date,
+     'format=s' => \$format_string,
+     'amend=s' => \$amend_file,
+     'append-dot' => \$append_dot,
+    ) or usage 1;
+
+
+  defined $since_date
+    and unshift @ARGV, "--since=$since_date";
+
+  # This is a hash that maps an SHA1 to perl code (i.e., s/old/new/)
+  # that makes a correction in the log or attribution of that commit.
+  my $amend_code = defined $amend_file ? parse_amend_file $amend_file : {};
+
+  my @cmd = (qw (git log --log-size),
+             '--pretty=format:%H:%ct  %an  <%ae>%n%n'.$format_string, @ARGV);
+  open PIPE, '-|', @cmd
+    or die ("$ME: failed to run `". quoted_cmd (@cmd) ."': $!\n"
+            . "(Is your Git too old?  Version 1.5.1 or later is required.)\n");
+
+  my $prev_date_line = '';
+  my @prev_coauthors = ();
+  while (1)
+    {
+      defined (my $in = <PIPE>)
+        or last;
+      $in =~ /^log size (\d+)$/
+        or die "$ME:$.: Invalid line (expected log size):\n$in";
+      my $log_nbytes = $1;
+
+      my $log;
+      my $n_read = read PIPE, $log, $log_nbytes;
+      $n_read == $log_nbytes
+        or die "$ME:$.: unexpected EOF\n";
+
+      # Extract leading hash.
+      my ($sha, $rest) = split ':', $log, 2;
+      defined $sha
+        or die "$ME:$.: malformed log entry\n";
+      $sha =~ /^[0-9a-fA-F]{40}$/
+        or die "$ME:$.: invalid SHA1: $sha\n";
+
+      # If this commit's log requires any transformation, do it now.
+      my $code = $amend_code->{$sha};
+      if (defined $code)
+        {
+          eval 'use Safe';
+          my $s = new Safe;
+          # Put the unpreprocessed entry into "$_".
+          $_ = $rest;
+
+          # Let $code operate on it, safely.
+          my $r = $s->reval("$code")
+            or die "$ME:$.:$sha: failed to eval \"$code\":\n$@\n";
+
+          # Note that we've used this entry.
+          delete $amend_code->{$sha};
+
+          # Update $rest upon success.
+          $rest = $_;
+        }
+
+      my @line = split "\n", $rest;
+      my $author_line = shift @line;
+      defined $author_line
+        or die "$ME:$.: unexpected EOF\n";
+      $author_line =~ /^(\d+)  (.*>)$/
+        or die "$ME:$.: Invalid line "
+          . "(expected date/author/email):\n$author_line\n";
+
+      my $date_line = sprintf "%s  $2\n", strftime ("%F", localtime ($1));
+
+      # Format 'Co-authored-by: A U Thor <email@example.com>' lines in
+      # standard multi-author ChangeLog format.
+      my @coauthors = grep /^Co-authored-by:.*$/, @line;
+      for (@coauthors)
+        {
+          s/^Co-authored-by:\s*/\t    /;
+          s/\s*</  </;
+
+          /<.*?@.*\..*>/
+            or warn "$ME: warning: missing email address for "
+              . substr ($_, 5) . "\n";
+        }
+
+      # If this header would be the same as the previous date/name/email/
+      # coauthors header, then arrange not to print it.
+      if ($date_line ne $prev_date_line or "@coauthors" ne "@prev_coauthors")
+        {
+          $prev_date_line eq ''
+            or print "\n";
+          print $date_line;
+          @coauthors
+            and print join ("\n", @coauthors), "\n";
+        }
+      $prev_date_line = $date_line;
+      @prev_coauthors = @coauthors;
+
+      # Omit "Co-authored-by..." and "Signed-off-by..." lines.
+      @line = grep !/^Signed-off-by: .*>$/, @line;
+      @line = grep !/^Co-authored-by: /, @line;
+
+      # Remove leading and trailing blank lines.
+      if (@line)
+        {
+          while ($line[0] =~ /^\s*$/) { shift @line; }
+          while ($line[$#line] =~ /^\s*$/) { pop @line; }
+        }
+
+      # If there were any lines
+      if (@line == 0)
+        {
+          warn "$ME: warning: empty commit message:\n  $date_line\n";
+        }
+      else
+        {
+          if ($append_dot)
+            {
+              # If the first line of the message has enough room, then
+              if (length $line[0] < 72)
+                {
+                  # append a dot if there is no other punctuation or blank
+                  # at the end.
+                  $line[0] =~ /[[:punct:]\s]$/
+                    or $line[0] .= '.';
+                }
+            }
+
+          # Prefix each non-empty line with a TAB.
+          @line = map { length $_ ? "\t$_" : '' } @line;
+
+          print "\n", join ("\n", @line), "\n";
+        }
+
+      defined ($in = <PIPE>)
+        or last;
+      $in ne "\n"
+        and die "$ME:$.: unexpected line:\n$in";
+    }
+
+  close PIPE
+    or die "$ME: error closing pipe from " . quoted_cmd (@cmd) . "\n";
+  # FIXME-someday: include $PROCESS_STATUS in the diagnostic
+
+  # Complain about any unused entry in the --amend=F specified file.
+  my $fail = 0;
+  foreach my $sha (keys %$amend_code)
+    {
+      warn "$ME:$amend_file: unused entry: $sha\n";
+      $fail = 1;
+    }
+
+  exit $fail;
+}
+
+# Local Variables:
+# mode: perl
+# indent-tabs-mode: nil
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "my $VERSION = '"
+# time-stamp-format: "%:y-%02m-%02d %02H:%02M"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "'; # UTC"
+# End:

sm/ChangeLog-2011

@@ -1,3 +1,10 @@
+2011-12-02  Werner Koch  <wk@g10code.com>
+
+	NB: ChangeLog files are no longer manually maintained.  Starting
+	on December 1st, 2011 we put change information only in the GIT
+	commit log, and generate a top-level ChangeLog file from logs at
+	"make dist".  See doc/HACKING for details.
+
 2011-08-04  Werner Koch  <wk@g10code.com>
 
 	* keydb.c (keydb_add_resource): Remove set but unused var
@@ -1025,7 +1032,7 @@ h2007-11-22  Werner Koch  <wk@g10code.com>
 
 2006-09-14  Werner Koch  <wk@g10code.com>
 
- 	Replaced all call gpg_error_from_errno(errno) by
+	Replaced all call gpg_error_from_errno(errno) by
 	gpg_error_from_syserror().
 
 2006-09-13  Werner Koch  <wk@g10code.com>

sm/Makefile.am

@@ -6,12 +6,12 @@
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # GnuPG is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
@@ -20,9 +20,11 @@
 
 bin_PROGRAMS = gpgsm
 
-AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) $(LIBASSUAN_CFLAGS) 
+EXTRA_DIST = ChangeLog-2011
 
-AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common -I$(top_srcdir)/intl 
+AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) $(LIBASSUAN_CFLAGS)
+
+AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common -I$(top_srcdir)/intl
 include $(top_srcdir)/am/cmacros.am
 
 

tests/ChangeLog-2011

@@ -1,3 +1,10 @@
+2011-12-02  Werner Koch  <wk@g10code.com>
+
+	NB: ChangeLog files are no longer manually maintained.  Starting
+	on December 1st, 2011 we put change information only in the GIT
+	commit log, and generate a top-level ChangeLog file from logs at
+	"make dist".  See doc/HACKING for details.
+
 2009-10-13  Werner Koch  <wk@g10code.com>
 
 	* asschk.c (die): Replace this vararg macro by C-89 compliant
@@ -12,7 +19,7 @@
 2008-10-20  Werner Koch  <wk@g10code.com>
 
 	* asschk.c (cmd_echo): Mark unused arg.
-	(cmd_send, cmd_expect_ok, cmd_expect_err, cmd_pipeserver) 
+	(cmd_send, cmd_expect_ok, cmd_expect_err, cmd_pipeserver)
 	(cmd_quit_if, cmd_fail_if): Ditto.
 
 2008-09-29  Werner Koch  <wk@g10code.com>
@@ -108,7 +115,7 @@
 
 	* Makefile.am: Fixes for make dist.
 	* samplekets/Makefile.am: New.
-	
+
 2002-08-08  Werner Koch  <wk@gnupg.org>
 
 	* asschk.c: Added some new features.
@@ -123,7 +130,7 @@
 
 	* Makefile.am, asschk.c: New.
 
-	
+
  Copyright 2002 Free Software Foundation, Inc.
 
  This file is free software; as a special exception the author gives
@@ -133,5 +140,3 @@
  This file is distributed in the hope that it will be useful, but
  WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-	
-

tests/Makefile.am

@@ -1,18 +1,18 @@
 # Makefile.am -tests makefile for libxtime
 #     	Copyright (C) 2002 Free Software Foundation, Inc.
-# 
+#
 # This file is part of GnuPG.
-# 
+#
 # GnuPG is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # GnuPG is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
@@ -37,7 +37,7 @@ TESTS_ENVIRONMENT = GNUPGHOME=`/bin/pwd` GPG_AGENT_INFO= LC_ALL=C \
 
 testscripts = sm-sign+verify sm-verify
 
-EXTRA_DIST = runtest inittests $(testscripts) \
+EXTRA_DIST = runtest inittests $(testscripts) ChangeLog-2011 \
 	     text-1.txt text-2.txt text-3.txt \
 	     text-1.osig.pem text-1.dsig.pem text-1.osig-bad.pem \
 	     text-2.osig.pem text-2.osig-bad.pem \
@@ -52,10 +52,10 @@ EXTRA_DIST = runtest inittests $(testscripts) \
 # write new tests based on gpg-connect-agent which has a full fledged
 # script language and thus makes it far easier to write tests than to
 # use the low--level asschk stuff.
-TESTS = 
+TESTS =
 
 CLEANFILES = inittests.stamp x y y z out err \
-	     *.lock .\#lk* 
+	     *.lock .\#lk*
 
 DISTCLEANFILES = pubring.kbx~ random_seed
 

tests/openpgp/ChangeLog-2011

@@ -1,3 +1,10 @@
+2011-12-02  Werner Koch  <wk@g10code.com>
+
+	NB: ChangeLog files are no longer manually maintained.  Starting
+	on December 1st, 2011 we put change information only in the GIT
+	commit log, and generate a top-level ChangeLog file from logs at
+	"make dist".  See doc/HACKING for details.
+
 2010-05-12  Werner Koch  <wk@g10code.com>
 
 	* armor.test: Add test for bug#1179.
@@ -64,7 +71,7 @@
 	we support.  This is safer than the previous setup which could
 	hide that some ciphers weren't being tested.  Plus, this
 	automatically tests any new ciphers libgcrypt supports.
-	(all_hash_algos): New. 
+	(all_hash_algos): New.
 	* sigs.test: Use it here, and also test with >=160 bit hashes for
 	DSA2.
 	* conventional.test, encrypt.test, encrypt-dsa.test,
@@ -122,7 +129,7 @@
 	* verify.test:  More tests.
 	* multisig.test: Better error printing.
 	(sig_1ls1ls_valid, sig_ls_valid):  Moved to the non-valid group.
-	
+
 2006-02-14  Werner Koch  <wk@gnupg.org>
 
 	* verify.test: New.
@@ -204,7 +211,7 @@
 2002-05-10  Werner Koch  <wk@gnupg.org>
 
 	* Makefile.am: Add gpg_dearmor to all targets where it is used.
-	Noted by Andreas Haumer. 
+	Noted by Andreas Haumer.
 
 2002-04-19  Werner Koch  <wk@gnupg.org>
 
@@ -232,7 +239,7 @@
 
 2001-09-28  Werner Koch  <wk@gnupg.org>
 
-	* defs.inc: Write a log file for each test. 
+	* defs.inc: Write a log file for each test.
 	* run-gpg, run-gpgm, run-gpg.patterns: Removed.  Replaced in all
 	tests by a simple macro from defs.inc.
 	* Makefile.am (CLEANFILES): Remove log files.
@@ -243,7 +250,7 @@
 	armencryptp.test, armencrypt.test, encryptp.test, seat.test,
 	encrypt-dsa.test, encrypt.test: Use --always-trust because the
 	test are not designed to check the validity.
-	
+
 2001-09-06  Werner Koch  <wk@gnupg.org>
 
 	* genkey1024.test: Simplified by using a parameter file.
@@ -271,7 +278,7 @@
 
 2001-03-20  Werner Koch  <wk@gnupg.org>
 
-	* Makefile.am: Import the pubdemo.asc file 
+	* Makefile.am: Import the pubdemo.asc file
 
 	* sigs.test (hash_algo_list): s/tiger/tiger192/
 
@@ -370,5 +377,3 @@ Mon May 18 15:40:02 1998  Werner Koch  (wk@isil.d.shuttle.de)
  This file is distributed in the hope that it will be useful, but
  WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-

tests/openpgp/Makefile.am

@@ -6,12 +6,12 @@
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # GnuPG is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 # Process this file with automake to create Makefile.in
@@ -25,7 +25,7 @@ required_pgms = ../../g10/gpg2 ../../agent/gpg-agent \
 
 
 TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) GPG_AGENT_INFO= LC_ALL=C \
-		    ../../agent/gpg-agent --quiet --daemon sh 
+		    ../../agent/gpg-agent --quiet --daemon sh
 
 
 TESTS = version.test mds.test \
@@ -50,7 +50,7 @@ TEST_FILES = pubring.asc secring.asc plain-1o.asc plain-2o.asc plain-3o.asc \
 
 DATA_FILES = data-500 data-9000 data-32000 data-80000 plain-large
 
-EXTRA_DIST = defs.inc $(TESTS) $(TEST_FILES) \
+EXTRA_DIST = defs.inc $(TESTS) $(TEST_FILES) ChangeLog-2011 \
 	     mkdemodirs signdemokey
 
 # Note that removing S.gpg-agent forces a running gpg-agent to
@@ -70,7 +70,7 @@ distclean-local:
 
 prepared.stamp: ./pubring.gpg ./secring.gpg ./plain-1 ./plain-2 ./plain-3 \
 		./pubring.pkr ./secring.skr ./gpg_dearmor $(DATA_FILES)
-	 $(GPG_IMPORT) $(srcdir)/pubdemo.asc	 
+	 $(GPG_IMPORT) $(srcdir)/pubdemo.asc
 	 cat $(srcdir)/gpg-agent.conf.tmpl > gpg-agent.conf
 	 echo timestamp >./prepared.stamp
 

tests/pkits/ChangeLog-2011

@@ -1,3 +1,10 @@
+2011-12-02  Werner Koch  <wk@g10code.com>
+
+	NB: ChangeLog files are no longer manually maintained.  Starting
+	on December 1st, 2011 we put change information only in the GIT
+	commit log, and generate a top-level ChangeLog file from logs at
+	"make dist".  See doc/HACKING for details.
+
 2009-03-03  Werner Koch  <wk@g10code.com>
 
 	* inittests (clean_files): Use /bin/pwd here as well.
@@ -11,11 +18,11 @@
 
 2008-02-19  Werner Koch  <wk@g10code.com>
 
-	* inittests: Unpack test data onlyu if available. 
+	* inittests: Unpack test data onlyu if available.
 	* common.sh: Skip tests if PKITS test data is not available.
 	* Makefile.am: Do not distribute test data.  This allows to
 	include the test suite in the distribution.
-	
+
 	* signature-verification: New.
 	* validity-periods: New.
 	* verifying-name-chaining: New.

tests/pkits/Makefile.am

@@ -1,18 +1,18 @@
 # Makefile.am - tests using NIST's PKITS
 #     	Copyright (C) 2004, 2008 Free Software Foundation, Inc.
-# 
+#
 # This file is part of GnuPG.
-# 
+#
 # GnuPG is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # GnuPG is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
@@ -43,8 +43,8 @@ testscripts = import-all-certs validate-all-certs \
 	private-certificate-extensions
 
 
-EXTRA_DIST = inittests runtest common.sh $(testscripts) 
+EXTRA_DIST = inittests runtest common.sh $(testscripts) ChangeLog-2011 \
-	     import-all-certs.data 
+	     import-all-certs.data
 
 TESTS = $(testscripts)
 

tools/ChangeLog-2011

@@ -1,3 +1,10 @@
+2011-12-02  Werner Koch  <wk@g10code.com>
+
+	NB: ChangeLog files are no longer manually maintained.  Starting
+	on December 1st, 2011 we put change information only in the GIT
+	commit log, and generate a top-level ChangeLog file from logs at
+	"make dist".  See doc/HACKING for details.
+
 2011-08-04  Werner Koch  <wk@g10code.com>
 
 	* symcryptrun.c: Include utmp.h for login_tty.
@@ -584,7 +591,7 @@
 
 2006-09-12  Werner Koch  <wk@g10code.com>
 
- 	Replaced all call gpg_error_from_errno(errno) by
+	Replaced all call gpg_error_from_errno(errno) by
 	gpg_error_from_syserror().
 
 	* gpg-connect-agent.c (read_and_print_response): With verbosity

tools/Makefile.am

@@ -1,23 +1,23 @@
 # Makefile.am - Tools directory
 #     	Copyright (C) 2003, 2007 Free Software Foundation, Inc.
-# 
+#
 # This file is part of GnuPG.
-# 
+#
 # GnuPG is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # GnuPG is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 EXTRA_DIST = \
-	Manifest watchgnupg.c \
+	Manifest watchgnupg.c ChangeLog-2011 \
 	addgnupghome applygnupgdefaults gpgsm-gencert.sh \
 	lspgpot mail-signed-keys convert-from-106 sockprox.c \
 	ccidmon.c
@@ -75,14 +75,14 @@ gpgconf_LDADD = $(common_libs) \
                 $(LIBINTL) $(GPG_ERROR_LIBS) $(LIBICONV) $(W32SOCKLIBS)
 
 gpgparsemail_SOURCES = gpgparsemail.c rfc822parse.c rfc822parse.h
-gpgparsemail_LDADD = 
+gpgparsemail_LDADD =
 
 symcryptrun_SOURCES = symcryptrun.c
 symcryptrun_LDADD = $(LIBUTIL_LIBS) $(common_libs) $(pwquery_libs) \
                     $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) \
                     $(LIBICONV) $(W32SOCKLIBS)
 
-watchgnupg_SOURCES = watchgnupg.c 
+watchgnupg_SOURCES = watchgnupg.c
 watchgnupg_LDADD = $(NETLIBS)
 
 gpg_connect_agent_SOURCES = gpg-connect-agent.c no-libgcrypt.c