[git] KSBA - branch, master, updated. libksba-1.2.0-3-g3f957f4

by Werner Koch cvs at cvs.gnupg.org
Fri Dec 2 00:29:19 CET 2011


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "KSBA is a library to access X.509 certificates and CMS data.".

The branch, master has been updated
       via  3f957f48388756732b5795b77b65d5ab7c0c8298 (commit)
       via  1120a33155aa3246b6aeed2dcd6a1315969c632d (commit)
      from  95d25a9bd2c638db9e7c45b38a37fa8222337411 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3f957f48388756732b5795b77b65d5ab7c0c8298
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Dec 1 23:36:49 2011 +0100

    Post release updates.

diff --git a/.gitignore b/.gitignore
index 5d01320..6a26f3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,18 @@
+*.lo
+*.o
+.deps/
+.libs/
+/aclocal.m4
+/autom4te.cache
+/config.h.in
+/config.h
+/config.log
+/config.status
+/configure
+/libtool
+/stamp-h1
 /Makefile.in
+/Makefile
 /aclocal.m4
 /config.h.in
 /configure
@@ -7,3 +21,6 @@
 /gl/Makefile.in
 /m4/Makefile.in
 /src/Makefile.in
+/doc/Makefile.in
+/doc/ksba.info
+/tests/Makefile.in
diff --git a/configure.ac b/configure.ac
index fcfb450..9e891b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,17 +25,17 @@ min_automake_version="1.10"
 # Remember to change the version number immediately *after* a release.
 # Set my_issvn to "yes" for non-released code.  Remember to run an
 # "svn up" and "autogen.sh" right before creating a distribution.
