Updated gnupg2 to 2.2.0.

Noteworthy changes in version 2.2.0 (2017-08-28)
------------------------------------------------

  This is the new long term stable branch.  This branch will only see
  bug fixes and no new features.

  * gpg: Reverted change in 2.1.23 so that --no-auto-key-retrieve is
    again the default.

  * Fixed a few minor bugs.

6 files changed, 142 insertions, 163 deletions

diff --git a/security/gnupg2/Makefile b/security/gnupg2/Makefile
index 754e5706e44..f69de840e37 100644
--- a/security/gnupg2/Makefile
+++ b/security/gnupg2/Makefile
@@ -1,54 +1,49 @@
-# $NetBSD: Makefile,v 1.70 2017/08/24 20:03:38 adam Exp $
+# $NetBSD: Makefile,v 1.71 2017/08/29 12:07:04 wiz Exp $
 
-DISTNAME=	gnupg-2.0.30
-PKGNAME=	${DISTNAME:S/gnupg/gnupg2/}
-PKGREVISION=	4
+DISTNAME=	gnupg-2.2.0
+PKGNAME=	${DISTNAME:S/gnupg-/gnupg2-/}
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/gnupg/
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.gnupg.org/
+MAINTAINER=	ada@netbsdfr.org
+HOMEPAGE=	https://www.gnupg.org/
 COMMENT=	GnuPG with OpenPGP and S/MIME capabilities
 LICENSE=	gnu-gpl-v3
 
-INFO_FILES=		yes
-USE_LIBTOOL=		yes
-USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--sharedstatedir=${VARBASE}
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=	--with-pinentry-pgm=${PREFIX}/bin/pinentry
+DEPENDS+=	pinentry-[0-9]*:../../security/pinentry
 
-.include "../../mk/bsd.prefs.mk"
+CONFLICTS=	dirmngr-[0-9]*
 
-# Sometimes wrong include file gets detected, e.g. for Clang
-.if defined(OSX_SDK_PATH) && exists(${OSX_SDK_PATH:Q}/usr/include/stdint.h)
-CONFIGURE_ENV+=		gl_cv_absolute_stdint_h=${OSX_SDK_PATH:Q}/usr/include/stdint.h
-.elif exists(/usr/include/stdint.h)
-CONFIGURE_ENV+=		gl_cv_absolute_stdint_h=/usr/include/stdint.h
-.endif
+BUILD_DEFS+=		VARBASE
+USE_PKGLOCALEDIR=	yes
+USE_TOOLS+=		gmake pkg-config makeinfo
+USE_LIBTOOL=		yes
+INFO_FILES=		yes
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--enable-g13
+CONFIGURE_ARGS+=	--enable-gpg-is-gpg2
 
 TEST_TARGET=		check
 
-DEPENDS+=	pinentry-[0-9]*:../../security/pinentry
+# SunOS does have getaddrinfo() and the code knows how to use it
+CONFIGURE_ARGS.SunOS+=	ac_cv_func_getaddrinfo=yes
+
+LDFLAGS.Darwin+=	-lintl -lresolv
+LDFLAGS.SunOS+=		-lintl -lsocket
 
 .include "options.mk"
 
-.include "../../archivers/bzip2/buildlink3.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../databases/openldap-client/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pth/buildlink3.mk"
-.include "../../mk/readline.buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../security/libassuan2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libgcrypt+=	libgcrypt>=1.5.0
+BUILDLINK_API_DEPENDS.libgcrypt+=	libgcrypt>=1.7
 .include "../../security/libgcrypt/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libgpg-error+=	libgpg-error>=1.4
+.include "../../databases/sqlite3/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libgpg-error+=	libgpg-error>=1.24
 .include "../../security/libgpg-error/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libksba+=		libksba>=1.0.2
+BUILDLINK_API_DEPENDS.libassuan+=	libassuan>=2.4.3
+.include "../../security/libassuan2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libksba+=		libksba>=1.3.4
 .include "../../security/libksba/buildlink3.mk"
