Skip to content

Commit 2336b09

Browse files
dd9jndd9jn
committed
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. * 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.
1 parent 2c5d021 commit 2336b09

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+2102
-1440
lines changed

‎ChangeLog

+12-1,379
Large diffs are not rendered by default.

‎ChangeLog-2011

+1,394
Large diffs are not rendered by default.

‎Makefile.am

+21-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,12 @@
2020

2121
ACLOCAL_AMFLAGS = -I m4 -I gl/m4
2222
AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
23-
DISTCHECK_CONFIGURE_FLAGS = --enable-symcryptrun --enable-mailto
23+
DISTCHECK_CONFIGURE_FLAGS = --enable-symcryptrun --enable-mailto --enable-gpgtar
2424

25-
EXTRA_DIST = scripts/config.rpath scripts/potomo autogen.sh README.GIT
25+
EXTRA_DIST = scripts/config.rpath scripts/potomo autogen.sh README.GIT \
26+
ChangeLog-2011 po/ChangeLog-2011 scripts/ChangeLog-2011 \
27+
scripts/gitlog-to-changelog \
28+
scripts/git-log-fix scripts/git-log-footer
2629
DISTCLEANFILES = g10defs.h
2730

2831
if BUILD_GPGSM
@@ -90,7 +93,7 @@ SUBDIRS = m4 gl include common ${kbx} \
9093
dist_doc_DATA = README
9194

9295

93-
dist-hook:
96+
dist-hook: gen-ChangeLog
9497
echo "$(VERSION)" > $(distdir)/VERSION
9598

9699
if HAVE_W32_SYSTEM
@@ -106,5 +109,20 @@ install-data-hook:
106109
done
107110
endif
108111

112+
113+
gen_start_date = 2011-12-01T06:00:00
114+
.PHONY: gen-ChangeLog
115+
gen-ChangeLog:
116+
if test -d $(top_srcdir)/.git; then \
117+
(cd $(top_srcdir) && \
118+
./scripts/gitlog-to-changelog \
119+
--amend=scripts/git-log-fix \
120+
--since=$(gen_start_date) ) > $(distdir)/cl-t; \
121+
cat $(top_srcdir)/scripts/git-log-footer >> $(distdir)/cl-t; \
122+
rm -f $(distdir)/ChangeLog; \
123+
mv $(distdir)/cl-t $(distdir)/ChangeLog; \
124+
fi
125+
126+
109127
stowinstall:
110128
$(MAKE) $(AM_MAKEFLAGS) install prefix=/usr/local/stow/gnupg

‎agent/ChangeLog ‎agent/ChangeLog-2011

+12-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
2011-12-01 Werner Koch <[email protected]>
2+
3+
NB: ChangeLog files are no longer manually maintained. Starting
4+
on December 1st, 2011 we put change information only in the GIT
5+
commit log, and generate a top-level ChangeLog file from logs at
6+
"make dist". See doc/HACKING for details.
7+
18
2011-11-28 Werner Koch <[email protected]>
29

310
* command-ssh.c (card_key_available): Change wording of no key
@@ -1524,7 +1531,7 @@
15241531

15251532
2006-09-14 Werner Koch <[email protected]>
15261533

1527-
Replaced all call gpg_error_from_errno(errno) by
1534+
Replaced all call gpg_error_from_errno(errno) by
15281535
gpg_error_from_syserror().
15291536

15301537
* call-pinentry.c (start_pinentry): Replaced pipe_connect2 by
@@ -3094,3 +3101,7 @@ Fri Aug 18 14:27:14 CEST 2000 Werner Koch <[email protected]>
30943101
This file is distributed in the hope that it will be useful, but
30953102
WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
30963103
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
3104+
3105+
Local Variables:
3106+
buffer-read-only: t
3107+
End:

‎agent/Makefile.am

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ libexec_PROGRAMS += gpg-preset-passphrase
2525
endif
2626
noinst_PROGRAMS = $(TESTS)
2727

28-
# EXTRA_DIST = gpg-agent.ico gpg-agent-resource.rc
28+
EXTRA_DIST = ChangeLog-2011
29+
2930

3031
AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common -I$(top_srcdir)/intl
3132

