Update to gnupg21-2.1.16.

 * gpg: New algorithm for selecting the best ranked public key when
   using a mail address with -r, -R, or --locate-key.
 * gpg: New option --with-tofu-info to print a new "tfs" record in
   colon formatted key listings.
 * gpg: New option --compliance as an alternative way to specify
   options like --rfc2440, --rfc4880, et al.
 * gpg: Many changes to the TOFU implementation.
 * gpg: Improve usability of --quick-gen-key.
 * gpg: In --verbose mode print a diagnostic when a pinentry is
   launched.
 * gpg: Remove code which warns for old versions of gnome-keyring.
 * gpg: New option --override-session-key-fd.
 * gpg: Option --output does now work with --verify.
 * gpgv: New option --output to allow saving the verified data.
 * gpgv: New option --enable-special-filenames.
 * agent, dirmngr: New --supervised mode for use by systemd and alike.
 * agent: By default listen on all available sockets using standard
   names.
 * agent: Invoke scdaemon with --homedir.
 * dirmngr: On Linux now detects the removal of its own socket and
   terminates.
 * scd: Support ECC key generation.
 * scd: Support more card readers.
 * dirmngr: New option --allow-version-check to download a software
   version database in the background.
 * dirmngr: Use system provided CAs if no --hkp-cacert is given.
 * dirmngr: Use a default keyserver if none is explicitly set
 * gpgconf: New command --query-swdb to check software versions
   against an copy of an online database.
 * gpgconf: Print the socket directory with --list-dirs.
 * tools: The WKS tools now support draft version -02.
 * tools: Always build gpg-wks-client and install under libexec.
 * tools: New option --supported for gpg-wks-client.
 * The log-file option now accepts a value "socket://" to log to the
   socket named "S.log" in the standard socket directory.
 * Provide fake pinentries for use by tests cases of downstream
   developers.
 * Fixed many bugs and regressions.
 * Many changes and improvements for the test suite.

6 files changed, 16 insertions, 58 deletions

diff --git a/security/gnupg21/Makefile b/security/gnupg21/Makefile
index 81fd3db46cc..406a6683753 100644
--- a/security/gnupg21/Makefile
+++ b/security/gnupg21/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2016/12/16 16:21:54 hans Exp $
+# $NetBSD: Makefile,v 1.26 2016/12/18 21:58:23 tnn Exp $
 
-DISTNAME=	gnupg-2.1.14
+DISTNAME=	gnupg-2.1.16
 PKGNAME=	${DISTNAME:S/gnupg-/gnupg21-/}
-PKGREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/gnupg/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/security/gnupg21/PLIST b/security/gnupg21/PLIST
index 3bd8654019e..617cbc440e7 100644
--- a/security/gnupg21/PLIST
+++ b/security/gnupg21/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2016/07/16 08:32:05 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2016/12/18 21:58:23 tnn Exp $
 bin/dirmngr
 bin/dirmngr-client
 bin/g13
@@ -18,6 +18,7 @@ ${PLIST.ldap}libexec/dirmngr_ldap
 libexec/gpg-check-pattern
 libexec/gpg-preset-passphrase
 libexec/gpg-protect-tool
+libexec/gpg-wks-client
 libexec/scdaemon
 man/man1/dirmngr-client.1
 man/man1/gpg-agent.1
@@ -50,6 +51,13 @@ share/doc/gnupg/examples/README
 share/doc/gnupg/examples/gpgconf.conf
 share/doc/gnupg/examples/pwpattern.list
 share/doc/gnupg/examples/scd-event
+share/doc/gnupg/examples/systemd-user/README
+share/doc/gnupg/examples/systemd-user/dirmngr.service
+share/doc/gnupg/examples/systemd-user/dirmngr.socket
+share/doc/gnupg/examples/systemd-user/gpg-agent-extra.socket
+share/doc/gnupg/examples/systemd-user/gpg-agent-ssh.socket
+share/doc/gnupg/examples/systemd-user/gpg-agent.service
+share/doc/gnupg/examples/systemd-user/gpg-agent.socket
 share/doc/gnupg/examples/trustlist.txt
 share/gnupg/dirmngr-conf.skel
 share/gnupg/distsigkey.gpg
diff --git a/security/gnupg21/distinfo b/security/gnupg21/distinfo
index a19f8910297..0282a8cded6 100644
--- a/security/gnupg21/distinfo
+++ b/security/gnupg21/distinfo
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.12 2016/12/16 16:21:54 hans Exp $
+$NetBSD: distinfo,v 1.13 2016/12/18 21:58:23 tnn Exp $
 
