[git] GnuPG - branch, master, updated. gnupg-2.2-base-13-gb917cb6

[by Werner Koch]

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, master has been updated
       via  b917cb66b79597520788cd9264889942247a3377 (commit)
       via  008ae0bd868cb49ad4d67fc8c71707cd2a162137 (commit)
      from  fd0e5b60bed1cfc2aed7b2e13cc449f355eac051 (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 b917cb66b79597520788cd9264889942247a3377
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Aug 23 15:16:52 2017 +0200

    tests: Do not run trust-pgp-4.scm
    
    * tests/openpgp/Makefile.am (XTESTS): Remove test.
    (EXTRA_DIST): Add test file.
    --
    
    There are two problems with this test: First a syntax error in the
    file name so that the test was not used at all.  Second the test
    currently returns FAIL.
    
    Fixes-commit: c23a69970ba38edae9d3b2603825d18fbb732423
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am
index c87dd0a..f6014c9 100644
--- a/tests/openpgp/Makefile.am
+++ b/tests/openpgp/Makefile.am
@@ -85,7 +85,6 @@ XTESTS = \
 	trust-pgp-1.scm \
 	trust-pgp-2.scm \
 	trust-pgp-3.scm \
-	trust-pgp-4.scm! \
 	gpgtar.scm \
 	use-exact-key.scm \
 	default-key.scm \
@@ -103,6 +102,10 @@ XTESTS = \
 	issue2929.scm \
 	issue2941.scm
 
+# Temporary removed tests:
+#	trust-pgp-4.scm
+
+
 # XXX: Currently, one cannot override automake's 'check' target.  As a
 # workaround, we avoid defining 'TESTS', thus automake will not emit
 # the 'check' target.  For extra robustness, we merely define a
@@ -265,7 +268,7 @@ sample_msgs = samplemsgs/clearsig-1-key-1.asc \
 
 EXTRA_DIST = defs.scm trust-pgp/common.scm $(XTESTS) $(TEST_FILES) \
 	     mkdemodirs signdemokey $(priv_keys) $(sample_keys)   \
-	     $(sample_msgs) ChangeLog-2011 run-tests.scm \
+	     $(sample_msgs) ChangeLog-2011 run-tests.scm trust-pgp-4.scm \
 	     setup.scm shell.scm all-tests.scm signed-messages.scm
 
 CLEANFILES = prepared.stamp x y yy z out err  $(data_files) \

commit 008ae0bd868cb49ad4d67fc8c71707cd2a162137
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Aug 23 14:50:03 2017 +0200

    build: Change SWDB tag "gnupg21" to "gnupg22".
    
    * configure.ac (GNUPG_SWDB_TAG): New ac_define.  Set it to "gnupg22".
    * tools/gpgconf.c (query_swdb): Use it.
    * build-aux/speedo.mk: Change tag "gnupg21" to "gnupg22".
    * Makefile.am (distcheck-hook): Ditto.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/Makefile.am b/Makefile.am
index b972cff..c01c0a8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -99,7 +99,7 @@ dist-hook: gen-ChangeLog
 
 distcheck-hook:
 	set -e; ( \
-	pref="#+macro: gnupg21_" ;\
+	pref="#+macro: gnupg22_" ;\
 	reldate="$$(date -u +%Y-%m-%d)" ;\
         echo "$${pref}ver  $(PACKAGE_VERSION)"  ;\
         echo "$${pref}date $${reldate}" ;\
diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk
index f1ec653..b1c6ef8 100644
--- a/build-aux/speedo.mk
+++ b/build-aux/speedo.mk
@@ -276,7 +276,7 @@ endif
 # Version numbers of the released packages
 gnupg_ver_this = $(shell cat $(topsrc)/VERSION)
 
-gnupg_ver        := $(shell awk '$$1=="gnupg21_ver" {print $$2}' swdb.lst)
+gnupg_ver        := $(shell awk '$$1=="gnupg22_ver" {print $$2}' swdb.lst)
 
 libgpg_error_ver := $(shell awk '$$1=="libgpg_error_ver" {print $$2}' swdb.lst)
 libgpg_error_sha1:= $(shell awk '$$1=="libgpg_error_sha1" {print $$2}' swdb.lst)
@@ -1187,7 +1187,7 @@ installer: all w32_insthelpers $(w32src)/inst-options.ini $(bdir)/README.txt
 
 
 define MKSWDB_commands
- ( pref="#+macro: gnupg21_w32_" ;\
+ ( pref="#+macro: gnupg22_w32_" ;\
    echo "$${pref}ver  $(INST_VERSION)_$(BUILD_DATESTR)"  ;\
    echo "$${pref}date $(2)" ;\
    echo "$${pref}size $$(wc -c <$(1)|awk '{print int($$1/1024)}')k";\
diff --git a/configure.ac b/configure.ac
index b52c86d..33c88d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,6 +49,10 @@ m4_define([mym4_revision_dec], m4_argn(8, mym4_verslist))
 m4_esyscmd([echo ]mym4_version[>VERSION])
 AC_INIT([mym4_package],[mym4_version], [https://bugs.gnupg.org])
 
+# When changing the SWDB tag please also adjust the hard coded tags in
+# build-aux/speedo.mk and Makefile.am
+AC_DEFINE_UNQUOTED(GNUPG_SWDB_TAG, "gnupg22", [swdb tag for this branch])
+
 NEED_GPG_ERROR_VERSION=1.24
 
 NEED_LIBGCRYPT_API=1
diff --git a/tools/gpgconf.c b/tools/gpgconf.c
index fefa2ff..09b2a76 100644
--- a/tools/gpgconf.c
+++ b/tools/gpgconf.c
@@ -292,7 +292,7 @@ query_swdb (estream_t out, const char *name, const char *current_version)
       goto leave;
     }
   if (!strcmp (name, "gnupg"))
-    search_name = "gnupg21";
+    search_name = GNUPG_SWDB_TAG;
   else if (!strcmp (name, "gnupg1"))
     search_name = "gnupg1";
   else

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

Summary of changes:
 Makefile.am               | 2 +-
 build-aux/speedo.mk       | 4 ++--
 configure.ac              | 4 ++++
 tests/openpgp/Makefile.am | 7 +++++--
 tools/gpgconf.c           | 2 +-
 5 files changed, 13 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org