Update to gnupg-2.1.9.

gnupg-2.1.9:
 * gpg: Allow fetching keys via OpenPGP DANE (--auto-key-locate).  New
   option --print-dane-records.
 * gpg: Fix for a problem with PGP-2 keys in a keyring.
 * gpg: Fail with an error instead of a warning if a modern cipher
   algorithm is used without a MDC.
 * agent: New option --pinentry-invisible-char.
 * agent: Always do a RSA signature verification after creation.
 * agent: Fix a regression in ssh-add-ing Ed25519 keys.
 * agent: Fix ssh fingerprint computation for nistp384 and EdDSA.
 * agent: Fix crash during passprase entry on some platforms.
 * scd: Change timeout to fix problems with some 2.1 cards.
 * dirmngr: Displayed name is now Key Acquirer.
 * dirmngr: Add option --keyserver.  Deprecate that option for gpg.
   Install a dirmngr.conf file from a skeleton for new installations.

gnupg-2.1.8:
 * gpg: Sending very large keys to the keyservers works again.
 * gpg: Validity strings in key listings are now again translatable.
 * gpg: Emit FAILURE status lines to help GPGME.
 * gpg: Does not anymore link to Libksba to reduce dependencies.
 * gpgsm: Export of secret keys via Assuan is now possible.
 * agent: Raise the maximum passphrase length from 100 to 255 bytes.
 * agent: Fix regression using EdDSA keys with ssh.
 * Does not anymore use a build timestamp by default.
 * The fallback encoding for broken locale settings changed
   from Latin-1 to UTF-8.
 * Many code cleanups and improved internal documentation.
 * Various minor bug fixes.

gnupg-2.1.7:
 * gpg: Support encryption with Curve25519 if Libgcrypt 1.7 is used.
 * gpg: In the --edit-key menu: Removed the need for "toggle", changed
   how secret keys are indicated, new commands "fpr *" and "grip".
 * gpg: More fixes related to legacy keys in a keyring.
 * gpgv: Does now also work with a "trustedkeys.kbx" file.
 * scd: Support some feature from the OpenPGP card 3.0 specs.
 * scd: Improved ECC support
 * agent: New option --force for the DELETE_KEY command.
 * w32: Look for the Pinentry at more places.
 * Dropped deprecated gpgsm-gencert.sh
 * Various other bug fixes.

5 files changed, 24 insertions, 26 deletions

diff --git a/security/gnupg21/Makefile b/security/gnupg21/Makefile
index 790ac916671..34ff2572599 100644
--- a/security/gnupg21/Makefile
+++ b/security/gnupg21/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2015/10/08 13:35:39 fhajny Exp $
+# $NetBSD: Makefile,v 1.10 2015/11/04 15:05:52 tnn Exp $
 
-DISTNAME=	gnupg-2.1.6
+DISTNAME=	gnupg-2.1.9
 PKGNAME=	${DISTNAME:S/gnupg-/gnupg21-/}
-PKGREVISION=	4
 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 12e44a14d29..28e4811a058 100644
--- a/security/gnupg21/PLIST
+++ b/security/gnupg21/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2015/10/08 13:35:39 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/11/04 15:05:52 tnn Exp $
 bin/dirmngr
 bin/dirmngr-client
 bin/g13
@@ -9,7 +9,6 @@ bin/gpgconf
 bin/gpgkey2ssh
 bin/gpgparsemail
 bin/gpgsm
-bin/gpgsm-gencert.sh
 bin/gpgtar
 bin/gpgv2
 bin/kbxutil
@@ -27,7 +26,6 @@ man/man1/gpg-preset-passphrase.1
 man/man1/gpg2.1
 man/man1/gpgconf.1
 man/man1/gpgparsemail.1
-man/man1/gpgsm-gencert.sh.1
 man/man1/gpgsm.1
 man/man1/gpgv2.1
 man/man1/scdaemon.1
@@ -53,6 +51,7 @@ share/doc/gnupg/examples/pwpattern.list
 share/doc/gnupg/examples/scd-event
 share/doc/gnupg/examples/trustlist.txt
 share/gnupg/com-certs.pem