‎common/ChangeLog ‎common/ChangeLog-2011

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
2011-12-01 Werner Koch <[email protected]>
2+
3+
NB: ChangeLog files are no longer manually maintained. Starting
4+
on December 1st, 2011 we put change information only in the GIT
5+
commit log, and generate a top-level ChangeLog file from logs at
6+
"make dist". See doc/HACKING for details.
7+
18
2011-11-30 Werner Koch <[email protected]>
29

310
Rewrite dns-cert.c to not use the gpg-only iobuf stuff.
@@ -2481,3 +2488,7 @@
24812488
This file is distributed in the hope that it will be useful, but
24822489
WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
24832490
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
2491+
2492+
Local Variables:
2493+
buffer-read-only: t
2494+
End:

‎common/ChangeLog.jnlib

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
2011-12-01 Werner Koch <[email protected]>
2+
3+
NB: ChangeLog files are no longer manually maintained. Starting
4+
on December 1st, 2011 we put change information only in the GIT
5+
commit log, and generate a top-level ChangeLog file from logs at
6+
"make dist". See doc/HACKING for details.
7+
18
2010-03-10 Werner Koch <[email protected]>
29

310
See gnupg/common/ChangeLog for newer changes.
@@ -767,3 +774,7 @@ Mon Jan 24 13:04:28 CET 2000 Werner Koch <[email protected]>
767774
This file is distributed in the hope that it will be useful, but
768775
WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
769776
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
777+
778+
Local Variables:
779+
buffer-read-only: t
780+
End:

‎common/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
## Process this file with automake to produce Makefile.in
2020

21-
EXTRA_DIST = mkstrtable.awk exaudit.awk exstatus.awk \
21+
EXTRA_DIST = mkstrtable.awk exaudit.awk exstatus.awk ChangeLog-2011 \
2222
audit-events.h status-codes.h README.jnlib ChangeLog.jnlib
2323

2424
noinst_LIBRARIES = libcommon.a libcommonpth.a libgpgrl.a

‎dirmngr/ChangeLog ‎dirmngr/ChangeLog-2011

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
2011-12-01 Werner Koch <[email protected]>
2+
3+
NB: ChangeLog files are no longer manually maintained. Starting
4+
on December 1st, 2011 we put change information only in the GIT
5+
commit log, and generate a top-level ChangeLog file from logs at
6+
"make dist". See doc/HACKING for details.
7+
18
2011-11-24 Werner Koch <[email protected]>
29

310
* ks-engine-http.c (ks_http_help): Do not print help for hkp.
@@ -1589,3 +1596,7 @@
15891596
This file is distributed in the hope that it will be useful, but
15901597
WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
15911598
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1599+
1600+
Local Variables:
1601+
buffer-read-only: t
1602+
End:

‎dirmngr/ChangeLog.1

+4
Original file line numberDiff line numberDiff line change
@@ -800,3 +800,7 @@ There are old Dirmngr ChangeLog entries.
800800
ldapsearch -v -x -h www.trustcenter.de -b '<some-users-DN>' userCertificate -t
801801
cp /tmp/<cert-file> testcert.der
802802
./test-dirmngr
803+
804+
Local Variables:
805+
buffer-read-only: t
806+
End:

‎dirmngr/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
## Process this file with automake to produce Makefile.in
2121

22-
EXTRA_DIST = OAUTHORS ONEWS ChangeLog.1
22+
EXTRA_DIST = OAUTHORS ONEWS ChangeLog.1 ChangeLog-2011
2323

2424
bin_PROGRAMS = dirmngr dirmngr-client
2525

‎doc/ChangeLog ‎doc/ChangeLog-2011

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
2011-12-01 Werner Koch <[email protected]>
2+
3+
NB: ChangeLog files are no longer manually maintained. Starting
4+
on December 1st, 2011 we put change information only in the GIT
5+
commit log, and generate a top-level ChangeLog file from logs at
6+
"make dist". See doc/HACKING for details.
7+
18
2011-10-12 Werner Koch <[email protected]>
29

310
* gpg.texi: Add a bunch of opindex items.
@@ -858,3 +865,7 @@
858865
This file is distributed in the hope that it will be useful, but
859866
WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
860867
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
868+
869+
Local Variables:
870+
buffer-read-only: t
871+
End:

‎doc/HACKING

+27-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,30 @@
33
(Some notes on GNUPG internals.)
44

55