-m4_define([my_version], [1.2.0])
-m4_define([my_issvn], [no])
+m4_define([my_version], [1.2.1])
+m4_define([my_issvn], [yes])
 
 m4_define([svn_revision], m4_esyscmd([printf "%d" $(svn info 2>/dev/null \
           | sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))
 m4_define([git_revision], m4_esyscmd([git branch -v 2>/dev/null \
           | awk '/^\* / {printf "%s",$3}']))
-AC_INIT([libksba],
-        [my_version[]m4_if(my_issvn,[yes],
-        [m4_if(git_revision,[],[-svn[]svn_revision],[-git[]git_revision])])],
-        [gnupg-devel at gnupg.org])
+m4_define([my_full_version], [my_version[]m4_if(my_issvn,[yes],
+          [m4_if(git_revision,[],[-svn[]svn_revision],[-git[]git_revision])])])
+
+AC_INIT([libksba],[my_full_version],[http://bugs.gnupg.org])
 
 # LT Version numbers: Remember to change them just *before* a release.
 #   (Interfaces removed:    CURRENT++, AGE=0, REVISION=0)

commit 1120a33155aa3246b6aeed2dcd6a1315969c632d
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Dec 1 23:30:50 2011 +0100

    Generate the ChangeLog from commit logs.
    
    * build-aux/gitlog-to-changelog: New script.  Taken from gnulib.
    * build-aux/git-log-fix: New file.
    * build-aux/git-log-footer: New file.
    * doc/HACKING: New file.
    * ChangeLog: New file.
    * Makefile.am (EXTRA_DIST): Add new files.
    (gen-ChangeLog): New.
    (dist-hook): Run gen-ChangeLog.
    * autogen.sh: Install commit-msg hook for git.
    
    Rename all ChangeLog files to ChangeLog-2011.

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5d01320
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+/Makefile.in
+/aclocal.m4
+/config.h.in
+/configure
+/doc/stamp-vti
+/doc/version.texi
+/gl/Makefile.in
+/m4/Makefile.in
+/src/Makefile.in
diff --git a/ChangeLog b/ChangeLog
index ce9a49d..d9c1187 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,459 +1,16 @@
-2011-11-28  Jim Meyering  <meyering at redhat.com>
+No more ChangeLog files
+========================
 
-	accept --with-libgpg-error-prefix as well as --with-gpg-error-prefix
-	* m4/gpg-error.m4: Update from git master.
+Do not modify any of the ChangeLog files in Libksba.  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.  See doc/HACKING for details.  The old ChangeLog
+files have all be renamed to ChangeLog-2011.
 
-2011-03-01  Werner Koch  <wk at g10code.com>
 
-	Release 1.2.0.
 
-	* configure.ac: Bump LT version to C19/A11/R0.
-
-2011-02-25  Werner Koch  <wk at g10code.com>
-
-	* configure.ac (KSBA_CONFIG_HOST): New.
-	* m4/libgcrypt.m4, m4/gpg-error.m4: Update from their git masters.
-
-2011-01-03  Werner Koch  <wk at g10code.com>
-
-	* configure.ac [BUILD_REVISION]: Shorten git commit identifier.
-
-2010-12-22  Werner Koch  <wk at g10code.com>
-
-	* configure.ac: Add a git commit identifier to the version.
-
-2010-10-26  Werner Koch  <wk at g10code.com>
-
-	Release 1.1.0.
-
-	* configure.ac: Bump LT version to C18/A10/R0.
-        * config.guess: Update to version 2010-09-24.
-        * config.sub: Update to version 2010-09-11.
-
-2010-08-19  Werner Koch  <wk at g10code.com>
-
-	* configure.ac (AH_TOP, AH_BOTTOM): New.  Define
-	GPG_ERR_ENABLE_ERRNO_MACROS.
-
-2010-07-15  Werner Koch  <wk at g10code.com>
-
-	Release 1.0.8.
-
-	* configure.ac: Bump LT version to C17/A9/R8.
-
-2010-01-22  Werner Koch  <wk at g10code.com>
-
-	* autogen.sh: Support --build-w32ce.
-
-	* configure.ac: Require libgpg-error 1.8.
-	(HAVE_W32CE_SYSTEM): New am_defines and am_conditionals.
-	(AC_CHECK_FUNCS): Check for getenv.
-
-	* ltmain.sh (wrappers_required): Don't set for mingw32ce.
-
-2009-12-08  Marcus Brinkmann  <marcus at g10code.de>
-
-	Update to libtool 2.2.6a.
-	* configure.ac: Invoke AC_CONFIG_MACRO_DIR.
-	(AC_LIBTOOL_WIN32_DLL, AC_LIBTOOL_RC): Replace by ...
-	(LT_PREREQ, LT_INIT, LT_LANG): ... these.
-	* config.guess, config.sub, install-sh, ltmain.sh, m4/libtool.m4:
-	Updated to libtool 2.2.6a.
-	* m4/ltoptions.m4, m4/ltsugar.m4, m4/ltversion.m4,
-	m4/lt~obsolete.m4: New files from libtool 2.2.6a.
-
-2009-12-08  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac: Allow cross compiling to be "maybe".
-
-2009-07-03  Werner Koch  <wk at g10code.com>
-
-	* configure.ac: Bump LT version to C17/A9/R7.  Unfortunately only
-	after the release so to anticipate fixes by distributions.
-
-2009-07-03  Werner Koch  <wk at g10code.com>
-
-	Release 1.0.7.
-
-2009-06-05  Werner Koch  <wk at g10code.com>
-
-	Release 1.0.6.
-
-	* configure.ac: Bump LT version to C17/A9/R6.
-
-2009-01-09  Werner Koch  <wk at g10code.com>
-
-	Release 1.0.5.
-
-	* configure.ac: Bump LT version to C17/A9/R5.
-
-2008-10-30  Werner Koch  <wk at g10code.com>
-
-	* configure.ac: Use more strict warnings with newer gcc versions.
-
-2008-09-22  Werner Koch  <wk at g10code.com>
-
-	Release 1.0.4.
-
-	* configure.ac: Bump LT version to C17/A9/R4.
-
-	* configure.ac: Update svn_revision macro.
-
-2008-02-25  Werner Koch  <wk at g10code.com>
-
-	* configure.ac (KSBA_USE_VISIBILITY): Define if system supports
-	the visibility attribute.
-
-2008-02-12  Werner Koch  <wk at g10code.com>
-
-	Released 1.0.3.
-
-	* configure.ac: Bump LT version to C17/A9/R3.
-
-	* config.guess, config.sub: Update to version 2007-11-19.
-
-2007-11-07  Werner Koch  <wk at g10code.com>
-
-	* configure.ac: Add option --disable-optimization.
-
-2007-08-08  Werner Koch  <wk at g10code.com>
-
-	* configure.ac: Use $host and not $target.  Reported by Peter
-	Eisentraut .
-
-2007-07-04  Werner Koch  <wk at g10code.com>
-
-	Released 1.0.2.
-
-	* configure.ac: Bumped LT version to C17/A9/R2.
-
-	Changed license to GPLv3.
-
-	* COPYING: Updated to GPLv3.
-
-	* config.guess, config.sub: Updated from Savannah CVS and switched
-	license to GPLv3+ and the old exception.
-
-	* acinclude.m4: Remove.
-	* Makefile.am (SUBDIRS): Include m4.
-	* m4/gnupg-typedef.m4: New.
-	* m4/Makefile.am: New.
-
-2007-06-15  Werner Koch  <wk at g10code.com>
-
-	* autogen.sh: Use = and not == in test to be POSIXly correct.
-
-2007-05-29  Werner Koch  <wk at g10code.com>
-
-	* configure.ac (AC_LIBTOOL_WIN32_DLL): New.
-	(HAVE_W32_SYSTEM): New.
-	(BUILD_REVISION, BUILD_TIMESTAMP, BUILD_FILEVERSION): New.
-	(AC_CANONICAL_TARGET): New.
-
-	* autogen.sh: Add Option --force.  Modernized cross compiler
-	selection for --build-w32.
-
-2007-05-24  Werner Koch  <wk at g10code.com>
-
-	* configure.ac: Use -Wpointer-arith if possible.
-
-2007-04-06  Werner Koch  <wk at g10code.com>
-
-	* configure.ac: Require libgpg-error 1.4.
-
-2006-11-29  Werner Koch  <wk at g10code.com>
-
-	Released 1.0.1.
-
-	* configure.ac: Bumped LT version to C17/A9/R1.
-
-	* gl/dummyobj.c: New.
-
-2006-11-15  Werner Koch  <wk at g10code.com>
-
-	* autogen.sh: Add convenience option --build-amd64.
-
-2006-10-20  Werner Koch  <wk at g10code.com>
-
-	* Makefile.am (stowinstall): New convenience target.
-
-2006-08-31  Werner Koch  <wk at g10code.com>
-
-	Released 1.0.0.
-
-	* configure.ac: Bumped LT version to C17/A9/R0.
-
-	* configure.ac: Require libgpg-error 1.2. Removed test on
-	GPG_ERR_UNKNOWN_CRIT_EXTN.
-
-2006-08-01  Werner Koch  <wk at g10code.com>
-
-	Released 0.9.16.
-
-	* configure.ac: Bumped LT version to C16/A8/R0.
-
-	* configure.ac: Changed to new style auto-svn init.
-
-2006-06-20  Werner Koch  <wk at g10code.com>
-
-	Released 0.9.15.
-
-	* configure.ac: Bumbed LT version to C15/A7/R2.
-
-2006-05-16  Werner Koch  <wk at g10code.com>
-
-	Released 0.9.14.
-
-	* configure.ac: Bumped LT version to C15/A7/R1.
-
-	* config.guess, config.sub: Updated.
-	* ltmain.sh: Updated.
-
-2006-05-11  Werner Koch  <wk at g10code.com>
-
-	* configure.ac: Use -Wno-pointer-sign.
-
-2005-11-24  Werner Koch  <wk at g10code.com>
-
-	Released 0.9.13.
-
-	* configure.ac: Bumped LT vesion to C15/A7/R0.
-
-2005-08-01  Werner Koch  <wk at g10code.com>
-
-	Released 0.9.12.
-
-	* configure.ac: Bumped LT version to C14/A6/R1.
-
-2005-06-02  Werner Koch  <wk at g10code.com>
-
-	* gl/, gl/m4/: New.
-	* configure.ac: Add test for gnulib module alloca.
-	* Makefile.am (SUBDIRS): Include gl/
-
-2005-04-20  Werner Koch  <wk at g10code.com>
-
-	* configure.ac: Fixed typo in saving CFLAGS for gpg-error symbol
-	test.
-
-	Released 0.9.11.
-
-2005-04-19  Werner Koch  <wk at g10code.com>
-
-	* configure.ac: Bumped LT version to C14/A6/R0 due to a new
-	interface.
-
-	* acinclude.m4 (GNUPG_CHECK_TYPEDEF): Added.  Taken from gnupg 1.4
-
-2005-04-18  Werner Koch  <wk at g10code.com>
-
-	* configure.ac: Check for a new gpg-error symbol.
-
-2005-03-16  Werner Koch  <wk at g10code.com>
-
-	* Makefile.am (AUTOMAKE_OPTIONS): Add option to create bzip 2 file
-	and to use the m4 directory.
-	* acinclude.m4: Removed all code.  It belongs into m4/.
-
-2004-12-18  Werner Koch  <wk at g10code.com>
-
-	* configure.ac: Print a hint about failed corss compilations.
-	* autogen.sh: Add --build-w32 option.
-
-2004-12-03  Werner Koch  <wk at g10code.com>
-
-	Released 0.9.10.
-
-	* configure.ac: Bumped LT version to C13/A5/R2.
-
-2004-11-25  Werner Koch  <wk at g10code.com>
-
-	* configure.ac: Define CROSS_COMPILING make conditional
-	* Makefile.am (SUBDIRS): Don't run tests when cross compiling.
-
-2004-09-27  Werner Koch  <wk at g10code.com>
-
-	Released 0.9.9.
-
-	* configure.ac: Bumped LT version to C13/A5/R2.
-
-	* configure.ac: AC_GNU_SOURCE instead of AH_TOP.
-	* config.guess, config.sub: Updated.
-	* ltmain.sh: Updated to 1.5.6
-
-2004-07-22  Werner Koch  <wk at g10code.de>
-
-	Released 0.9.8.
-
-	* configure.ac: Bumped LT version to C13/A5/R1.
-
-2004-06-08  Werner Koch  <wk at gnupg.org>
-
-	Released 0.9.7.
-
-	* configure.ac: Bumped LT version to C13/A5/R0.
-
-2004-04-29  Werner Koch  <wk at gnupg.org>
-
-	Released 0.9.6.
-
-	* configure.ac: Bumped LT version to C12/A4/R0.
-
-2004-04-02  Thomas Schwinge  <schwinge at nic-nac-project.de>
-
-	* autogen.sh: Added ACLOCAL_FLAGS.
-
-2004-04-06  Werner Koch  <wk at gnupg.org>
-
-	Released 0.9.5.
-
-	* configure.ac: Bumped LT versions to C11/A3/R0.
-	* config.guess, config.sub, ltmain.sh: Updated to those from
-	libtools 1.5.4.
-
-2004-03-15  Werner Koch  <wk at gnupg.org>
-
-	* configure.ac: New option --enable-ld-version-script.
-
-2004-02-20  Werner Koch  <wk at gnupg.org>
-
-        Released 0.9.4.
-
-	* configure.ac: Bumped LT version to C10/A2/R0.
-
-2004-02-11  Werner Koch  <wk at gnupg.org>
-
-	* autogen.sh (check_version): Removed bashism and simplified.
-
-2004-01-30  Werner Koch  <wk at gnupg.org>
-
-	Released 0.9.3.
-
-	* configure.ac: Bumped LT vesion to C9/A1/R2.
-
-2004-01-29  Werner Koch  <wk at gnupg.org>
-
-	Released 0.9.2.
-
-	* configure.ac: Bumbed LT version to C9/A1/R1.
-
-2003-12-19  Werner Koch  <wk at gnupg.org>
-
-	Released 0.9.1.
-
-	* configure.ac: Bumbed LT version to C9/A1/R0.
-
-2003-12-08  Werner Koch  <wk at gnupg.org>
-
-	* README.CVS: Enhanced
-	* autogen.sh: Reworked.
-	* configure.ac: Add version numbers for autogen.sh.
-
-2003-11-17  Werner Koch  <wk at gnupg.org>
-
-	Released 0.9.0.
-
-2003-11-12  Werner Koch  <wk at gnupg.org>
-
-	* acinclude.m4: New.
-	* configure.ac (AM_PATH_GPG_ERROR): New.
-
-2003-10-31  Werner Koch  <wk at gnupg.org>
-
-	* configure.ac (AC_CHECK_FUNCS): Removed timegm. Add gmtime_r.
-	Set version number to 0.9.0-cvs, bumped LT version to C8/A0/R0.
-
-2003-03-17  Werner Koch  <wk at gnupg.org>
-
-        Released 0.4.7.
-
-	* configure.ac: Set LT version to 7/7/1.
-
-2002-12-04  Werner Koch  <wk at gnupg.org>
-
-	Released 0.4.6.
-
-	* configure.ac: Set LT version to 7/7/0.
-
-2002-11-25  Werner Koch  <wk at gnupg.org>
-
-	* configure.ac: Bumbed version number.
-
-2002-11-12  Werner Koch  <wk at gnupg.org>
-
-	* config.sub, config.guess: Updated from ftp.gnu.org/gnu/config
-	to version 2002-11-08.
-
-2002-08-23  Werner Koch  <wk at gnupg.org>
-
-	Released 0.4.5.
-
-	* configure.ac (KSBA_CONFIG_LIBS): Renamed from KSBA_LIBS and
-	removed the libdir because it is set by the config script.
-
-2002-08-09  Werner Koch  <wk at gnupg.org>
-
-	Released 0.4.4.
-
-2002-06-25  Werner Koch  <wk at gnupg.org>
-
-	Released 0.4.3.
-
-	* configure.ac: Set LT version to 6/6/0.
-
-2002-06-17  Werner Koch  <wk at gnupg.org>
-
-	* configure.ac: Don't check for ranlib because it is done by libtool.
-
-2002-06-04  Werner Koch  <wk at gnupg.org>
-
-        Released 0.4.2.
-
-	* configure.ac: Bumbed libversion due to added interfaces.
-
-2002-05-03  Werner Koch  <wk at gnupg.org>
-
-	Released 0.4.1.
-
-2002-04-15  Werner Koch  <wk at gnupg.org>
-
-        Released 0.4.0.
-
-	* configure.ac: Bumbed libversion due to added interfaces.
-	* NEWS: Started tracking news.
-
-2002-04-01  Werner Koch  <wk at gnupg.org>
-
-	Released 0.2.3.
-
-2002-03-13  Werner Koch  <wk at gnupg.org>
-
-	Released 0.2.2.
-
-2002-03-04  Werner Koch  <wk at gnupg.org>
-
-	* configure.ac: Bumbed version to 0.2.1
-
-2002-02-07  Werner Koch  <wk at gnupg.org>
-
-	* configure.ac: Bumped version to 0.2.0
-	* Makefile.am:  Add doc directory and VERSION kludge
-
-2002-01-11  Werner Koch  <wk at gnupg.org>
-
-	* configure.ac (AC_C_INLINE): New.
-
-2001-12-17  Werner Koch  <wk at gnupg.org>
-
-	* configure.ac (KSBA_LIBS,KSBA_CFLAGS): Set them.
-
-
- Copyright 2001, 2002 g10 Code GmbH
-
- This file is free software; as a special exception the author gives
- unlimited permission to copy and/or distribute it, with or without
- modifications, as long as this notice is preserved.
-
- 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.
+Local Variables:
+buffer-read-only: t
+mode: text
+End:
diff --git a/ChangeLog b/ChangeLog-2011
similarity index 97%
copy from ChangeLog
copy to ChangeLog-2011
index ce9a49d..a9eecb8 100644
--- a/ChangeLog
+++ b/ChangeLog-2011
@@ -1,3 +1,10 @@
+2011-12-01  Werner Koch  <wk at 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-11-28  Jim Meyering  <meyering at redhat.com>
 
 	accept --with-libgpg-error-prefix as well as --with-gpg-error-prefix
diff --git a/Makefile.am b/Makefile.am
index da26216..d061ca1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,11 @@
 ACLOCAL_AMFLAGS = -I m4 -I gl/m4
 AUTOMAKE_OPTIONS = dist-bzip2
 
-EXTRA_DIST = autogen.sh
+EXTRA_DIST = autogen.sh 						\
+             ChangeLog-2011 doc/ChangeLog-2011 src/ChangeLog-2011 	\
+             tests/ChangeLog-2011 			     		\
+             build-aux/gitlog-to-changelog build-aux/git-log-footer	\
+             build-aux/git-log-fix
 
 
 if CROSS_COMPILING
@@ -33,8 +37,24 @@ endif
 
 SUBDIRS = m4 gl src ${tests} doc
 
-dist-hook:
+dist-hook: gen-ChangeLog
 	@set -e; echo "$(VERSION)" > $(distdir)/VERSION
 
+
+gen_start_date = 2011-12-01T00:00:00
+.PHONY: gen-ChangeLog
+gen-ChangeLog:
+	if test -d $(top_srcdir)/.git; then				\
+	  (cd $(top_srcdir) &&                      			\
+	    ./build-aux/gitlog-to-changelog				\
+	    --amend=build-aux/git-log-fix				\
+	    --since=$(gen_start_date) ) > $(distdir)/cl-t;		\
+          cat $(top_srcdir)/build-aux/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/libksba
diff --git a/README-alpha b/README-alpha
deleted file mode 100644
index 0f748e3..0000000
--- a/README-alpha
+++ /dev/null
@@ -1 +0,0 @@
- THIS IS WORK IN PROGRESS !!!!
\ No newline at end of file
diff --git a/autogen.sh b/autogen.sh
index 37b82e2..86d0f95 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -254,6 +254,13 @@ EOF
       cp -av .git/hooks/pre-commit.sample .git/hooks/pre-commit
       chmod -c +x  .git/hooks/pre-commit
   fi
+  if [ -f build-aux/git-hooks/commit-msg -a ! -f .git/hooks/commit-msg ] ; then
+    cat <<EOF >&2
+*** Activating commit log message check hook. ***
+EOF
+      cp -av build-aux/git-hooks/commit-msg .git/hooks/commit-msg
+      chmod -c +x  .git/hooks/commit-msg
+  fi
 fi
 
 echo "Running aclocal -I m4 -I gl/m4 ${ACLOCAL_FLAGS:+$ACLOCAL_FLAGS }..."
diff --git a/build-aux/git-hooks/commit-msg b/build-aux/git-hooks/commit-msg
new file mode 100755
index 0000000..5a697c7
--- /dev/null
+++ b/build-aux/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:
diff --git a/build-aux/git-log-fix b/build-aux/git-log-fix
new file mode 100644
index 0000000..af702fe
--- /dev/null
+++ b/build-aux/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.
diff --git a/build-aux/git-log-footer b/build-aux/git-log-footer
new file mode 100644
index 0000000..7eff5c9
--- /dev/null
+++ b/build-aux/git-log-footer
@@ -0,0 +1,14 @@
+
+2011-12-01  Werner Koch  <wk at 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) 2011 g10 Code GmbH
+
+	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.
diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog
new file mode 100755
index 0000000..40a8035
--- /dev/null
+++ b/build-aux/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 at 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:
diff --git a/doc/ChangeLog b/doc/ChangeLog-2011
similarity index 86%
rename from doc/ChangeLog
rename to doc/ChangeLog-2011
index 58e3bfa..413a168 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog-2011
@@ -1,3 +1,10 @@
+2011-12-01  Werner Koch  <wk at 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.
+
 2008-11-12  Marcus Brinkmann  <marcus at g10code.com>
 
 	* ksba.texi: Clear up wording on reference counting.
diff --git a/doc/HACKING b/doc/HACKING
new file mode 100644
index 0000000..918ab74
--- /dev/null
+++ b/doc/HACKING
@@ -0,0 +1,25 @@
+# HACKING                                                       -*- org -*-
+#+TITLE: Hacking notes for Libksba
+#+STARTUP: showall
+
+* No more ChangeLog files
+
+  Do not modify any of the ChangeLog files in Libksba.  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.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index a332e88..7d70e0d 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -20,6 +20,9 @@
 
 DISTCLEANFILES = ksba.cps
 
+EXTRA_DIST = HACKING
+
+
 info_TEXINFOS = ksba.texi
 ksba_TEXINFOS = gpl.texi
 
diff --git a/gl/alloca.h b/gl/alloca.h
deleted file mode 100644
index f0359b6..0000000
--- a/gl/alloca.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Memory allocation on the stack.
-
-   Copyright (C) 1995, 1999, 2001, 2002, 2003, 2004 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, 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/>.
- */
-
-/* Avoid using the symbol _ALLOCA_H here, as Bison assumes _ALLOCA_H
-   means there is a real alloca function.  */
-#ifndef _GNULIB_ALLOCA_H
-# define _GNULIB_ALLOCA_H
-
-/* alloca (N) returns a pointer to N bytes of memory
-   allocated on the stack, which will last until the function returns.
-   Use of alloca should be avoided:
-     - inside arguments of function calls - undefined behaviour,
-     - in inline functions - the allocation may actually last until the
-       calling function returns,
-     - for huge N (say, N >= 65536) - you never know how large (or small)
-       the stack is, and when the stack cannot fulfill the memory allocation
-       request, the program just crashes.
- */
-
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-#elif defined _AIX
-# define alloca __alloca
-#elif defined _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-#else
-# include <stddef.h>
-# ifdef  __cplusplus
-extern "C"
-# endif
-void *alloca (size_t);
-#endif
-
-#endif /* _GNULIB_ALLOCA_H */
diff --git a/src/ChangeLog b/src/ChangeLog-2011
similarity index 99%
rename from src/ChangeLog
rename to src/ChangeLog-2011
index e2b1176..8bed698 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog-2011
@@ -1,3 +1,10 @@
+2011-12-01  Werner Koch  <wk at 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-02-28  Werner Koch  <wk at g10code.com>
 
 	* keyinfo.c (_ksba_algoinfo_from_sexp): New.
diff --git a/tests/ChangeLog b/tests/ChangeLog-2011
similarity index 95%
rename from tests/ChangeLog
rename to tests/ChangeLog-2011
index a451d6a..c0c2506 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog-2011
@@ -1,3 +1,10 @@
+2011-12-01  Werner Koch  <wk at 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-08-04  Werner Koch  <wk at g10code.com>
 
 	* t-cms-parser.c (one_file): Use print_sexp_hex for the s/n.

-----------------------------------------------------------------------

Summary of changes:
 .gitignore                          |   26 ++
 ChangeLog                           |  467 +----------------------------------
 ChangeLog => ChangeLog-2011         |    7 +
 Makefile.am                         |   24 ++-
 README-alpha                        |    1 -
 autogen.sh                          |    7 +
 build-aux/git-hooks/commit-msg      |  127 ++++++++++
 build-aux/git-log-fix               |    3 +
 build-aux/git-log-footer            |   14 +
 build-aux/gitlog-to-changelog       |  345 ++++++++++++++++++++++++++
 configure.ac                        |   12 +-
 doc/{ChangeLog => ChangeLog-2011}   |    7 +
 doc/HACKING                         |   25 ++
 doc/Makefile.am                     |    3 +
 gl/alloca.h                         |   51 ----
 src/{ChangeLog => ChangeLog-2011}   |    7 +
 tests/{ChangeLog => ChangeLog-2011} |    7 +
 17 files changed, 618 insertions(+), 515 deletions(-)
 create mode 100644 .gitignore
 copy ChangeLog => ChangeLog-2011 (97%)
 delete mode 100644 README-alpha
 create mode 100755 build-aux/git-hooks/commit-msg
 create mode 100644 build-aux/git-log-fix
 create mode 100644 build-aux/git-log-footer
 create mode 100755 build-aux/gitlog-to-changelog
 rename doc/{ChangeLog => ChangeLog-2011} (86%)
 create mode 100644 doc/HACKING
 delete mode 100644 gl/alloca.h
 rename src/{ChangeLog => ChangeLog-2011} (99%)
 rename tests/{ChangeLog => ChangeLog-2011} (95%)


hooks/post-receive
-- 
KSBA is a library to access X.509 certificates and CMS data.
http://git.gnupg.org




More information about the Gnupg-commits mailing list