-.include "../../www/curl/buildlink3.mk"
+BUILDLINK_API_DEPENDS.npth+=		npth>=1.2
+.include "../../devel/npth/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/gnupg2/PLIST b/security/gnupg2/PLIST
index 1d4773a05a0..8641bee69c6 100644
--- a/security/gnupg2/PLIST
+++ b/security/gnupg2/PLIST
@@ -1,9 +1,99 @@
-@comment $NetBSD: PLIST,v 1.6 2015/02/21 09:08:53 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2017/08/29 12:07:04 wiz Exp $
+bin/dirmngr
+bin/dirmngr-client
+bin/g13
 bin/gpg-agent
+bin/gpg-connect-agent
+bin/gpg2
+bin/gpgconf
+bin/gpgparsemail
+bin/gpgscm
+bin/gpgsm
+bin/gpgtar
+bin/gpgv2
+bin/kbxutil
+bin/watchgnupg
+info/gnupg.info
+${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
+man/man1/gpg-connect-agent.1
+man/man1/gpg-preset-passphrase.1
+man/man1/gpg-wks-client.1
+man/man1/gpg-wks-server.1
+man/man1/gpg2.1
+man/man1/gpgconf.1
+man/man1/gpgparsemail.1
+man/man1/gpgsm.1
+man/man1/gpgv2.1
+man/man1/scdaemon.1
+man/man1/symcryptrun.1
+man/man1/watchgnupg.1
+man/man7/gnupg.7
+man/man8/addgnupghome.8
+man/man8/applygnupgdefaults.8
+man/man8/dirmngr.8
+sbin/addgnupghome
+sbin/applygnupgdefaults
+sbin/g13-syshelp
+share/doc/gnupg/DCO
+share/doc/gnupg/DETAILS
+share/doc/gnupg/FAQ
+share/doc/gnupg/HACKING
+share/doc/gnupg/KEYSERVER
+share/doc/gnupg/OpenPGP
 share/doc/gnupg/README
-share/locale/be/LC_MESSAGES/gnupg2.mo
+share/doc/gnupg/TRANSLATE
+share/doc/gnupg/examples/README
+share/doc/gnupg/examples/debug.prf
+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-browser.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/doc/gnupg/examples/vsnfd.prf
+share/gnupg/distsigkey.gpg
+share/gnupg/help.be.txt
+share/gnupg/help.ca.txt
+share/gnupg/help.cs.txt
+share/gnupg/help.da.txt
+share/gnupg/help.de.txt
+share/gnupg/help.el.txt
+share/gnupg/help.eo.txt
+share/gnupg/help.es.txt
+share/gnupg/help.et.txt
+share/gnupg/help.fi.txt
+share/gnupg/help.fr.txt
+share/gnupg/help.gl.txt
+share/gnupg/help.hu.txt
+share/gnupg/help.id.txt
+share/gnupg/help.it.txt
+share/gnupg/help.ja.txt
+share/gnupg/help.nb.txt
+share/gnupg/help.pl.txt
+share/gnupg/help.pt.txt
+share/gnupg/help.pt_BR.txt
+share/gnupg/help.ro.txt
+share/gnupg/help.ru.txt
+share/gnupg/help.sk.txt
+share/gnupg/help.sv.txt
+share/gnupg/help.tr.txt
+share/gnupg/help.txt
+share/gnupg/help.zh_CN.txt
+share/gnupg/help.zh_TW.txt
+share/gnupg/sks-keyservers.netCA.pem
 share/locale/ca/LC_MESSAGES/gnupg2.mo
 share/locale/cs/LC_MESSAGES/gnupg2.mo
 share/locale/da/LC_MESSAGES/gnupg2.mo
@@ -22,10 +112,8 @@ share/locale/id/LC_MESSAGES/gnupg2.mo
 share/locale/it/LC_MESSAGES/gnupg2.mo
 share/locale/ja/LC_MESSAGES/gnupg2.mo
 share/locale/nb/LC_MESSAGES/gnupg2.mo
-share/locale/nl/LC_MESSAGES/gnupg2.mo
 share/locale/pl/LC_MESSAGES/gnupg2.mo
 share/locale/pt/LC_MESSAGES/gnupg2.mo
-share/locale/pt_BR/LC_MESSAGES/gnupg2.mo
 share/locale/ro/LC_MESSAGES/gnupg2.mo
 share/locale/ru/LC_MESSAGES/gnupg2.mo
 share/locale/sk/LC_MESSAGES/gnupg2.mo
diff --git a/security/gnupg2/PLIST.gpgsm b/security/gnupg2/PLIST.gpgsm
deleted file mode 100644
index b69b066b97f..00000000000
--- a/security/gnupg2/PLIST.gpgsm
+++ /dev/null
@@ -1,79 +0,0 @@
-@comment $NetBSD: PLIST.gpgsm,v 1.13 2013/05/29 22:53:36 wiz Exp $
-bin/gpg-connect-agent
-bin/gpg2
-bin/gpgconf
-bin/gpgkey2ssh
-bin/gpgparsemail
-bin/gpgsm
-bin/gpgsm-gencert.sh
-bin/gpgv2
-bin/kbxutil
-bin/watchgnupg
-info/gnupg.info
-info/gnupg.info-1
-libexec/gnupg-pcsc-wrapper
-libexec/gpg-check-pattern
-libexec/gpg2keys_curl
-libexec/gpg2keys_finger
-libexec/gpg2keys_hkp
-libexec/gpg2keys_ldap
-libexec/scdaemon
-man/man1/gpg-agent.1
-man/man1/gpg-connect-agent.1
-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
-man/man1/symcryptrun.1
-man/man1/watchgnupg.1
-man/man8/addgnupghome.8
-man/man8/applygnupgdefaults.8
-sbin/addgnupghome
-sbin/applygnupgdefaults
-share/doc/gnupg/DETAILS
-share/doc/gnupg/FAQ
-share/doc/gnupg/HACKING
-share/doc/gnupg/KEYSERVER
-share/doc/gnupg/OpenPGP
-share/doc/gnupg/README
-share/doc/gnupg/TRANSLATE
-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/trustlist.txt
-share/gnupg/com-certs.pem
-share/gnupg/gpg-conf.skel
-share/gnupg/help.be.txt
-share/gnupg/help.ca.txt
-share/gnupg/help.cs.txt
-share/gnupg/help.da.txt
-share/gnupg/help.de.txt
-share/gnupg/help.el.txt
-share/gnupg/help.eo.txt
-share/gnupg/help.es.txt
-share/gnupg/help.et.txt
-share/gnupg/help.fi.txt
-share/gnupg/help.fr.txt
-share/gnupg/help.gl.txt
-share/gnupg/help.hu.txt
-share/gnupg/help.id.txt
-share/gnupg/help.it.txt
-share/gnupg/help.ja.txt
-share/gnupg/help.nb.txt
-share/gnupg/help.pl.txt
-share/gnupg/help.pt.txt
-share/gnupg/help.pt_BR.txt
-share/gnupg/help.ro.txt
-share/gnupg/help.ru.txt
-share/gnupg/help.sk.txt
-share/gnupg/help.sv.txt
-share/gnupg/help.tr.txt
-share/gnupg/help.txt
-share/gnupg/help.zh_CN.txt
-share/gnupg/help.zh_TW.txt
-share/gnupg/qualified.txt
diff --git a/security/gnupg2/distinfo b/security/gnupg2/distinfo
index 58c79a18bea..9861d15578f 100644
--- a/security/gnupg2/distinfo
+++ b/security/gnupg2/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.38 2016/04/13 18:01:55 wiz Exp $
+$NetBSD: distinfo,v 1.39 2017/08/29 12:07:04 wiz Exp $
 
-SHA1 (gnupg-2.0.30.tar.bz2) = a9f024588c356a55e2fd413574bfb55b2e18794a
-RMD160 (gnupg-2.0.30.tar.bz2) = 7d682c3e0e1c188d026519b0511ecde6a0cc6bd7
-SHA512 (gnupg-2.0.30.tar.bz2) = e60a57f7dc74b44f884fd50d5a9c51cef7df8c098644ebab9ef7d945a40b0e4a285d0dc80b10fe39d8e4c2cc9d6cbbe800a0ddae54883180dc755fe47ced3314
-Size (gnupg-2.0.30.tar.bz2) = 4414652 bytes
-SHA1 (patch-tools_gpgkey2ssh.c) = 38ccb1980d6248b11316ccc49cd3dda06bab0d3b
+SHA1 (gnupg-2.2.0.tar.bz2) = 36ee693d0b2ec529ecf53dd6d397cc38ba71c0a7
+RMD160 (gnupg-2.2.0.tar.bz2) = 8e1c8e00d89e7dd86d0cf38d9d92278c62ba5962
+SHA512 (gnupg-2.2.0.tar.bz2) = 8ab7c4183d2ec2e6b62066e3cbcba95babaa0ae22da47feab716698792d26495f072d50e8ec612b8d26147636bb316320c78940184373b3f4cb6ec411933361b
+Size (gnupg-2.2.0.tar.bz2) = 6532475 bytes
diff --git a/security/gnupg2/options.mk b/security/gnupg2/options.mk
index 92ffd5301ae..243682a35e9 100644
--- a/security/gnupg2/options.mk
+++ b/security/gnupg2/options.mk
@@ -1,34 +1,25 @@
-# $NetBSD: options.mk,v 1.9 2015/03/24 08:36:56 wiz Exp $
+# $NetBSD: options.mk,v 1.10 2017/08/29 12:07:04 wiz Exp $
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.gnupg2
-PKG_SUPPORTED_OPTIONS=	gnupg2-gpgsm libusb
-PKG_SUGGESTED_OPTIONS=	gnupg2-gpgsm
+PKG_OPTIONS_VAR=	PKG_OPTIONS.gnupg21
+PKG_SUPPORTED_OPTIONS=	ldap libusb-1
+PKG_SUGGESTED_OPTIONS=	libusb-1
 
-# remove after 2014Q3
-PKG_OPTIONS_LEGACY_OPTS+=     gpgsm:gnupg2-gpgsm
-
-.include "../../mk/bsd.prefs.mk"
 .include "../../mk/bsd.options.mk"
 
-## If no options are specified, only gpg-agent is built. This
-## is sufficient for OpenPGP/MIME support in Kmail
-## SMIME support is provided by gpgsm. This support is
-## in the alpha stage of development.
-PLIST_SRC=	${.CURDIR}/PLIST
-
-# XXX It looks like that gpgsm support could be split into its own package,
-# according to the configure script.  If that's true, this use of the options
-# framework is incorrect and should be fixed.
-.if empty(PKG_OPTIONS:Mgnupg2-gpgsm)
-CONFIGURE_ARGS+=	--enable-agent-only
+PLIST_VARS+=		ldap
+.if !empty(PKG_OPTIONS:Mldap)
+CONFIGURE_ARGS+=	--with-ldap=${BUILDLINK_PREFIX.openldap-client}
+PLIST.ldap=		yes
+.include "../../databases/openldap-client/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=	--enable-gpgsm
-CONFIGURE_ARGS+=	--with-dirmngr-pgm=${BUILDLINK_PREFIX.dirmngr}/bin/dirmngr
-PLIST_SRC+=	${.CURDIR}/PLIST.gpgsm
-.  include "../../security/dirmngr/buildlink3.mk"
+CONFIGURE_ARGS+=	--disable-ldap
 .endif
 
-.if !empty(PKG_OPTIONS:Mlibusb)
-USE_TOOLS+=	pkg-config
-.  include "../../devel/libusb/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mlibusb-1)
+# gnupg unfortunately doesn't use pkg-config
+CONFIGURE_ARGS+=	CPPFLAGS="${CPPFLAGS} -I${BUILDLINK_PREFIX.libusb1}/include/libusb-1.0"
+CONFIGURE_ARGS+=	LDFLAGS="${LDFLAGS} ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libusb1}/lib -L${BUILDLINK_PREFIX.libusb1}/lib"
+.include "../../devel/libusb1/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-ccid-driver
 .endif
diff --git a/security/gnupg2/patches/patch-tools_gpgkey2ssh.c b/security/gnupg2/patches/patch-tools_gpgkey2ssh.c
deleted file mode 100644
index 599c531a455..00000000000
--- a/security/gnupg2/patches/patch-tools_gpgkey2ssh.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-tools_gpgkey2ssh.c,v 1.1 2015/01/15 20:59:59 wiz Exp $
-
-Fix executable name.
-
---- tools/gpgkey2ssh.c.orig	2014-08-11 21:43:41.000000000 +0000
-+++ tools/gpgkey2ssh.c
-@@ -266,7 +266,7 @@ main (int argc, char **argv)
-   keyid = argv[1];
- 
-   ret = asprintf (&command,
--		  "gpg --list-keys --with-colons --with-key-data '%s'",
-+		  "gpg2 --list-keys --with-colons --with-key-data '%s'",
- 		  keyid);
-   assert (ret > 0);
-