gnupg2: updated to 2.2.14

Noteworthy changes in version 2.2.14:
* gpg: Allow import of PGP desktop exported secret keys.  Also avoid
 importing secret keys if the secret keyblock is not valid.
* gpg: Do not error out on version 5 keys in the local keyring.
* gpg: Make invalid primary key algo obvious in key listings.
* sm: Do not mark a certificate in a key listing as de-vs compliant
  if its use for a signature will not be possible.
* sm: Fix certificate creation with key on card.
* sm: Create rsa3072 bit certificates by default.
* sm: Print Yubikey attestation extensions with --dump-cert.
* agent: Fix cancellation handling for scdaemon.
* agent: Support --mode=ssh option for CLEAR_PASSPHRASE.
* scd: Fix flushing of the CA-FPR DOs in app-openpgp.
* scd: Avoid a conflict error with the "undefined" app.
* dirmngr: Add CSRF protection exception for protonmail.
* dirmngr: Fix build problems with gcc 9 in libdns.
* gpgconf: New option --show-socket for use wity --launch.
* gpgtar: Make option -C work for archive creation.

3 files changed, 24 insertions, 17 deletions

diff --git a/security/gnupg2/Makefile b/security/gnupg2/Makefile
index 0d1b3a5f7de..b38e6168660 100644
--- a/security/gnupg2/Makefile
+++ b/security/gnupg2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.99 2019/02/13 16:06:44 adam Exp $
+# $NetBSD: Makefile,v 1.100 2019/03/20 06:39:52 adam Exp $
 
-DISTNAME=	gnupg-2.2.13
+DISTNAME=	gnupg-2.2.14
 PKGNAME=	${DISTNAME:S/gnupg-/gnupg2-/}
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/gnupg/
@@ -23,33 +23,34 @@ USE_TOOLS+=		gmake pkg-config makeinfo
 USE_LIBTOOL=		yes
 INFO_FILES=		yes
 GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--disable-ntbtls
 CONFIGURE_ARGS+=	--enable-g13
 CONFIGURE_ARGS+=	--enable-gpg-is-gpg2
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
-
-TEST_TARGET=		check
-
 # SunOS does have getaddrinfo() and the code knows how to use it
 CONFIGURE_ARGS.SunOS+=	ac_cv_func_getaddrinfo=yes
 
+TEST_TARGET=		check
+
 LDFLAGS.Darwin+=	-lintl -lresolv
 LDFLAGS.FreeBSD+=	-lintl
 LDFLAGS.SunOS+=		-lintl -lsocket
 
 .include "options.mk"
 
+BUILDLINK_API_DEPENDS.sqlite3+=		sqlite3>=3.7.15
+.include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.npth+=		npth>=1.2
+.include "../../devel/npth/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libgcrypt+=	libgcrypt>=1.7
 .include "../../security/libgcrypt/buildlink3.mk"
-BUILDLINK_API_DEPENDS.sqlite3+=		sqlite3>=3.7.15
-.include "../../databases/sqlite3/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libgpg-error+=	libgpg-error>=1.28
 .include "../../security/libgpg-error/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libassuan+=	libassuan>=2.5.1
 .include "../../security/libassuan2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libksba+=		libksba>=1.3.4
 .include "../../security/libksba/buildlink3.mk"
-BUILDLINK_API_DEPENDS.npth+=		npth>=1.2
-.include "../../devel/npth/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/gnupg2/distinfo b/security/gnupg2/distinfo
index 4d1fc391c9d..774c6a054bf 100644
--- a/security/gnupg2/distinfo
+++ b/security/gnupg2/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.52 2019/02/13 16:06:44 adam Exp $
+$NetBSD: distinfo,v 1.53 2019/03/20 06:39:52 adam Exp $
 
-SHA1 (gnupg-2.2.13.tar.bz2) = 66ebc053e2d22f743673d3fbe54453774e4fac58
-RMD160 (gnupg-2.2.13.tar.bz2) = b24158d4a6b9ce00fc27f2f5b855793e5d15dc6a
-SHA512 (gnupg-2.2.13.tar.bz2) = 3770e33902ca608f567bc9f0decb57129b77dd3479e5c1bbd569ede4c1f6690cdfe00105ffdc1e7721faa331abcb879adb56e87931313b13ed48763763c6632f
-Size (gnupg-2.2.13.tar.bz2) = 6702712 bytes
+SHA1 (gnupg-2.2.14.tar.bz2) = f349c20e7498af88299b0d42a961e0364e5c37e7
+RMD160 (gnupg-2.2.14.tar.bz2) = e8972a7e145b5c9a49e34392b2a70d09748c30b3
+SHA512 (gnupg-2.2.14.tar.bz2) = 9d5216dee085efe6de300579d8fb773a5a55df639d5a435708611a974df522dd60dc995fbfcaad98065475dbeb731bbba19ecc3273e78b9b45fccff640dde69b
+Size (gnupg-2.2.14.tar.bz2) = 6707735 bytes
diff --git a/security/gnupg2/options.mk b/security/gnupg2/options.mk
index 1b44472c2fb..1b4143f3aea 100644
--- a/security/gnupg2/options.mk
+++ b/security/gnupg2/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.13 2018/05/16 10:22:22 tm Exp $
+# $NetBSD: options.mk,v 1.14 2019/03/20 06:39:52 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gnupg2
-PKG_SUPPORTED_OPTIONS=	bzip2 ldap libusb-1 zlib
-PKG_SUGGESTED_OPTIONS=	bzip2 libusb-1 zlib
+PKG_SUPPORTED_OPTIONS=	bzip2 gnutls ldap libusb-1 zlib
+PKG_SUGGESTED_OPTIONS=	bzip2 gnutls libusb-1 zlib
 
 .include "../../mk/bsd.options.mk"
 
@@ -13,6 +13,12 @@ CONFIGURE_ARGS+=       --with-bzip2=${BUILDLINK_PREFIX.bzip2}
 CONFIGURE_ARGS+=       --disable-bzip2
 .endif
 
+.if !empty(PKG_OPTIONS:Mgnutls)
+.include "../../security/gnutls/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-gnutls
+.endif
+
 PLIST_VARS+=		ldap
 .if !empty(PKG_OPTIONS:Mldap)
 CONFIGURE_ARGS+=	--with-ldap=${BUILDLINK_PREFIX.openldap-client}