+share/gnupg/dirmngr-conf.skel
 share/gnupg/distsigkey.gpg
 share/gnupg/gpg-conf.skel
 share/gnupg/help.be.txt
diff --git a/security/gnupg21/distinfo b/security/gnupg21/distinfo
index cca4417735c..d64278dc2dd 100644
--- a/security/gnupg21/distinfo
+++ b/security/gnupg21/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.3 2015/11/04 01:17:45 agc Exp $
+$NetBSD: distinfo,v 1.4 2015/11/04 15:05:52 tnn Exp $
 
-SHA1 (gnupg-2.1.6.tar.bz2) = 9e8157b3386da04760657ce3117fc4dc570c57c5
-RMD160 (gnupg-2.1.6.tar.bz2) = 42db712fe0669caf246dbf46aca429b392614e2b
-SHA512 (gnupg-2.1.6.tar.bz2) = ae8aafe770336c83badf5610fe37f4ddc488786e3604780627893b636161d8407f3fd782538799e2b2a02e31c97468464372017fa52b5d9ed1bd31c85d9b3763
-Size (gnupg-2.1.6.tar.bz2) = 4917722 bytes
+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 (patch-dirmngr_ks-engine-ldap.c) = 3a7d96d877cd52bed66c481af83da99c517d3380
-SHA1 (patch-doc_Makefile.in) = 1f5dc55c6751322e2a5436b0a66a530d231b4a75
-SHA1 (patch-kbx_Makefile.in) = f4b06a913fe86dca1170eb78ed767b8889a43dd9
+SHA1 (patch-doc_Makefile.in) = bcd467d0fad08198b74892b240d3adeb72b5c52f
+SHA1 (patch-kbx_Makefile.in) = 58f7c3711744a42d40f580944fb768f7aaaf1b68
diff --git a/security/gnupg21/patches/patch-doc_Makefile.in b/security/gnupg21/patches/patch-doc_Makefile.in
index 246bb58b09b..9dfe2cbcccc 100644
--- a/security/gnupg21/patches/patch-doc_Makefile.in
+++ b/security/gnupg21/patches/patch-doc_Makefile.in
@@ -1,15 +1,15 @@
-$NetBSD: patch-doc_Makefile.in,v 1.1 2015/07/04 05:26:21 ryoon Exp $
+$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-07-01 12:17:03.000000000 +0000
+--- 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 \
--		gpgsm-gencert.sh.1 applygnupgdefaults.8 gpg-zip.1 \
-+		gpgsm-gencert.sh.1 applygnupgdefaults.8 \
+-		applygnupgdefaults.8 gpg-zip.1 \
++		applygnupgdefaults.8 \
  		dirmngr-client.1
  
  man_MANS = $(myman_pages) gnupg.7
diff --git a/security/gnupg21/patches/patch-kbx_Makefile.in b/security/gnupg21/patches/patch-kbx_Makefile.in
index b6de022c795..f760d0e1961 100644
--- a/security/gnupg21/patches/patch-kbx_Makefile.in
+++ b/security/gnupg21/patches/patch-kbx_Makefile.in
@@ -1,15 +1,15 @@
-$NetBSD: patch-kbx_Makefile.in,v 1.1 2015/09/30 12:56:47 fhajny Exp $
+$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-09-30 11:23:15.890769261 +0000
+--- kbx/Makefile.in.orig	2015-10-09 15:16:17.000000000 +0000
 +++ kbx/Makefile.in
-@@ -551,7 +551,7 @@ clean-binPROGRAMS:
+@@ -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)
  
- kbxutil$(EXEEXT): $(kbxutil_OBJECTS) $(kbxutil_DEPENDENCIES) $(EXTRA_kbxutil_DEPENDENCIES) 
- 	@rm -f kbxutil$(EXEEXT)
--	$(AM_V_CCLD)$(LINK) $(kbxutil_OBJECTS) $(kbxutil_LDADD) $(LIBS)
-+	$(AM_V_CCLD)$(LINK) $(kbxutil_OBJECTS) $(kbxutil_LDADD) $(LIBS) $(NETLIBS)
+ all: all-am
  
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)