[git] GnuPG - branch, master, updated. gnupg-2.1.14-5-gc49c43d

[by Justus Winter]

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  c49c43d7e4229fd9f1bc55e17fa32fdc334dbef6 (commit)
       via  d21efa398874be4a15e8283c5fc382fb90f562fd (commit)
       via  12a887050a560c4cacaf95e4cdb0cc42d8b87aa1 (commit)
      from  1ab8d36b83845d8366eeca67767eb2f3e5259ca9 (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 c49c43d7e4229fd9f1bc55e17fa32fdc334dbef6
Author: Justus Winter <justus at g10code.com>
Date:   Fri Jul 15 12:28:46 2016 +0200

    gpgscm: Fix linking.
    
    * tests/gpgscm/Makefile.am: Add -lintl.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tests/gpgscm/Makefile.am b/tests/gpgscm/Makefile.am
index e57a4bb..dad30ed 100644
--- a/tests/gpgscm/Makefile.am
+++ b/tests/gpgscm/Makefile.am
@@ -45,7 +45,7 @@ gpgscm_CFLAGS = -imacros scheme-config.h \
 gpgscm_SOURCES = main.c private.h ffi.c ffi.h ffi-private.h \
 	scheme-config.h opdefines.h scheme.c scheme.h scheme-private.h
 gpgscm_LDADD = $(LDADD) $(common_libs) \
-	$(NETLIBS) $(LIBICONV) $(LIBREADLINE) \
+	$(NETLIBS) $(LIBICONV) $(LIBREADLINE) $(LIBINTL) \
 	$(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS)
 
 t_child_SOURCES = t-child.c

commit d21efa398874be4a15e8283c5fc382fb90f562fd
Author: Justus Winter <justus at g10code.com>
Date:   Fri Jul 15 12:12:34 2016 +0200

    g10: Fix building without trust models.
    
    * g10/pkclist.c (write_trust_status): Fall back to the previous
    behavior.
    
    Fixes-commit: ae188932
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/g10/pkclist.c b/g10/pkclist.c
index 6315a6d..63d32d1 100644
--- a/g10/pkclist.c
+++ b/g10/pkclist.c
@@ -508,6 +508,9 @@ do_we_trust_pre( PKT_public_key *pk, unsigned int trustlevel )
 static void
 write_trust_status (int statuscode, int trustlevel)
 {
+#ifdef NO_TRUST_MODELS
+  write_status (statuscode);
+#else /* NO_TRUST_MODELS */
   int tm;
 
   /* For the combined tofu+pgp method, we return the trust model which
@@ -517,6 +520,7 @@ write_trust_status (int statuscode, int trustlevel)
   else
     tm = opt.trust_model;
   write_status_strings (statuscode, "0 ", trust_model_string (tm), NULL);
+#endif /* NO_TRUST_MODELS */
 }
 
 

commit 12a887050a560c4cacaf95e4cdb0cc42d8b87aa1
Author: Justus Winter <justus at g10code.com>
Date:   Fri Jul 15 11:59:57 2016 +0200

    tests: Check for gpgtar.
    
    * tests/migrations/extended-pkf.scm: Skip test if gpgtar is not built.
    * tests/migrations/from-classic.scm: Likewise.
    * tests/openpgp/gpgtar.scm: Fix check for gpgtar.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tests/migrations/extended-pkf.scm b/tests/migrations/extended-pkf.scm
index 3e76532..bf2c49e 100755
--- a/tests/migrations/extended-pkf.scm
+++ b/tests/migrations/extended-pkf.scm
@@ -19,6 +19,9 @@
 
 (load (with-path "common.scm"))
 
+(catch (skip "gpgtar not built")
+       (call-check `(,GPGTAR --help)))
+
 (define src-tarball (in-srcdir "extended-pkf.tar.asc"))
 
 (define (setup)
diff --git a/tests/migrations/from-classic.scm b/tests/migrations/from-classic.scm
index 2128532..d540470 100755
--- a/tests/migrations/from-classic.scm
+++ b/tests/migrations/from-classic.scm
@@ -19,6 +19,9 @@
 
 (load (with-path "common.scm"))
 
+(catch (skip "gpgtar not built")
+       (call-check `(,GPGTAR --help)))
+
 (define src-tarball (in-srcdir "from-classic.tar.asc"))
 
 (define (setup)
diff --git a/tests/openpgp/gpgtar.scm b/tests/openpgp/gpgtar.scm
index 07f2fd7..15f528f 100755
--- a/tests/openpgp/gpgtar.scm
+++ b/tests/openpgp/gpgtar.scm
@@ -19,8 +19,8 @@
 
 (load (with-path "defs.scm"))
 
-(unless (= 0 (call `(,(tool 'gpgtar) --help)))
-	(skip "gpgtar not installed"))
+(catch (skip "gpgtar not built")
+       (call-check `(,(tool 'gpgtar) --help)))
 
 (define testfiles (append plain-files data-files))
 (define gpgargs

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

Summary of changes:
 g10/pkclist.c                     | 4 ++++
 tests/gpgscm/Makefile.am          | 2 +-
 tests/migrations/extended-pkf.scm | 3 +++
 tests/migrations/from-classic.scm | 3 +++
 tests/openpgp/gpgtar.scm          | 4 ++--
 5 files changed, 13 insertions(+), 3 deletions(-)


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