From 2336b09779d313c1594acf6df3bd8a8486e90458 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 1 Dec 2011 10:51:36 +0100 Subject: 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. --- g13/ChangeLog | 3 --- g13/ChangeLog-2011 | 14 ++++++++++++++ g13/Makefile.am | 2 ++ 3 files changed, 16 insertions(+), 3 deletions(-) delete mode 100644 g13/ChangeLog create mode 100644 g13/ChangeLog-2011 (limited to 'g13') diff --git a/g13/ChangeLog b/g13/ChangeLog deleted file mode 100644 index ecd72226b..000000000 --- a/g13/ChangeLog +++ /dev/null @@ -1,3 +0,0 @@ -2009-11-04 Werner Koch - - Under initial development - no need for a ChangeLog. diff --git a/g13/ChangeLog-2011 b/g13/ChangeLog-2011 new file mode 100644 index 000000000..5d372c23f --- /dev/null +++ b/g13/ChangeLog-2011 @@ -0,0 +1,14 @@ +2011-12-01 Werner Koch + + 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-11-04 Werner Koch + + Under initial development - no need for a ChangeLog. + +Local Variables: +buffer-read-only: t +End: diff --git a/g13/Makefile.am b/g13/Makefile.am index a8ae9eb25..b846dcda8 100644 --- a/g13/Makefile.am +++ b/g13/Makefile.am @@ -18,6 +18,8 @@ ## Process this file with automake to produce Makefile.in +EXTRA_DIST = ChangeLog-2011 + bin_PROGRAMS = g13 AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/common -- cgit v1.2.3 From a2d9e48fcca6cfc2dfadef6dbd3579a30314676b Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Mon, 2 Jan 2012 22:15:00 +0100 Subject: Only set gcrypt thread callback for older version of gcrypt. * agent/gpg-agent.c, dirmngr/dirmngr.c, g13/g13.c, scd/scdaemon.c (USE_GCRY_THREAD_CBS): New macro, defined if GCRY_THREAD_OPTION_VERSION is 0. (fixed_gcry_pth_init) [!USE_GCRY_THREAD_CBS]: Don't define. (main) [!USE_GCRY_THREAD_CBS]: Do not install thread callbacks. --- g13/g13.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'g13') diff --git a/g13/g13.c b/g13/g13.c index 8e5532c47..e38f21165 100644 --- a/g13/g13.c +++ b/g13/g13.c @@ -204,11 +204,18 @@ static void join_idle_task (void); /* Begin Pth wrapper functions. */ ASSUAN_SYSTEM_PTH_IMPL; +#if GCRY_THREAD_OPTION_VERSION == 0 +#define FIX_GCRY_PTH_INIT 1 +#endif + +#ifdef FIX_GCRY_PTH_INIT GCRY_THREAD_OPTION_PTH_IMPL; static int fixed_gcry_pth_init (void) { return pth_self ()? 0 : (pth_init () == FALSE) ? errno : 0; } +#endif + /* End Pth wrapper functions. */ @@ -361,6 +368,8 @@ main ( int argc, char **argv) i18n_init (); init_common_subsystems (&argc, &argv); + +#ifdef USE_GCRY_THREAD_CBS /* Libgcrypt requires us to register the threading model first. Note that this will also do the pth_init. */ gcry_threads_pth.init = fixed_gcry_pth_init; @@ -370,6 +379,7 @@ main ( int argc, char **argv) log_fatal ("can't register GNU Pth with Libgcrypt: %s\n", gpg_strerror (err)); } +#endif /* Check that the Libgcrypt is suitable. */ if (!gcry_check_version (NEED_LIBGCRYPT_VERSION) ) -- cgit v1.2.3 From 61ccd8d92d9d3b8ba0eca3c2969d7f6f37e16405 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Tue, 3 Jan 2012 16:50:52 +0100 Subject: Fix last change: Only set gcrypt thread callback for older versions. * dirmngr/dirmngr.c, g13/g13.c: Rename FIX_GCRY_PTH_INIT to USE_GCRY_THREAD_CBS. --- g13/g13.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'g13') diff --git a/g13/g13.c b/g13/g13.c index e38f21165..bc05977c5 100644 --- a/g13/g13.c +++ b/g13/g13.c @@ -205,10 +205,10 @@ static void join_idle_task (void); ASSUAN_SYSTEM_PTH_IMPL; #if GCRY_THREAD_OPTION_VERSION == 0 -#define FIX_GCRY_PTH_INIT 1 +#define USE_GCRY_THREAD_CBS 1 #endif -#ifdef FIX_GCRY_PTH_INIT +#ifdef USE_GCRY_THREAD_CBS GCRY_THREAD_OPTION_PTH_IMPL; static int fixed_gcry_pth_init (void) { -- cgit v1.2.3 From 0dce26778ef8abd4fc40de689d7ec9b720d26430 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Tue, 3 Jan 2012 17:08:01 +0100 Subject: Fix compiler warnings. * common/dotlock.c (use_hardlinks_p, dotlock_take_unix): Check return value of link(). * g13/g13.c: Make sure err is initialized. * scd/scdaemon.c (main) [!USE_GCRY_THREAD_CBS]: Do not define ERR. --- g13/g13.c | 1 + 1 file changed, 1 insertion(+) (limited to 'g13') diff --git a/g13/g13.c b/g13/g13.c index bc05977c5..0f7309490 100644 --- a/g13/g13.c +++ b/g13/g13.c @@ -686,6 +686,7 @@ main ( int argc, char **argv) #endif /*0*/ /* Dispatch command. */ + err = 0; switch (cmd) { case aGPGConfList: -- cgit v1.2.3