6-
===> Under construction <=======
6+
* No more ChangeLog files
7+
8+
Do not modify any of the ChangeLog files in GnuPG. Starting on
9+
December 1st, 2011 we put change information only in the GIT commit
10+
log, and generate a top-level ChangeLog file from logs at "make dist"
11+
time. As such, there are strict requirements on the form of the
12+
commit log messages. The old ChangeLog files have all be renamed to
13+
ChangeLog-2011
14+
15+
16+
* Commit log requirements
17+
18+
Your commit log should always start with a one-line summary, the second
19+
line should be blank, and the remaining lines are usually ChangeLog-style
20+
entries for all affected files. However, it's fine -- even recommended --
21+
to write a few lines of prose describing the change, when the summary
22+
and ChangeLog entries don't give enough of the big picture. Omit the
23+
leading TABs that you're used to seeing in a "real" ChangeLog file, but
24+
keep the maximum line length at 72 or smaller, so that the generated
25+
ChangeLog lines, each with its leading TAB, will not exceed 80 columns.
26+
27+
28+
29+
===> What follows is probably out of date <===
730

831

932
RFCs
@@ -63,7 +86,7 @@ g10/keydb.h
6386
g10/keyid.c Helper functions to get the keyid, fingerprint etc.
6487

6588

66-
g10/trustdb.c
89+
g10/trustdb.c
6790
g10/trustdb.h
6891
g10/tdbdump.c
6992
Management of the trustdb.gpg
@@ -74,7 +97,7 @@ g10/delkey.c Delete a key
7497
g10/kbnode.c Helper for the KBNODE linked list
7598
g10/main.h Prototypes and some constants
7699
g10/mainproc.c Message processing
77-
g10/armor.c Ascii armor filter
100+
g10/armor.c Ascii armor filter
78101
g10/mdfilter.c Filter to calculate hashs
79102
g10/textfilter.c Filter to handle CR/LF and trailing white space
80103
g10/cipher.c En-/Decryption filter
@@ -88,7 +111,7 @@ g10/hkp.h Keyserver access
88111
g10/hkp.c
89112
g10/packet.h Defintion of OpenPGP structures.
90113
g10/passphrase.c Passphrase handling code
91-
g10/pubkey-enc.c
114+
g10/pubkey-enc.c
92115
g10/seckey-cert.c
93116
g10/seskey.c
94117
g10/import.c

‎doc/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ EXTRA_DIST = samplekeys.asc \
3434
gnupg-card-architecture.pdf \
3535
FAQ gnupg7.texi \
3636
opt-homedir.texi see-also-note.texi specify-user-id.texi \
37-
gpgv.texi texi.css yat2m.c
37+
gpgv.texi texi.css yat2m.c ChangeLog-2011
3838

3939
BUILT_SOURCES = gnupg-card-architecture.eps gnupg-card-architecture.png \
4040
gnupg-card-architecture.pdf

‎g10/ChangeLog ‎g10/ChangeLog-2011

+16-5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
2011-12-01 Werner Koch <[email protected]>
2+
3+
NB: ChangeLog files are no longer manually maintained. Starting
4+
on December 1st, 2011 we put change information only in the GIT
5+
commit log, and generate a top-level ChangeLog file from logs at
6+
"make dist". See doc/HACKING for details.
7+
18
2011-11-30 Werner Koch <[email protected]>
29

310
* keyserver.c (keyserver_import_cert): Adjust for changed
@@ -2398,8 +2405,8 @@
23982405
* status.h (STATUS_ERROR): New status code.
23992406
* status.c (get_status_string): Ditto.
24002407
* mainproc.c (proc_plaintext): Emit it if multiple messages are
2401-
detected. Error out if more than one plaintext packet is
2402-
encountered.
2408+
detected. Error out if more than one plaintext packet is
2409+
encountered.
24032410
* mainproc.c (literals_seen): New.
24042411

24052412
2007-02-26 Werner Koch <[email protected]>
@@ -2735,7 +2742,7 @@
27352742

27362743
2006-09-14 Werner Koch <[email protected]>
27372744

2738-
Replaced all call gpg_error_from_errno(errno) by
2745+
Replaced all call gpg_error_from_errno(errno) by
27392746
gpg_error_from_syserror().
27402747

27412748
2006-09-13 Werner Koch <[email protected]>
@@ -4804,7 +4811,7 @@
48044811
* tdbio.c (MY_O_BINARY): Need binary mode with Cygwin. From
48054812
Werner on stable branch.
48064813

