[git] GnuPG - branch, STABLE-BRANCH-2-0, updated. gnupg-2.0.18-4-g28c6cef
by Werner Koch
cvs at cvs.gnupg.org
Fri Dec 2 20:21:59 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 "The GNU Privacy Guard".
The branch, STABLE-BRANCH-2-0 has been updated
via 28c6cef128219ffdf548d6f5acf819aa2303fe0d (commit)
from 0137097fbba540b18111d4c1ae1b73f6f01f07e6 (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 28c6cef128219ffdf548d6f5acf819aa2303fe0d
Author: Werner Koch <wk at gnupg.org>
Date: Fri Dec 2 19:28:02 2011 +0100
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.
diff --git a/ChangeLog b/ChangeLog
index 28dab02..8bd68a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,1200 +1,16 @@
-2011-08-04 Werner Koch <wk at g10code.com>
+No more ChangeLog files
+========================
- Release 2.0.18.
+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. See doc/HACKING for details. The old ChangeLog
+files have all be renamed to ChangeLog-2011.
- * configure.ac: Fix usage of AC_LANG_PROGRAM.
- (AC_CHECK_HEADERS): Check for utmp.h.
-2011-02-04 Werner Koch <wk at g10code.com>
- * autogen.sh: Ensure that the git pre-commit hoom has been
- enabled. Add a cleanpo filter if not yet set.
-
-2011-01-13 Werner Koch <wk at g10code.com>
-
- Release 2.0.17.
-
-2011-01-11 Werner Koch <wk at g10code.com>
-
- * configure.ac: Add option --enable-gpgtar.
- (AC_CHECK_FUNCS): Add stat.
-
- * autogen.sh <w32>: Remove superfluous --without-included-gettext.
-
-2011-01-10 Werner Koch <wk at g10code.com>
-
- * configure.ac: Support a git_revision string.
-
-2010-07-19 Werner Koch <wk at g10code.com>
-
- Release 2.0.16.
-
- * configure.ac: Require libgpg-error 1.7 and libksba 1.0.7 to
- force building with more recent versions.
-
-2010-05-04 Werner Koch <wk at g10code.com>
-
- * configure.ac: Add option --enable-standard-socket.
-
-2010-03-09 Werner Koch <wk at g10code.com>
-
- Release 2.0.15.
-
- * configure.ac: Add option --disable-ccid-driver.
-
-2010-02-18 Werner Koch <wk at g10code.com>
-
- Release 2.0.15rc1.
-
- * configure.ac: Remove double check for libassuan.
-
-2010-02-11 Marcus Brinkmann <marcus at g10code.de>
-
- From trunk 2009-10-16:
-
- * configure.ac: Check for libassuan instead of libassuan-pth.
-
-2009-10-12 Werner Koch <wk at g10code.com>
-
- From trunk 2009-09-23:
-
- * configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION):
- Update to new API (2, 1.1.0).
-
-2009-12-21 Werner Koch <wk at g10code.com>
-
- Release 2.0.14.
-
-2009-12-08 Werner Koch <wk at g10code.com>
-
- * configure.ac (USE_DNS_CERT): Support via ADNS.
-
-2009-12-07 Werner Koch <wk at g10code.com>
-
- * configure.ac: Check for ADNS before checking for the BIND
- resolver.
- (USE_ADNS): Fallback macro for PKA and CERT lookups.
-
-2009-09-04 Werner Koch <wk at g10code.com>
-
- Release 2.0.13.
-
-2009-06-29 Werner Koch <wk at g10code.com>
-
- * configure.ac: Take care of --without-adns. Suggested by
- Arfrever Frehtes Taifersar Arahesis.
-
-2009-06-17 Werner Koch <wk at g10code.com>
-
- Release 2.0.12.
-
-2009-06-05 David Shaw <dshaw at jabberwocky.com>
-
- * configure.ac: Remove Camellia restriction.
-
-2009-04-01 Werner Koch <wk at g10code.com>
-
- * configure.ac: Test for fsync.
-
-2009-03-18 Werner Koch <wk at g10code.com>
-
- * configure.ac: Test for getrlimit.
-
-2009-03-03 Werner Koch <wk at g10code.com>
-
- Release 2.0.11.
-
-2009-01-12 Werner Koch <wk at g10code.com>
-
- Release 2.0.10.
-
-2008-12-09 Werner Koch <wk at g10code.com>
-
- Release 2.0.10rc1.
-
-2008-10-17 Werner Koch <wk at g10code.com>
-
- * configure.ac: Use more warning options with modern GCCs.
-
-2008-09-29 Werner Koch <wk at g10code.com>
-
- * configure.ac: Require libgcrypt 1.4.
-
-2008-08-27 David Shaw <dshaw at jabberwocky.com>
-
- * configure.ac: Use printf for the most portable SVN version
- detection.
-
- * configure.ac: Darwin's /bin/sh has a builtin echo that doesn't
- understand '-n'. Use tr to trim the carriage return instead.
-
-2008-04-23 Werner Koch <wk at g10code.com>
-
- * configure.ac: Call gl_HEADER_SYS_SOCKET and gl_TYPE_SOCKLEN_T.
-
-2008-04-07 Werner Koch <wk at g10code.com>
-
- * configure.ac (ADNSLIBS): Test for adns.
- (GPGKEYS_KDNS): New.
-
-2008-04-01 Werner Koch <wk at g10code.com>
-
- * configure.ac: Require curl 7.10 (Oct 1 2002) or later as we use
- curl_version_info().
- (AC_INIT): Fix quoting.
-
-2008-03-27 Werner Koch <wk at g10code.com>
-
- * Makefile.am (dist_doc_DATA): New. Install README.
-
-2008-03-26 Werner Koch <wk at g10code.com>
-
- Release 2.0.9.
-
-2008-02-19 Werner Koch <wk at g10code.com>
-
- * configure.ac: Remove --with-pkits-tests.
-
-2008-02-15 Werner Koch <wk at g10code.com>
-
- * gl/allocsa.h, gl/m4/allocsa.m4: Replace HAVE_LONG_LONG by
- HAVE_LONG_LONG_INT.
-
-2008-02-15 gettextize <bug-gnu-gettext at gnu.org>
-
- * configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.17.
-
-2007-12-20 Werner Koch <wk at g10code.com>
-
- Released 2.0.8.
-
-2007-12-17 Werner Koch <wk at g10code.com>
-
- * configure.ac: Add treatment for HAVE_LDAP_START_TLS_SA.
-
-2007-12-14 Werner Koch <wk at g10code.com>
-
- Released 2.0.8rc1.
-
-2007-12-12 Werner Koch <wk at g10code.com>
-
- * configure.ac (USE_CAMELLIA): Define by new option --enable-camellia.
-
-2007-12-03 Werner Koch <wk at g10code.com>
-
- * configure.ac: Add test gt_LC_MESSAGES..
-
-2007-10-01 Werner Koch <wk at g10code.com>
-
- * configure.ac: Require assuan 1.0.4.
-
-2007-09-14 Werner Koch <wk at g10code.com>
-
- * configure.ac (GNUPG_LIBASSUAN_VERSION): New.
-
-2007-09-10 Werner Koch <wk at g10code.com>
-
- Released 2.0.7.
-
-2007-08-27 Werner Koch <wk at g10code.com>
-
- * configure.ac: Remove remaining support for internal regex.
- Define DISABLE_REGEX automake conditional. Add option
- --with-regex.
- * autogen.sh [--build-w32]: Remove --disable-regex. Use --with-regex.
-
-2007-08-16 Werner Koch <wk at g10code.com>
-
- Released 2.0.6.
-
-2007-08-08 Werner Koch <wk at g10code.com>
-
- * configure.ac: Use AC_CANONICAL_HOST and not AC_CANONICAL_TARGET.
-
-2007-07-09 Werner Koch <wk at g10code.com>
-
- * configure.ac (AM_ICONV): Check for it even when building without
- NLS.
-
-2007-07-05 Werner Koch <wk at g10code.com>
-
- Released 2.0.5.
-
- * configure.ac: Require libassuan 1.0.2.
-
-2007-07-05 Marcus Brinkmann <marcus at g10code.de>
-
- * configure.ac: Invoke AM_LANGINFO_CODESET.
-
-2007-07-04 Werner Koch <wk at g10code.com>
-
- * Makefile.am (AUTOMAKE_OPTIONS): Add no-dist-gzip.
-
- Switched entire package to GPLv3+.
-
- * configure.ac: Require libksba 1.0.2.
-
- * COPYING: Updated to GPLv3.
- * COPYING.LIB: New as jnlib/ uses this license.
-
- * gl/: Switched to GPLv3+.
-
- * intl/ Removed.
- * configure.ac (AM_GNU_GETTEXT): Add external flag.
- (AM_ICONV): New.
-
-2007-07-03 Werner Koch <wk at g10code.com>
-
- * configure.ac [W32]: Use ws2_32 instead of wsock32.
-
-2007-06-25 Werner Koch <wk at g10code.com>
-
- * gl/mkdtemp.c (gen_tempname) [MKDIR_TAKES_ONE_ARG]: Avoid
- compiler warning by using the proper config macro.
-
-2007-06-15 Werner Koch <wk at g10code.com>
-
- * configure.ac: Call AM_PO_SUBDIRS.
- (W32SOCKLIBS): New.
-
- * autogen.sh: Use = and not == in test to be POSIXly correct.
- <build-w32>: Disable use of regex.
-
-2007-06-14 Werner Koch <wk at g10code.com>
-
- * configure.ac [AH_BOTTOM]: Remove the hardwired names of modules.
-
-2007-06-12 Werner Koch <wk at g10code.com>
-
- * configure.ac [AH_BOTTOM]: Define HTTP_NO_WSASTARTUP.
-
-2007-06-11 Werner Koch <wk at g10code.com>
-
- * am/cmacros.am (libcommonstd, libcommonpth, libcommonstd_ldadd)
- (libcommonpth_ldadd): Add macros.
-
-2007-06-06 Werner Koch <wk at g10code.com>
-
- * configure.ac: Add a few notices message so make browsing of the
- log file easier.
- (CC_FOR_BUILD): New.
-
-2007-05-30 Werner Koch <wk at g10code.com>
-
- * configure.ac [W32]: Do not create a symlink to w32-pth.h.
- Require the installation of the w32pth package.
-
-2007-05-29 Werner Koch <wk at g10code.com>
-
- * gl/: Updated to a newer version.
-
-2007-05-24 Werner Koch <wk at g10code.com>
-
- * configure.ac: Use -Wpointer-arith is possible.
-
-2007-05-15 Werner Koch <wk at g10code.com>
-
- * configure.ac: Renamed the estream macros. Remove -Wformat-nonliteral.
-
- * configure.ac: Call ESTREAM_INIT and define the memory
- allocators for estream_asprintf.
- (gl_MODULES): Remove vasprintf.
-
-2007-05-09 Werner Koch <wk at g10code.com>
-
- Released 2.0.4.
-
-2007-05-07 Werner Koch <wk at g10code.com>
-
- * configure.ac: Require libgcrypt 1.2.2 to avoid compiler warnings.
-
-2007-05-07 gettextize <bug-gnu-gettext at gnu.org>
-
- * configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.16.1.
-
-2007-05-07 Werner Koch <wk at g10code.com>
-
- * configure.ac: Bail out if no C-89 compiler has been found.
-
-2007-05-04 Werner Koch <wk at g10code.com>
-
- * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Add --enable-mailto
-
- * configure.ac: Require automake 1.10
- (AC_CONFIG_FILES): Rename gpgkeys_ to gpg2keys_.
- (AM_PROG_CC_C_O): New.
-
-2007-03-08 Werner Koch <wk at g10code.com>
-
- Released 2.0.3.
-
- * autogen.sh: Add option --force.
-
-2007-01-31 Werner Koch <wk at g10code.com>
-
- Released 2.0.2.
-
-2006-11-30 Werner Koch <wk at g10code.com>
-
- * configure.ac: Save original LIBS when testing for dlopen.
-
-2006-11-28 Werner Koch <wk at g10code.com>
-
- Released 2.0.1.
-
-2006-11-23 Werner Koch <wk at g10code.com>
-
- Released 2.0.1rc1.
-
-2006-11-21 Werner Koch <wk at g10code.com>
-
- * configure.ac [AH_BOTTOM]: Disable PTH soft mapping.
- (AC_CHECK_SIZEOF): Check for time_t.
- (BUILD_INCLUDED_LIBINTL): Remove AM_PO_SUBDIRS as it is not
- required for C.
-
-2006-11-15 Werner Koch <wk at g10code.com>
-
- * autogen.sh: Add convenience option --build-amd64.
-
-2006-11-14 Werner Koch <wk at g10code.com>
-
- * configure.ac (HAVE_ASSUAN_SET_IO_MONITOR): Test for it.
-
-2006-11-11 Werner Koch <wk at g10code.com>
-
- Released 2.0.0.
-
-2006-11-06 Werner Koch <wk at g10code.com>
-
- Released 1.9.95.
-
-2006-11-03 Werner Koch <wk at g10code.com>
-
- * configure.ac: Test for pty.h. From Gentoo.
-
-2006-10-24 Werner Koch <wk at g10code.com>
-
- Released 1.9.94.
-
-2006-10-20 Werner Koch <wk at g10code.com>
-
- * Makefile.am (stowinstall): Add convenience target.
-
-2006-10-18 Werner Koch <wk at g10code.com>
-
- * configure.ac: svn revison magic fixes for old bashs. Suggested
- by Alain Guibert.
-
-2006-10-18 Werner Koch <wk at g10code.com>
-
- Released 1.9.93.
-
-2006-10-17 Werner Koch <wk at g10code.com>
-
- * autogen.sh <--build-w32>: Test also for a host "mingw32".
-
- * configure.ac: Removed W32LIBS. Use NETLIBS instead.
-
-2006-10-11 Werner Koch <wk at g10code.com>
-
- Released 1.9.92.
-
- * configure.ac: Require libassuan 0.9.3.
-
-2006-10-09 Werner Koch <wk at g10code.com>
-
- * acinclude.m4: Moved pth check to m4/gnupg-pth.m4.
-
-2006-10-06 Werner Koch <wk at g10code.com>
-
- * configure.ac: Also check for libassuan's pth version.
-
-2006-10-04 Werner Koch <wk at g10code.com>
-
- Released 1.9.91.
-
- * configure.ac: Require libassuan 0.9.1 which fixes a problem with
- gpgsm.
-
-2006-09-27 Werner Koch <wk at g10code.com>
-
- * gl/strsep.h, gl/strsep.c, gl/m4/strsep.m4: Removed.
- * gl/strpbrk.h, gl/strpbrk.c, gl/m4/strpbrk.m4: Removed.
- * gl/Makefile.am: Removed module strsep and strpbrk.
- * configure.ac: Check for strsep in the context of jnlib. Remove
- check from gl_MODULES. Moved check for timegm into the jnlib context.
-
-2006-09-27 Marcus Brinkmann <marcus at g10code.de>
-
- * Makefile.am: Fix cut & paste error.
-
-2006-09-25 Werner Koch <wk at g10code.com>
-
- Released 1.9.90.
-
-2006-09-22 Werner Koch <wk at g10code.com>
-
- * AUTHORS: Add information about used licenses.
-
-2006-09-20 Werner Koch <wk at g10code.com>
-
- * Makefile.am (dist-hook): Removed distfiles cruft.
- (SUBDIRS): Added include
-
-2006-09-18 Werner Koch <wk at g10code.com>
-
- Released 1.9.23.
-
- * configure.ac (--enable-agent-only): Donot build tools and doc
- (--disable-tools,--disable-doc): New.
- * Makefile.am (SUBDIRS): Allow to conditional build tools and doc.
-
-2006-09-14 Werner Koch <wk at g10code.com>
-
- Replaced all call gpg_error_from_errno(errno) by
- gpg_error_from_syserror().
-
- * configure.ac: Build gpg by default.
- (GNUPG_SYS_SO_PEERCRED): Removed.
-
-2006-09-13 Werner Koch <wk at g10code.com>
-
- * autogen.sh: Better detection of the cross compiler kit.
-
-2006-09-06 Marcus Brinkmann <marcus at g10code.de>
-
- * configure.ac: New automake conditional RUN_GPG_TESTS.
-
-2006-09-06 Werner Koch <wk at g10code.com>
-
- * configure.ac: Define _ASSUAN_ONLY_GPG_ERRORS. Require Assuan
- 0.9 and libgpg-error 1.4
-
-2006-08-31 Werner Koch <wk at g10code.com>
-
- * configure.ac: Require libksba 1.0 and added API check for it.
- (GPG_ERR_LOCKED): Removed DECL check as we require 1.2 anyway.
- (have_libusb): New to give a feedback about CCID support
-
-2006-08-21 Werner Koch <wk at g10code.com>
-
- * configure.ac: Removed docbook tests.
- (AC_CONFIG_FILES): Added gpgkeys_test and gpgkeys_mailto.
-
- * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Enable gpg.
-
-2006-08-17 Werner Koch <wk at g10code.com>
-
- * THANKS: Merged with the 1.4 one.
-
-2006-08-16 Werner Koch <wk at g10code.com>
-
- * configure.ac: Removed test for capabilities and mlock.
-
-2006-08-15 Werner Koch <wk at g10code.com>
-
- * Makefile.am (keyserver): Enable building of keyserver helpers.
-
- * configure.ac: Merged with the current configure from 1.4.5.
- Require libgpg-error 1.2 and libksba 0.9.16.
-
-2006-07-29 Marcus Brinkmann <marcus at g10code.de>
-
- * README: Spelling fixes.
-
-2006-07-27 Werner Koch <wk at g10code.com>
-
- Released 1.9.22.
-
- * configure.ac: Call AB_INIT.
-
-2006-07-03 Werner Koch <wk at g10code.com>
-
- * configure.ac: Test for ksba_dn_teststr.
-
-2006-06-30 Werner Koch <wk at g10code.com>
-
- * keyserver/: New. Taken from 1.4.4
- * Makefile.am (SUBDIRS): Include keyserver/.
- * configure.ac: Include keyserver/.
- (FAKE_CURL, GPGKEYS_CURL): New.
-
-2006-06-20 Werner Koch <wk at g10code.com>
-
- Released 1.9.21.
-
-2006-06-08 Marcus Brinkmann <marcus at g10code.de>
-
- * configure.ac (PTH_LIBS): Add --all to pth-config invocation.
-
-2006-05-24 Werner Koch <wk at g10code.com>
-
- * configure.ac: New option --disable-optimization taked from 1.4.3.
-
-2006-05-23 Werner Koch <wk at g10code.com>
-
- * configure.ac (ZLIBS): New for zlib link commands. Add bzip2
- support.
-
-2006-05-22 Werner Koch <wk at g10code.com>
-
- * configure.ac (EXEEXT): New.
-
-2006-04-18 Werner Koch <wk at g10code.com>
-
- * configure.ac (PK_UID_CACHE_SIZE): New.
-
-2006-04-07 Werner Koch <wk at g10code.com>
-
- * configure.ac: Use new method to include the SVN revison. Now it
- is the actual global revision number.
-
-2005-12-20 Werner Koch <wk at g10code.com>
-
- Released 1.9.20.
-
-2005-11-28 Werner Koch <wk at g10code.com>
-
- * configure.ac: Append the revision to the version string.
-
-2005-11-13 Werner Koch <wk at g10code.com>
-
- * am/cmacros.am (-DGNUPG_SYSCONFDIR): Define it.
-
-2005-11-11 Werner Koch <wk at g10code.com>
-
- * configure.ac (NEED_KSBA_VERSION: Require 0.9.13.
-
-2005-09-12 Werner Koch <wk at g10code.com>
-
- Released 1.9.19.
-
-2005-08-01 Werner Koch <wk at g10code.com>
-
- Released 1.9.18.
-
- * configure.ac: Require libksba 0.9.12 to match new features in gpgsm.
-
-2005-06-20 Werner Koch <wk at g10code.com>
-
- Released 1.9.17.
-
-2005-06-02 Werner Koch <wk at g10code.com>
-
- * configure.ac (HAVE_PTH): Define as alias for USE_GNU_PTH. It is
- used by common/estream.c.
-
-2005-06-01 Werner Koch <wk at g10code.com>
-
- * configure.ac (gl_INIT): Add gnulib stuff.
- (fseeko, ftello, ttyname, isascii): Replaced the AC_REPLACE_FUNCS
- by a simple check.
- (putc_unlocked): Removed check. Not used.
- (strsep, mkdtemp, asprintf): Replaced checks by gnulib checks.
- (xsize): Added will probably come handy soon.
- (CFLAGS): Use -Wformat-security instead of
- -Wformat-nonliteral. Add --Wno-format-y2k.
- * gl/, gl/m4/: New.
-
-2005-05-15 Werner Koch <wk at g10code.com>
-
- * configure.ac: Remove option --disable-threads; require the use
- of GNU Pth.
-
-2005-04-27 Werner Koch <wk at g10code.com>
-
- * configure.ac: Removed OpenSC detection and options.
- * acinclude.m4: Ditto.
-
-2005-04-21 Werner Koch <wk at g10code.com>
-
- Released 1.9.16.
-
- * configure.ac: Do not build gpg by default.
-
-2005-04-20 Werner Koch <wk at g10code.com>
-
- * configure.ac: Test whether GPG_ERR_LOCKED is declared and
- provide a replacement if not.
-
-2005-04-15 Werner Koch <wk at g10code.com>
-
- * configure.ac: Require libksba 0.9.11.
-
-2005-04-15 Marcus Brinkmann <marcus at g10code.de>
-
- * configure.ac: Check for /usr/bin/shred and define SHRED.
-
- * configure.ac: Add --enable-symcryptrun, disabled by default.
- Define automake variable BUILD_SYMCRYPTRUN.
- Check for openpty -lutil, define LIBUTIL_LIBS.
-
-2005-03-03 Werner Koch <wk at g10code.com>
-
- * acinclude.m4 (GNUPG_PTH_VERSION_CHECK): Accidently used
- --ldflags instead of --cflags. Reported by Kazu Yamamoto.
-
-2005-02-03 Werner Koch <wk at g10code.com>
-
- * AUTHORS: Copied from 1.4 and edited to refelct the changes in
- 1.9.
-
-2005-01-17 Werner Koch <wk at g10code.com>
-
- * configure.ac: Make --without-included-regex work as expected.
- Fixed FTP location info for some libraries.
-
-2005-01-13 Werner Koch <wk at g10code.com>
-
- Released 1.9.15.
-
- * acinclude.m4 (GNUPG_PTH_VERSION_CHECK): Link a simple test
- program to see whether the installation is sane.
-
-2005-01-07 Werner Koch <wk at g10code.com>
-
- * configure.ac: Require gpg-error 1.0.
-
-2005-01-04 Werner Koch <wk at g10code.com>
-
- * configure.ac: Remove hack not to build gpg2 for W32.
- * autogen.sh <build-w32>: Pass option --disable-gpg instead.
-
-2004-12-22 Werner Koch <wk at g10code.com>
-
- Released 1.9.14.
-
-2004-12-20 Werner Koch <wk at g10code.com>
-
- * configure.ac: Add PATHSEP_C and PATHSEP_S. For W32 let all
- directories default to c:/gnupg. Require libassuan 0.6.9.
-
-2004-12-18 Werner Koch <wk at g10code.com>
-
- * configure.ac (AH_BOTTOM): Define EXEEXT_S.
-
- * autogen.sh: Updated --build-w32 feature.
-
-2004-12-15 Werner Koch <wk at g10code.com>
-
- * Makefile.am (SUBDIRS) [W32]: Do not build in tests/.
-
- * acinclude.m4: Add proper macro name quoting for use with
- automake 1.9.
-
- * configure.ac: Add replacement check for ttyname.
- Removed support for a included zlib.
-
-2004-12-06 Werner Koch <wk at g10code.com>
-
- * configure.ac (have_w32_system): New. Disable Pth checks for W32.
- Link jnlib/w32-pth.h to pth.h.
-
-2004-12-03 Werner Koch <wk at g10code.com>
-
- Released 1.9.13.
-
-2004-11-26 Werner Koch <wk at g10code.com>
-
- * configure.ac: Replace strsep. Replaced use of "target" by
- "host".
-
-2004-10-22 Werner Koch <wk at g10code.com>
-
- Released 1.9.12.
-
- * Makefile.am (AUTOMAKE_OPTIONS): Set option to create bzip2 tarball.
-
-2004-10-01 Werner Koch <wk at g10code.com>
-
- Released 1.9.11.
-
-2004-09-30 Werner Koch <wk at g10code.com>
-
- * README: Minor updates.
-
-2004-09-30 gettextize <bug-gnu-gettext at gnu.org>
-
- * configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.14.1.
-
-2004-08-16 Werner Koch <wk at g10code.de>
-
- * configure.ac: Build Makefile for tests/pkits. New option
- --with-pkits-tests.
-
-2004-08-05 Werner Koch <wk at g10code.de>
-
- * configure.ac: Changed tests for libusb to also suuport the
- stable version 0.1.x.
-
-2004-07-22 Werner Koch <wk at g10code.de>
-
- Released 1.9.10.
-
- * configure.ac: Define AM conditional HAVE_OPENSC.
-
-2004-07-21 Werner Koch <wk at g10code.de>
-
- * configure.ac: Don't set DIE to no after it might has been set to
- yes.
-
-2004-07-20 Werner Koch <wk at g10code.de>
-
- * Makefile.am (sm): Build kbx only if gpgsm is to be build.
-
-2004-07-20 Werner Koch <wk at gnupg.org>
-
- * configure.ac: New option --enable-agent-only.
-
-2004-06-08 Werner Koch <wk at gnupg.org>
-
- Released 1.9.9.
-
-2004-06-06 Werner Koch <wk at gnupg.org>
-
- * configure.ac: Require libksba 0.9.7.
-
-2004-04-29 Werner Koch <wk at gnupg.org>
-
- Released 1.9.8.
-
-2004-04-20 Werner Koch <wk at gnupg.org>
-
- * configure.ac: Remove the fopencookie test. We don't need the
- dummy function because we conditionally use fopencookie,
- fpencookie or a replacement at place.
-
-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 1.9.7.
-
- * configure.ac: Require libgcrypt 1.1.94.
- Introduce PACKAGE_GT and set it to gnupg2.
-
-2004-03-23 Werner Koch <wk at gnupg.org>
-
- * configure.ac: Define SAFE_VERSION_DASH and SAFE_VERSION_DOT.
-
-2004-03-09 Werner Koch <wk at gnupg.org>
-
- * configure.ac (NEED_GPG_ERROR_VERSION): Set to 0.7.
-
-2004-03-06 Werner Koch <wk at gnupg.org>
-
- Released 1.9.6.
-
- * configure.ac: Check the Libgcrypt API.
-
-2004-02-25 Werner Koch <wk at gnupg.org>
-
- * configure.ac: New option --disable-threads to inhibit
- unintentional builds without Pth.
-
-2004-02-21 Werner Koch <wk at gnupg.org>
-
- Released 1.9.5.
-
-2004-02-20 Werner Koch <wk at gnupg.org>
-
- * configure.ac: Fixed URLs in the notice messages.
-
-2004-02-18 Werner Koch <wk at gnupg.org>
-
- * acinclude.m4: Removed macros to detect gpg-error, libgcrypt,
- libassuan and ksba as they are now distributed in m4/.
-
-2004-02-13 Werner Koch <wk at gnupg.org>
-
- * configure.ac: Require libksba 0.9.4 and libgcrypt 1.1.92.
-
-2004-02-12 Werner Koch <wk at gnupg.org>
-
- * autogen.sh: Removed cruft from debugging.
-
- * am/cmacros.am: New.
-
-2004-02-11 Werner Koch <wk at gnupg.org>
-
- * configure.ac: Removed the need for g10defs.h. Reworked the
- --with-foo-pgm stuff.
-
- * autogen.sh (check_version): Removed bashism and simplified.
- * acinclude.m4 (AM_PATH_OPENSC): Kludge to avoid error output for
- a bad opensc-config.
-
-2004-01-30 Werner Koch <wk at gnupg.org>
-
- Released 1.9.4.
-
- * configure.ac: Require libksba 0.9.3 due to another bug fix there.
-
-2004-01-29 Werner Koch <wk at gnupg.org>
-
- * README: Updated.
-
- * configure.ac: Require libksba 0.9.2 due to bug fixes.
-
-2004-01-24 Werner Koch <wk at gnupg.org>
-
- * configure.ac: Now requires libassuan 0.6.3.
-
-2003-12-23 Werner Koch <wk at gnupg.org>
-
- Released 1.9.3.
-
- * README-alpha: Removed.
- * configure.ac, Makefile.am: Add the tests and tools directories.
-
-2003-12-19 Werner Koch <wk at gnupg.org>
-
- * configure.ac: Now require libgcrypt 1.1.91 to help testing the
- latest libgcrypt changes. Requires libksab 0.9.1.
-
-2003-12-17 Werner Koch <wk at gnupg.org>
-
- * configure.ac: Requires now libassuan 0.6.2.
- (CFLAGS): Add --Wformat-noliteral in gcc mode.
-
-2003-12-16 Werner Koch <wk at gnupg.org>
-
- * configure.ac: Check for funopen and fopencookie as part of the
- jnlib checks.
-
-2003-12-09 Werner Koch <wk at gnupg.org>
-
- * configure.ac: Add a min_automake_version.
- * README.CVS: New.
- * autogen.sh: Revamped except for the --build-w32 hack.
- * Makefile.am: Add README.CVS
-
-2003-11-17 Werner Koch <wk at gnupg.org>
-
- Release 1.9.2.
-
- * configure.ac: Requires now libassuan 0.6.1.
-
-2003-10-31 Werner Koch <wk at gnupg.org>
-
- * configure.ac (NEED_KSBA_VERSION): Set to 0.9.0 due the changed
- time interface.
-
-2003-10-21 Werner Koch <wk at gnupg.org>
-
- * configure.ac (PRINTABLE_OS_NAME): Remove special case for The
- Hurd; Robert Millan reported that the uname test is now
- sufficient.
-
-2003-10-01 Werner Koch <wk at gnupg.org>
-
- * configure.ac (AH_BOTTOM): Define GNUPG_MAJOR_VERSION.
-
-2003-09-23 Werner Koch <wk at gnupg.org>
-
- Merged most of David Shaw's changes in 1.3 since 2003-06-03.
-
- * configure.ac: Drop all TIGER/192 support.
- (uint64_t): Check for UINT64_C to go along with uint64_t.
- (getaddrinfo): Check for it.
- (sigset_t): Check for sigset_t and struct sigaction. This is for
- Forte c89 on Solaris which seems to define only the function call
- half of the two pairs by default.
- (W32LIBS): Include wsock32 in W32LIBS. This is different from
- NETLIBS so we don't need to force other platforms to pull in the
- netlibs when they aren't actually needed.
-
-2003-09-06 Werner Koch <wk at gnupg.org>
-
- Released 1.9.1.
-
- * configure.ac: Require newer versions of some libraries.
-
-2003-09-02 Werner Koch <wk at gnupg.org>
-
- * configure.ac (HAVE_LIBUSB): Added a simple test for libusb.
-
-2003-08-19 Marcus Brinkmann <marcus at g10code.de>
-
- * configure.ac (AM_PATH_GPG_ERROR): Add missing comma in
- invocation.
-
-2003-08-06 Werner Koch <wk at gnupg.org>
-
- * configure.ac: Check for libgpg-error. Print infos about missing
- libraries more nicely.
- * acinclude.m4 (AM_PATH_GPG_ERROR): Added.
-
-2003-08-05 Werner Koch <wk at gnupg.org>
-
- Released 1.9.0.
-
- * configure.ac (GNUPG_DEFAULT_HONMEDIR): Changed back to ~/.gnupg.
-
-2003-07-31 Werner Koch <wk at gnupg.org>
-
- * Makefile.am (DISTCLEANFILES): Add g10defs.h
-
-2003-06-18 Werner Koch <wk at gnupg.org>
-
- * configure.ac (GNUPG_DEFAULT_HOMEDIR): Changed temporary to
- .gnupg2 to avoid accidential use with production keys.
-
-2003-06-11 Werner Koch <wk at gnupg.org>
-
- * configure.ac: Merged all stuff from current 1.3 version in.
- * acinclude.m4: Merged required macros from current 1.2 version in.
-
-2003-06-04 Werner Koch <wk at gnupg.org>
-
- * configure.ac, Makefile.am: Enable building of gpg.
-
-2003-04-29 Werner Koch <wk at gnupg.org>
-
- * configure.ac: Build a limited version of scdaemon if libopensc
- is not available.
-
- * configure.ac (ALL_LINUGAS): Removed.
-
- * Makefile.am (ACLOCAL_AMFLAGS): New.
- * configure.ac (AM_GNU_GETTEXT_VERSION): New. Set to 0.11.5.
-
-2003-04-29 gettextize <bug-gnu-gettext at gnu.org>
-
- * Makefile.am (SUBDIRS): Add m4.
- (ACLOCAL_AMFLAGS): New variable.
- (EXTRA_DIST): Add scripts/config.rpath.
- * configure.ac (AC_CONFIG_FILES): Add m4/Makefile.
-
-2003-04-29 Werner Koch <wk at gnupg.org>
-
- * assuan/ : Removed. We now use libassuan.
- * Makefile.am (SUBDIRS): Removed assuan
-
- * configure.ac: Check for libassuan.
-
-2003-01-09 Werner Koch <wk at gnupg.org>
-
- * configure.ac (GNUPG_PROTECT_TOOL): New option --with-protect-tool.
- (NEED_KSBA_VERSION): Does now require 0.4.6.
-
- * README: Noted where to find gpg-protect-tool.
-
-2002-10-31 Neal H. Walfield <neal at g10code.de>
-
- * configure.ac: Check for flockfile and funlockfile. Check for
- isascii and putc_unlocked replacing them if not found.
-
- * configure.ac (PTH_LIBS): If pth is found, add the output of
- `$PTH_CONFIG --ldflags`, not just `$PTH_CONFIG --libs`.
-
-2002-10-19 Werner Koch <wk at gnupg.org>
-
- * configure.ac: Bumped version number to 1.9.0-cvs.
-
- NewPG (Aegypten project) to GnuPG merge.
-
-2002-09-20 Werner Koch <wk at gnupg.org>
-
- Released 0.9.2.
-
-2002-09-05 Neal H. Walfield <neal at g10code.de>
-
- * configure.ac: Check for makeinfo.
-
-2002-09-03 Neal H. Walfield <neal at g10code.de>
-
- * autogen.sh (have_version): New function. Generalize and
- simplify logic for finding and determining the versions of GNU
- programs. Use it.
-
-2002-08-23 Werner Koch <wk at gnupg.org>
-
- Released 0.9.1.
-
- * acinclude.m4 (AM_PATH_LIBGCRYPT): Updated from Libgcrypt.
- (AM_PATH_OPENSC): Strip non-digits from the micro version.
-
-2002-08-21 Werner Koch <wk at gnupg.org>
-
- Released 0.9.0.
-
- * configure.ac: Changed the default homedir to .gnupg.
- * README-alpha: Removed.
-
-2002-08-19 Werner Koch <wk at gnupg.org>
-
- * acinclude.m4: Removed -lpcsclite from KSBA_LIBS; copy+paste bug.
-
-2002-08-13 Werner Koch <wk at gnupg.org>
-
- * acinclude.m4 (AM_PATH_OPENSC, AM_PATH_KSBA): New.
- * configure.ac: Use them.
-
-2002-08-10 Werner Koch <wk at gnupg.org>
-
- Released 0.3.10.
-
- * configure.ac (NEED_LIBKSBA_VERSION): Require 0.4.4. Add support
- for gettext.
-
-2002-07-22 Werner Koch <wk at gnupg.org>
-
- * configure.ac: Check for ftello and provide a replacement.
-
-2002-07-01 Werner Koch <wk at gnupg.org>
-
- Released 0.3.9.
-
- * README: Short note on how to export in pkcs-12 format.
-
-2002-06-29 Werner Koch <wk at gnupg.org>
-
- * configure.ac: Define --with options to set the default location
- of the agent, scdaemon, pinentry and dirmngr.
-
-2002-06-27 Werner Koch <wk at gnupg.org>
-
- * README: Short blurb on how to import a PKCS-12 file.
-
- * configure.ac (AH_BOTTOM): New to define some constants.
-
-2002-06-25 Werner Koch <wk at gnupg.org>
-
- Released 0.3.8.
-
- * configure.ac (NEED_LIBGCRYPT_VERSION): Set to 1.1.8.
-
-2002-06-12 Werner Koch <wk at gnupg.org>
-
- * configure.ac (NEED_LIBKSBA_VERSION): We need 0.4.3 now.
-
-2002-06-04 Werner Koch <wk at gnupg.org>
-
- Released 0.3.7.
-
-2002-05-21 Werner Koch <wk at gnupg.org>
-
- * configure.ac: We now require libgcrypt 1.1.7 and libksba 0.4.2.
-
-2002-05-14 Werner Koch <wk at gnupg.org>
-
- * doc/: New
- * configure.ac, Makefile.am: Added doc/
-
-2002-05-03 Werner Koch <wk at gnupg.org>
-
- Released 0.3.6.
-
-2002-04-25 Werner Koch <wk at gnupg.org>
-
- * configure.ac: Check for setlocale.
-
-2002-04-24 Marcus Brinkmann <marcus at g10code.de>
-
- * configure.ac: Check for locale.h.
-
-2002-04-15 Werner Koch <wk at gnupg.org>
-
- Released 0.3.5.
-
- * NEWS: Started to describe release notes.
-
- * configure.ac (NEED_LIBKSBA_VERSION, NEED_LIBGCRYPT_VERSION): Defined
-
-2002-04-01 Werner Koch <wk at gnupg.org>
-
- Released 0.3.4.
-
-2002-03-18 Werner Koch <wk at gnupg.org>
-
- Released 0.3.3.
-
-2002-03-08 Werner Koch <wk at gnupg.org>
-
- * README: Add some explanation on how to specify a user ID.
-
-2002-03-06 Werner Koch <wk at gnupg.org>
-
- Released 0.3.2.
-
-2002-03-04 Werner Koch <wk at gnupg.org>
-
- Released 0.3.1.
-
- * README: Explained some options and files.
-
-2002-02-14 Werner Koch <wk at gnupg.org>
-
- * configure.ac: Fixed status messages related to presence of Pth.
-
-2002-02-13 Werner Koch <wk at gnupg.org>
-
- * acinclude.m4 (GNUPG_SYS_SO_PEERCRED): New.
- * configure.ac: use it.
-
-2002-02-12 Werner Koch <wk at gnupg.org>
-
- * configure.ac: Check for PTH. Provide replacement fucntions for
- apsrintf and fopencookie.
-
- * acinclude.m4 (GNUPG_PTH_VERSION_CHECK): New.
-
-2002-02-07 Werner Koch <wk at gnupg.org>
-
- Released 0.3.0.
-
- * configure.ac: Require libgcrypt 1.1.6.
-
-2002-02-01 Marcus Brinkmann <marcus at g10code.de>
-
- * configure.ac (KSBA_CONFIG): Remove superfluous x in front of
- variable.
-
-2002-01-26 Werner Koch <wk at gnupg.org>
-
- * configure.ac: Add options to disable the build of some programs
- and print a configure status at the end.
- * acinclude.m4 (GNUPG_BUILD_PROGRAM): New.
-
- * scd/ : New. Added to Makefile and configure.
- * configure.ac: Check for libopensc
- * Makefile.am: Build scd only when libopensc is available
-
-2002-01-23 Werner Koch <wk at gnupg.org>
-
- * configure.ac (mkdtemp): See whether we have to provide a
- replacement.
-
-2001-12-18 Werner Koch <wk at gnupg.org>
-
- Released 0.0.0.
-
-2001-12-17 Werner Koch <wk at gnupg.org>
-
- * acinclude.m4: Add AM_PATH_LIBGCRYPT macro.
- * configure.ac: and use it here. Figure out the location of libksba
-
-2001-12-15 Werner Koch <wk at gnupg.org>
-
- * configure.ac (missing_dir): Bail out if asprintf and fopencookie
- are not available.
-
-2001-12-04 Werner Koch <wk at gnupg.org>
-
- * configure.ac (HAVE_JNLIB_LOGGING): always define it.
-
-
- Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009)
- 2010 Free Software Foundation, Inc.
-
- 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 98%
copy from ChangeLog
copy to ChangeLog-2011
index 28dab02..46320b2 100644
--- a/ChangeLog
+++ b/ChangeLog-2011
@@ -1,3 +1,10 @@
+2011-12-02 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-08-04 Werner Koch <wk at g10code.com>
Release 2.0.18.
@@ -452,7 +459,7 @@
2006-09-14 Werner Koch <wk at g10code.com>
- Replaced all call gpg_error_from_errno(errno) by
+ Replaced all call gpg_error_from_errno(errno) by
gpg_error_from_syserror().
* configure.ac: Build gpg by default.
@@ -1188,7 +1195,7 @@
* configure.ac (HAVE_JNLIB_LOGGING): always define it.
- Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009)
+ Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
2010 Free Software Foundation, Inc.
This file is free software; as a special exception the author gives
diff --git a/Makefile.am b/Makefile.am
index 103375a..8a54655 100644
--- a/Makefile.am
+++ b/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
-DISTCLEANFILES = g10defs.h
+EXTRA_DIST = scripts/config.rpath autogen.sh README.SVN \
+ 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
diff --git a/agent/ChangeLog b/agent/ChangeLog-2011
similarity index 99%
rename from agent/ChangeLog
rename to agent/ChangeLog-2011
index 09e6026..f543f27 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog-2011
@@ -1,3 +1,10 @@
+2011-12-02 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-08-04 Werner Koch <wk at g10code.com>
* command.c (cmd_keyinfo, do_one_keyinfo): Support options --data
@@ -1038,7 +1045,7 @@
2006-09-14 Werner Koch <wk at 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
diff --git a/agent/Makefile.am b/agent/Makefile.am
index 38200c1..cc8a22a 100644
--- a/agent/Makefile.am
+++ b/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)
diff --git a/autogen.sh b/autogen.sh
index eadf0c7..289c21e 100755
--- a/autogen.sh
+++ b/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
diff --git a/common/ChangeLog b/common/ChangeLog-2011
similarity index 99%
rename from common/ChangeLog
rename to common/ChangeLog-2011
index 0b4610d..0d0d1cc 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog-2011
@@ -1,3 +1,10 @@
+2011-12-02 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-08-04 Werner Koch <wk at g10code.com>
* ssh-utils.c, ssh-utils.h: New.
diff --git a/common/Makefile.am b/common/Makefile.am
index 10c5403..a830a47 100644
--- a/common/Makefile.am
+++ b/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)
diff --git a/doc/ChangeLog b/doc/ChangeLog-2011
similarity index 98%
rename from doc/ChangeLog
rename to doc/ChangeLog-2011
index 7dae4ca..680affa 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog-2011
@@ -1,3 +1,10 @@
+2011-12-02 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-01-13 Werner Koch <wk at 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 at g10code.com>
@@ -425,7 +432,7 @@
2007-02-18 Werner Koch <wk at 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 at 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 at 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
diff --git a/doc/HACKING b/doc/HACKING
index 07f09c5..e27bc07 100644
--- a/doc/HACKING
+++ b/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
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 2be818e..4d8e6b3 100644
--- a/doc/Makefile.am
+++ b/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 \
diff --git a/g10/ChangeLog b/g10/ChangeLog-2011
similarity index 99%
rename from g10/ChangeLog
rename to g10/ChangeLog-2011
index a42c490..48a05ad 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog-2011
@@ -1,3 +1,10 @@
+2011-12-02 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-08-04 Werner Koch <wk at 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 at 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 at 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.
diff --git a/g10/Makefile.am b/g10/Makefile.am
index 3c85bbe..126c55c 100644
--- a/g10/Makefile.am
+++ b/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:
- - at rm $(DESTDIR)$(pkgdatadir)/gpg-conf.skel
+ - at rm $(DESTDIR)$(pkgdatadir)/gpg-conf.skel
diff --git a/include/ChangeLog b/include/ChangeLog-2011
similarity index 97%
rename from include/ChangeLog
rename to include/ChangeLog-2011
index 97f491e..7098427 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog-2011
@@ -1,3 +1,10 @@
+2011-12-02 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-07-01 Werner Koch <wk at g10code.com>
* cipher.h (PUBKEY_ALGO_ECDH, PUBKEY_ALGO_ECDSA): New.
diff --git a/include/Makefile.am b/include/Makefile.am
index 25518bf..4d733ba 100644
--- a/include/Makefile.am
+++ b/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
diff --git a/jnlib/ChangeLog b/jnlib/ChangeLog-2011
similarity index 97%
rename from jnlib/ChangeLog
rename to jnlib/ChangeLog-2011
index 87c5bda..c8306fc 100644
--- a/jnlib/ChangeLog
+++ b/jnlib/ChangeLog-2011
@@ -1,3 +1,10 @@
+2011-12-02 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.
+
2009-08-26 Werner Koch <wk at g10code.com>
* stringhelp.c (do_make_filename): Factor some code out to ..
@@ -52,7 +59,7 @@
2009-01-22 Werner Koch <wk at 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 at 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 at 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 at 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 at 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 at 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 at g10code.com>
* logging.c (log_test_fd): Add test on LOGSTREAM. Reported by
@@ -573,7 +580,7 @@
2003-06-13 Werner Koch <wk at 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 at 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 at gnupg.org>
@@ -688,8 +695,8 @@ Mon Jan 24 13:04:28 CET 2000 Werner Koch <wk at 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.
diff --git a/jnlib/Makefile.am b/jnlib/Makefile.am
index c6d0b3a..b3e7d7d 100644
--- a/jnlib/Makefile.am
+++ b/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)
diff --git a/kbx/ChangeLog b/kbx/ChangeLog-2011
similarity index 96%
rename from kbx/ChangeLog
rename to kbx/ChangeLog-2011
index 701e411..ed3aa41 100644
--- a/kbx/ChangeLog
+++ b/kbx/ChangeLog-2011
@@ -1,3 +1,10 @@
+2011-12-02 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-08-04 Werner Koch <wk at g10code.com>
* keybox-openpgp.c (parse_key): Remove set but unused vars
@@ -117,7 +124,7 @@
2006-09-14 Werner Koch <wk at 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 at g10code.de>
diff --git a/kbx/Makefile.am b/kbx/Makefile.am
index 14e8fa5..0d6a066 100644
--- a/kbx/Makefile.am
+++ b/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
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog-2011
similarity index 99%
rename from keyserver/ChangeLog
rename to keyserver/ChangeLog-2011
index 14d5f62..b3f96a4 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog-2011
@@ -1,3 +1,10 @@
+2011-12-02 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.
+
2009-08-26 Werner Koch <wk at 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 at jabberwocky.com>
@@ -99,7 +106,7 @@
2008-04-07 Werner Koch <wk at 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 at 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 at 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 at g10code.com>
- * Makefile.am (other_libs):
+ * Makefile.am (other_libs):
2004-10-18 David Shaw <dshaw at jabberwocky.com>
diff --git a/keyserver/Makefile.am b/keyserver/Makefile.am
index 96cd8d1..e625127 100644
--- a/keyserver/Makefile.am
+++ b/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
diff --git a/m4/ChangeLog b/m4/ChangeLog-2011
similarity index 94%
rename from m4/ChangeLog
rename to m4/ChangeLog-2011
index 5743e60..218bc86 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog-2011
@@ -1,3 +1,10 @@
+2011-12-02 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-09-12 Werner Koch <wk at 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.
-
diff --git a/m4/Makefile.am b/m4/Makefile.am
index d0d84e2..c5ac24f 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -12,6 +12,8 @@ EXTRA_DIST += estream.m4
EXTRA_DIST += sys_socket_h.m4 socklen.m4
+EXTRA_DIST += ChangeLog-2011
+
diff --git a/po/ChangeLog b/po/ChangeLog-2011
similarity index 96%
rename from po/ChangeLog
rename to po/ChangeLog-2011
index 8a25805..6c1d897 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog-2011
@@ -1,3 +1,10 @@
+2011-12-02 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-01-12 Jakub Bogusz <qboosh at 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 at 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.
-
-
diff --git a/scd/ChangeLog b/scd/ChangeLog-2011
similarity index 99%
rename from scd/ChangeLog
rename to scd/ChangeLog-2011
index ce442aa..d686058 100644
--- a/scd/ChangeLog
+++ b/scd/ChangeLog-2011
@@ -1,3 +1,10 @@
+2011-12-02 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-08-04 Werner Koch <wk at g10code.com>
* pcsc-wrapper.c (handle_open): Remove unused var LISTLEN.
@@ -931,7 +938,7 @@
2006-09-14 Werner Koch <wk at 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
diff --git a/scd/Makefile.am b/scd/Makefile.am
index ae623ac..58e2f9b 100644
--- a/scd/Makefile.am
+++ b/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 =
diff --git a/scripts/ChangeLog b/scripts/ChangeLog-2011
similarity index 81%
rename from scripts/ChangeLog
rename to scripts/ChangeLog-2011
index fd30923..a4b30d7 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog-2011
@@ -1,3 +1,10 @@
+2011-12-02 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-07-22 Werner Koch <wk at 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.
-
-
diff --git a/scripts/git-hooks/commit-msg b/scripts/git-hooks/commit-msg
new file mode 100755
index 0000000..5a697c7
--- /dev/null
+++ b/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:
diff --git a/scripts/git-log-fix b/scripts/git-log-fix
new file mode 100644
index 0000000..af702fe
--- /dev/null
+++ b/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.
diff --git a/scripts/git-log-footer b/scripts/git-log-footer
new file mode 100644
index 0000000..4d98e37
--- /dev/null
+++ b/scripts/git-log-footer
@@ -0,0 +1,15 @@
+
+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) 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.
diff --git a/scripts/gitlog-to-changelog b/scripts/gitlog-to-changelog
new file mode 100755
index 0000000..40a8035
--- /dev/null
+++ b/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 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/sm/ChangeLog b/sm/ChangeLog-2011
similarity index 99%
rename from sm/ChangeLog
rename to sm/ChangeLog-2011
index 7f7118a..4efea96 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog-2011
@@ -1,3 +1,10 @@
+2011-12-02 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-08-04 Werner Koch <wk at g10code.com>
* keydb.c (keydb_add_resource): Remove set but unused var
@@ -1025,7 +1032,7 @@ h2007-11-22 Werner Koch <wk at g10code.com>
2006-09-14 Werner Koch <wk at 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 at g10code.com>
diff --git a/sm/Makefile.am b/sm/Makefile.am
index 100c57b..d945d71 100644
--- a/sm/Makefile.am
+++ b/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_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) $(LIBASSUAN_CFLAGS)
-AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common -I$(top_srcdir)/intl
+AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common -I$(top_srcdir)/intl
include $(top_srcdir)/am/cmacros.am
diff --git a/tests/ChangeLog b/tests/ChangeLog-2011
similarity index 91%
rename from tests/ChangeLog
rename to tests/ChangeLog-2011
index 33519f7..75bbaac 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog-2011
@@ -1,3 +1,10 @@
+2011-12-02 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.
+
2009-10-13 Werner Koch <wk at g10code.com>
* asschk.c (die): Replace this vararg macro by C-89 compliant
@@ -12,7 +19,7 @@
2008-10-20 Werner Koch <wk at 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 at g10code.com>
@@ -108,7 +115,7 @@
* Makefile.am: Fixes for make dist.
* samplekets/Makefile.am: New.
-
+
2002-08-08 Werner Koch <wk at 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.
-
-
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 512d9d7..46c9af0 100644
--- a/tests/Makefile.am
+++ b/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
diff --git a/tests/openpgp/ChangeLog b/tests/openpgp/ChangeLog-2011
similarity index 96%
rename from tests/openpgp/ChangeLog
rename to tests/openpgp/ChangeLog-2011
index beb6197..75246dd 100644
--- a/tests/openpgp/ChangeLog
+++ b/tests/openpgp/ChangeLog-2011
@@ -1,3 +1,10 @@
+2011-12-02 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-05-12 Werner Koch <wk at 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 at gnupg.org>
* verify.test: New.
@@ -204,7 +211,7 @@
2002-05-10 Werner Koch <wk at 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 at gnupg.org>
@@ -232,7 +239,7 @@
2001-09-28 Werner Koch <wk at 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 at gnupg.org>
* genkey1024.test: Simplified by using a parameter file.
@@ -271,7 +278,7 @@
2001-03-20 Werner Koch <wk at 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 at 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.
-
-
diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am
index 4615942..837298d 100644
--- a/tests/openpgp/Makefile.am
+++ b/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
diff --git a/tests/pkits/ChangeLog b/tests/pkits/ChangeLog-2011
similarity index 85%
rename from tests/pkits/ChangeLog
rename to tests/pkits/ChangeLog-2011
index 992d1df..a98689e 100644
--- a/tests/pkits/ChangeLog
+++ b/tests/pkits/ChangeLog-2011
@@ -1,3 +1,10 @@
+2011-12-02 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.
+
2009-03-03 Werner Koch <wk at g10code.com>
* inittests (clean_files): Use /bin/pwd here as well.
@@ -11,11 +18,11 @@
2008-02-19 Werner Koch <wk at 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.
diff --git a/tests/pkits/Makefile.am b/tests/pkits/Makefile.am
index f59e5ec..8098ad2 100644
--- a/tests/pkits/Makefile.am
+++ b/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)
- import-all-certs.data
+EXTRA_DIST = inittests runtest common.sh $(testscripts) ChangeLog-2011 \
+ import-all-certs.data
TESTS = $(testscripts)
diff --git a/tools/ChangeLog b/tools/ChangeLog-2011
similarity index 98%
rename from tools/ChangeLog
rename to tools/ChangeLog-2011
index 195f0c4..1eca0b5 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog-2011
@@ -1,3 +1,10 @@
+2011-12-02 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-08-04 Werner Koch <wk at g10code.com>
* symcryptrun.c: Include utmp.h for login_tty.
@@ -584,7 +591,7 @@
2006-09-12 Werner Koch <wk at 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
diff --git a/tools/Makefile.am b/tools/Makefile.am
index e07d8e3..32940a3 100644
--- a/tools/Makefile.am
+++ b/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
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1208 +--------------------------
ChangeLog => ChangeLog-2011 | 11 +-
Makefile.am | 35 +-
agent/{ChangeLog => ChangeLog-2011} | 9 +-
agent/Makefile.am | 9 +-
autogen.sh | 9 +-
common/{ChangeLog => ChangeLog-2011} | 7 +
common/Makefile.am | 2 +-
doc/{ChangeLog => ChangeLog-2011} | 19 +-
doc/HACKING | 32 +-
doc/Makefile.am | 2 +-
g10/{ChangeLog => ChangeLog-2011} | 15 +-
g10/Makefile.am | 18 +-
include/{ChangeLog => ChangeLog-2011} | 7 +
include/Makefile.am | 2 +-
jnlib/{ChangeLog => ChangeLog-2011} | 33 +-
jnlib/Makefile.am | 14 +-
kbx/{ChangeLog => ChangeLog-2011} | 9 +-
kbx/Makefile.am | 12 +-
keyserver/{ChangeLog => ChangeLog-2011} | 19 +-
keyserver/Makefile.am | 14 +-
m4/{ChangeLog => ChangeLog-2011} | 8 +-
m4/Makefile.am | 2 +
po/{ChangeLog => ChangeLog-2011} | 13 +-
scd/{ChangeLog => ChangeLog-2011} | 9 +-
scd/Makefile.am | 10 +-
scripts/{ChangeLog => ChangeLog-2011} | 9 +-
scripts/git-hooks/commit-msg | 127 +++
scripts/git-log-fix | 3 +
scripts/git-log-footer | 15 +
scripts/gitlog-to-changelog | 345 ++++++++
sm/{ChangeLog => ChangeLog-2011} | 9 +-
sm/Makefile.am | 10 +-
tests/{ChangeLog => ChangeLog-2011} | 15 +-
tests/Makefile.am | 14 +-
tests/openpgp/{ChangeLog => ChangeLog-2011} | 21 +-
tests/openpgp/Makefile.am | 10 +-
tests/pkits/{ChangeLog => ChangeLog-2011} | 11 +-
tests/pkits/Makefile.am | 12 +-
tools/{ChangeLog => ChangeLog-2011} | 9 +-
tools/Makefile.am | 14 +-
41 files changed, 816 insertions(+), 1336 deletions(-)
copy ChangeLog => ChangeLog-2011 (98%)
rename agent/{ChangeLog => ChangeLog-2011} (99%)
rename common/{ChangeLog => ChangeLog-2011} (99%)
rename doc/{ChangeLog => ChangeLog-2011} (98%)
rename g10/{ChangeLog => ChangeLog-2011} (99%)
rename include/{ChangeLog => ChangeLog-2011} (97%)
rename jnlib/{ChangeLog => ChangeLog-2011} (97%)
rename kbx/{ChangeLog => ChangeLog-2011} (96%)
rename keyserver/{ChangeLog => ChangeLog-2011} (99%)
rename m4/{ChangeLog => ChangeLog-2011} (94%)
rename po/{ChangeLog => ChangeLog-2011} (96%)
rename scd/{ChangeLog => ChangeLog-2011} (99%)
rename scripts/{ChangeLog => ChangeLog-2011} (81%)
create mode 100755 scripts/git-hooks/commit-msg
create mode 100644 scripts/git-log-fix
create mode 100644 scripts/git-log-footer
create mode 100755 scripts/gitlog-to-changelog
rename sm/{ChangeLog => ChangeLog-2011} (99%)
rename tests/{ChangeLog => ChangeLog-2011} (91%)
rename tests/openpgp/{ChangeLog => ChangeLog-2011} (96%)
rename tests/pkits/{ChangeLog => ChangeLog-2011} (85%)
rename tools/{ChangeLog => ChangeLog-2011} (98%)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list