-SHA1 (gnupg-2.1.14.tar.bz2) = bc7609a3a0daf0ed0efb22f77b43e82f28e20e34
-RMD160 (gnupg-2.1.14.tar.bz2) = 22d1f1791133f48ab71e900617ad7fd13c8a4e0f
-SHA512 (gnupg-2.1.14.tar.bz2) = 9f098bf589ecb841eb65fccad3ffd72c6645c8e186ddababf93c657173c485ed103f8f8a7d8bfeb86cfb9e065a1211c7d48b116c86d6aa97ed1b8c8a85e0a840
-Size (gnupg-2.1.14.tar.bz2) = 5706058 bytes
+SHA1 (gnupg-2.1.16.tar.bz2) = 67540161c9fe289153c4a5ea60f7cdce0ef48897
+RMD160 (gnupg-2.1.16.tar.bz2) = 39ed72f52bae352893da7da7b191e1fc6ba4e6df
+SHA512 (gnupg-2.1.16.tar.bz2) = dbac27106e7800e30f286c3fd83ffab85d2b0acf29d6715ce3e388bfbece2a7deb19ebfe897c445d7a3d6d63e01560b9461567566e936504bc5d6cabe1444af7
+Size (gnupg-2.1.16.tar.bz2) = 5840687 bytes
 SHA1 (patch-dirmngr_Makefile.in) = fa74bcf4ea214945c64d383dff039ab938ae1446
-SHA1 (patch-dirmngr_ks-engine-ldap.c) = 3a7d96d877cd52bed66c481af83da99c517d3380
 SHA1 (patch-g13_sh-dmcrypt.c) = a2505039fff9e1e90ab81076776542fa83f55d5e
-SHA1 (patch-kbx_Makefile.in) = 58f7c3711744a42d40f580944fb768f7aaaf1b68
-SHA1 (patch-tests_gpgscm_Makefile.in) = 1418ab0a3a93ae69b49db5198aa68fd3dd369548
diff --git a/security/gnupg21/patches/patch-dirmngr_ks-engine-ldap.c b/security/gnupg21/patches/patch-dirmngr_ks-engine-ldap.c
deleted file mode 100644
index 88d9e3b9a3d..00000000000
--- a/security/gnupg21/patches/patch-dirmngr_ks-engine-ldap.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-dirmngr_ks-engine-ldap.c,v 1.1 2015/09/30 12:56:47 fhajny Exp $
-
-This must have been an ugly typo. Fix build on SunOS.
-
---- dirmngr/ks-engine-ldap.c.orig	2015-06-17 06:39:24.000000000 +0000
-+++ dirmngr/ks-engine-ldap.c
-@@ -513,7 +513,7 @@ my_ldap_connect (parsed_uri_t uri, LDAP
- #endif /* LDAP_OPT_X_TLS_CACERTFILE && HAVE_LDAP_SET_OPTION */
- #endif
- 
--#ifndef HAVE_LDAP_START_TLS_S
-+#ifdef HAVE_LDAP_START_TLS_S
-   if (uri->use_tls)
-     {
-       /* XXX: We need an option to determine whether to abort if the
diff --git a/security/gnupg21/patches/patch-kbx_Makefile.in b/security/gnupg21/patches/patch-kbx_Makefile.in
deleted file mode 100644
index f760d0e1961..00000000000
--- a/security/gnupg21/patches/patch-kbx_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-kbx_Makefile.in,v 1.2 2015/11/04 15:05:52 tnn Exp $
-
-Bring in libsocket, needed on SunOS.
-
---- kbx/Makefile.in.orig	2015-10-09 15:16:17.000000000 +0000
-+++ kbx/Makefile.in
-@@ -494,7 +494,7 @@ kbxutil_SOURCES = kbxutil.c $(common_sou
- kbxutil_CFLAGS = $(AM_CFLAGS) -DKEYBOX_WITH_X509=1
- kbxutil_LDADD = ../common/libcommon.a \
-                   $(KSBA_LIBS) $(LIBGCRYPT_LIBS) $(extra_libs) \
--                  $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV) $(W32SOCKLIBS)
-+                  $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV) $(W32SOCKLIBS) $(NETLIBS)
- 
- all: all-am
- 
diff --git a/security/gnupg21/patches/patch-tests_gpgscm_Makefile.in b/security/gnupg21/patches/patch-tests_gpgscm_Makefile.in
deleted file mode 100644
index 65c84c933d8..00000000000
--- a/security/gnupg21/patches/patch-tests_gpgscm_Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-tests_gpgscm_Makefile.in,v 1.2 2016/08/20 16:18:03 wiz Exp $
-
-gpgscm needs libintl, at least on Darwin.
-https://bugs.gnupg.org/gnupg/issue2445
-
---- tests/gpgscm/Makefile.in.orig	2016-08-20 13:25:51.000000000 +0000
-+++ tests/gpgscm/Makefile.in
-@@ -458,7 +458,7 @@ gpgscm_SOURCES = main.c private.h ffi.c 
- 
- gpgscm_LDADD = $(LDADD) $(common_libs) \
- 	$(NETLIBS) $(LIBICONV) $(LIBREADLINE) \
--	$(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS)
-+	$(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL)
- 
- t_child_SOURCES = t-child.c
- all: all-am