4807-
* g10.c, gpgv.c (main) [__CYGWIN32__]: Don't get the homedir from
4814+
* g10.c, gpgv.c (main) [__CYGWIN32__]: Don't get the homedir from
48084815
the registry. From Werner on stable branch.
48094816

48104817
* keyedit.c (show_key_with_all_names_colon): Make --with-colons
@@ -8265,7 +8272,7 @@
82658272
(pk_from_block): Removed the namehash arg and changed all callers.
82668273
(merge_selfsigs): Copy prefs to all keys.
82678274
* trustdb.c (get_pref_data): Removed.
8268-
(is_algo_in_prefs): Removed.
8275+
(is_algo_in_prefs): Removed.
82698276
(make_pref_record): Deleted and removed all class.
82708277
* pkclist.c (select_algo_from_prefs): Adjusted for the new
82718278
preference implementation.
@@ -12053,3 +12060,7 @@ Thu Feb 12 22:24:42 1998 Werner Koch (wk@frodo)
1205312060
This file is distributed in the hope that it will be useful, but
1205412061
WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
1205512062
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
12063+
12064+
Local Variables:
12065+
buffer-read-only: t
12066+
End:

‎g10/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
## Process this file with automake to produce Makefile.in
2020

21-
EXTRA_DIST = options.skel
21+
EXTRA_DIST = options.skel ChangeLog-2011
2222

2323
AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common \
2424
-I$(top_srcdir)/include -I$(top_srcdir)/intl

‎g13/ChangeLog

-3
This file was deleted.

‎g13/ChangeLog-2011

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
2011-12-01 Werner Koch <[email protected]>
2+
3+
NB: ChangeLog files are no longer manually maintained. Starting
4+
on December 1st, 2011 we put change information only in the GIT
5+
commit log, and generate a top-level ChangeLog file from logs at
6+
"make dist". See doc/HACKING for details.
7+
8+
2009-11-04 Werner Koch <[email protected]>
9+
10+
Under initial development - no need for a ChangeLog.
11+
12+
Local Variables:
13+
buffer-read-only: t
14+
End:

‎g13/Makefile.am

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818

1919
## Process this file with automake to produce Makefile.in
2020

21+
EXTRA_DIST = ChangeLog-2011
22+
2123
bin_PROGRAMS = g13
2224

2325
AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/common

‎include/ChangeLog ‎include/ChangeLog-2011

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
2011-12-01 Werner Koch <[email protected]>
2+
3+
NB: ChangeLog files are no longer manually maintained. Starting
4+
on December 1st, 2011 we put change information only in the GIT
5+
commit log, and generate a top-level ChangeLog file from logs at
6+
"make dist". See doc/HACKING for details.
7+
18
2011-02-01 Werner Koch <[email protected]>
29

310
* cipher.h (PUBKEY_MAX_NPKEY, PUBKEY_MAX_NSKEY): Bump up to
@@ -442,3 +449,7 @@ Tue Mar 3 15:11:21 1998 Werner Koch ([email protected])
442449
This file is distributed in the hope that it will be useful, but
443450
WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
444451
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
452+
453+
Local Variables:
454+
buffer-read-only: t
455+
End:

‎include/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
EXTRA_DIST = cipher.h types.h host2net.h _regex.h
1+
EXTRA_DIST = cipher.h types.h host2net.h _regex.h ChangeLog-2011

‎kbx/ChangeLog ‎kbx/ChangeLog-2011

+12-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
2011-12-01 Werner Koch <[email protected]>
2+
3+
NB: ChangeLog files are no longer manually maintained. Starting
4+
on December 1st, 2011 we put change information only in the GIT
5+
commit log, and generate a top-level ChangeLog file from logs at
6+
"make dist". See doc/HACKING for details.
7+
18
2011-04-28 Werner Koch <[email protected]>
29

310
* keybox-openpgp.c: Include ../common/openpgpdefs.h.
@@ -160,7 +167,7 @@
160167

161168
2006-09-14 Werner Koch <[email protected]>
162169

163-
Replaced all call gpg_error_from_errno(errno) by
170+
Replaced all call gpg_error_from_errno(errno) by
164171
gpg_error_from_syserror().
165172

166173
2005-10-08 Marcus Brinkmann <[email protected]>
@@ -383,3 +390,7 @@
383390
This file is distributed in the hope that it will be useful, but
384391
WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
385392
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
393+
394+
Local Variables:
395+
buffer-read-only: t
396+
End:

0 commit comments

Comments
 (0)