Update to 2.1.10

Changelog:
Noteworthy changes in version 2.1.10 (2015-12-04)
-------------------------------------------------

 * gpg: New trust models "tofu" and "tofu+pgp".

 * gpg: New command --tofu-policy.  New options --tofu-default-policy
   and --tofu-db-format.

 * gpg: New option --weak-digest to specify hash algorithms which
   should be considered weak.

 * gpg: Allow the use of multiple --default-key options; take the last
   available key.

 * gpg: New option --encrypt-to-default-key.

 * gpg: New option --unwrap to only strip the encryption layer.

 * gpg: New option --only-sign-text-ids to exclude photo IDs from key
   signing.

 * gpg: Check for ambigious or non-matching key specification in the
   config file or given to --encrypt-to.

 * gpg: Show the used card reader with --card-status.

 * gpg: Print export statistics and an EXPORTED status line.

 * gpg: Allow selecting subkeys by keyid in --edit-key.

 * gpg: Allow updating the expiration time of multiple subkeys at
   once.

 * dirmngr: New option --use-tor.  For full support this requires
   libassuan version 2.4.2 and a patched version of libadns
   (e.g. adns-1.4-g10-7 as used by the standard Windows installer).

 * dirmngr: New option --nameserver to specify the nameserver used in
   Tor mode.

 * dirmngr: Keyservers may again be specified by IP address.

 * dirmngr: Fixed problems in resolving keyserver pools.

 * dirmngr: Fixed handling of premature termination of TLS streams so
   that large numbers of keys can be refreshed via hkps.

 * gpg: Fixed a regression in --locate-key [since 2.1.9].

 * gpg: Fixed another bug for keyrings with legacy keys.

 * gpgsm: Allow combinations of usage flags in --gen-key.

 * Make tilde expansion work with most options.

 * Many other cleanups and bug fixes.

4 files changed, 15 insertions, 30 deletions

diff --git a/security/gnupg21/Makefile b/security/gnupg21/Makefile
index 34ff2572599..ccd3d907de9 100644
--- a/security/gnupg21/Makefile
+++ b/security/gnupg21/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2015/11/04 15:05:52 tnn Exp $
+# $NetBSD: Makefile,v 1.11 2015/12/14 14:09:05 ryoon Exp $
 
-DISTNAME=	gnupg-2.1.9
+DISTNAME=	gnupg-2.1.10
 PKGNAME=	${DISTNAME:S/gnupg-/gnupg21-/}
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/gnupg/
@@ -21,12 +21,13 @@ USE_TOOLS+=		gmake pkg-config makeinfo
 USE_LIBTOOL=		yes
 INFO_FILES=		yes
 GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--enable-g13
 
 .include "options.mk"
 
 BUILDLINK_API_DEPENDS.libgpg-error+=	libgpg-error>=1.16
 .include "../../security/libgpg-error/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libassuan+=	libassuan>=2.1.0
+BUILDLINK_API_DEPENDS.libassuan+=	libassuan>=2.4.1
 .include "../../security/libassuan2/buildlink3.mk"
 .include "../../security/libksba/buildlink3.mk"
 BUILDLINK_API_DEPENDS.npth+=		npth>=0.91
diff --git a/security/gnupg21/distinfo b/security/gnupg21/distinfo
index d64278dc2dd..dbb192374f3 100644
--- a/security/gnupg21/distinfo
+++ b/security/gnupg21/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.4 2015/11/04 15:05:52 tnn Exp $
+$NetBSD: distinfo,v 1.5 2015/12/14 14:09:05 ryoon Exp $
 
-SHA1 (gnupg-2.1.9.tar.bz2) = 119bab38d2ff3a849be62914be9bf7333da68883
-RMD160 (gnupg-2.1.9.tar.bz2) = 4fcc251aa7da95e647984469277a49153533d1e8
-SHA512 (gnupg-2.1.9.tar.bz2) = c19b8cac42b7060caada230b77f36a0b0ed0a05efd519818c5b4057ef0fcb16602f2f3ade2409de2ef353a9e2acc3e5fa106a4449c6929a36a599a82194c0ee0
-Size (gnupg-2.1.9.tar.bz2) = 4925167 bytes
-SHA1 (patch-dirmngr_Makefile.in) = 4287bfd66eab7918e98cf9b4e50a2f7f9e18ab09
+SHA1 (gnupg-2.1.10.tar.bz2) = 4aa2594d2d364fe7708a9739ae7cebd251e536c4
+RMD160 (gnupg-2.1.10.tar.bz2) = b29e086cb65bbe40b3a6021b3c4eb0083cd0a344
+SHA512 (gnupg-2.1.10.tar.bz2) = ceea93a7e7d30e07839bcc52d4246fd5be1ec81a8c4d4d62059e2b0c0e58fab07a1531016f82bcc506340653d66c73541dd3f5897df7691abeb4068d94957003
+Size (gnupg-2.1.10.tar.bz2) = 5173253 bytes
+SHA1 (patch-dirmngr_Makefile.in) = fa74bcf4ea214945c64d383dff039ab938ae1446
 SHA1 (patch-dirmngr_ks-engine-ldap.c) = 3a7d96d877cd52bed66c481af83da99c517d3380
-SHA1 (patch-doc_Makefile.in) = bcd467d0fad08198b74892b240d3adeb72b5c52f
 SHA1 (patch-kbx_Makefile.in) = 58f7c3711744a42d40f580944fb768f7aaaf1b68
diff --git a/security/gnupg21/patches/patch-dirmngr_Makefile.in b/security/gnupg21/patches/patch-dirmngr_Makefile.in
index e030612b34d..46b894d2f74 100644
--- a/security/gnupg21/patches/patch-dirmngr_Makefile.in
+++ b/security/gnupg21/patches/patch-dirmngr_Makefile.in
@@ -1,15 +1,15 @@
-$NetBSD: patch-dirmngr_Makefile.in,v 1.1 2015/09/30 12:56:47 fhajny Exp $
+$NetBSD: patch-dirmngr_Makefile.in,v 1.2 2015/12/14 14:09:05 ryoon Exp $
 
 Bring in libsocket, needed on SunOS.
 
---- dirmngr/Makefile.in.orig	2015-09-30 11:26:38.032707039 +0000
+--- dirmngr/Makefile.in.orig	2015-12-04 09:57:05.000000000 +0000
 +++ dirmngr/Makefile.in
-@@ -723,7 +723,7 @@ dirmngr-client$(EXEEXT): $(dirmngr_clien
+@@ -757,7 +757,7 @@ dirmngr-client$(EXEEXT): $(dirmngr_clien
  
  dirmngr_ldap$(EXEEXT): $(dirmngr_ldap_OBJECTS) $(dirmngr_ldap_DEPENDENCIES) $(EXTRA_dirmngr_ldap_DEPENDENCIES) 
  	@rm -f dirmngr_ldap$(EXEEXT)
 -	$(AM_V_CCLD)$(dirmngr_ldap_LINK) $(dirmngr_ldap_OBJECTS) $(dirmngr_ldap_LDADD) $(LIBS)
 +	$(AM_V_CCLD)$(dirmngr_ldap_LINK) $(dirmngr_ldap_OBJECTS) $(dirmngr_ldap_LDADD) $(LIBS) $(NETLIBS)
  
- t-dns-cert$(EXEEXT): $(t_dns_cert_OBJECTS) $(t_dns_cert_DEPENDENCIES) $(EXTRA_t_dns_cert_DEPENDENCIES) 
- 	@rm -f t-dns-cert$(EXEEXT)
+ t-dns-stuff$(EXEEXT): $(t_dns_stuff_OBJECTS) $(t_dns_stuff_DEPENDENCIES) $(EXTRA_t_dns_stuff_DEPENDENCIES) 
+ 	@rm -f t-dns-stuff$(EXEEXT)
diff --git a/security/gnupg21/patches/patch-doc_Makefile.in b/security/gnupg21/patches/patch-doc_Makefile.in
deleted file mode 100644
index 9dfe2cbcccc..00000000000
--- a/security/gnupg21/patches/patch-doc_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-doc_Makefile.in,v 1.2 2015/11/04 15:05:52 tnn Exp $
-
-* gpg-zip command is not installed. Rmove man page too.
-
---- doc/Makefile.in.orig	2015-11-04 14:35:49.000000000 +0000
-+++ doc/Makefile.in
-@@ -498,7 +498,7 @@ myman_sources = gnupg7.texi gpg.texi gpg
- myman_pages = gpg2.1 gpgsm.1 gpg-agent.1 dirmngr.8 scdaemon.1 gpgv2.1 \
-                 watchgnupg.1 gpgconf.1 addgnupghome.8 gpg-preset-passphrase.1 \
- 		gpg-connect-agent.1 gpgparsemail.1 symcryptrun.1 \
--		applygnupgdefaults.8 gpg-zip.1 \
-+		applygnupgdefaults.8 \
- 		dirmngr-client.1
- 
- man_MANS = $(myman_pages) gnupg.7