Updated gnupg21 to 2.1.20.

Based on PR 52165 by Jonathan Schleifer.

Noteworthy changes in version 2.1.20 (2017-04-03)
-------------------------------------------------

  * gpg: New properties 'expired', 'revoked', and 'disbaled' for the
    import and export filters.

  * gpg: New command --quick-set-primary-uid.

  * gpg: New compliance field for the --with-colon key listing.

  * gpg: Changed the key parser to generalize the processing of local
    meta data packets.

  * gpg: Fixed assertion failure in the TOFU trust model.

  * gpg: Fixed exporting of zero length user ID packets.

  * scd: Improved support for multiple readers.

  * scd: Fixed timeout handling for key generation.

  * agent: New option --enable-extended-key-format.

  * dirmngr: Do not add a keyserver to a new dirmngr.conf.  Dirmngr
    uses a default keyserver.

  * dimngr: Do not treat TLS warning alerts as severe error when
    building with GNUTLS.

  * dirmngr: Actually take /etc/hosts in account.

  * wks: Fixed client problems on Windows.  Published keys are now set
    to world-readable.

  * tests: Fixed creation of temporary directories.

  * A socket directory for a non standard GNUGHOME is now created on
    the fly under /run/user.  Thus "gpgconf --create-socketdir" is now
    optional.  The use of "gpgconf --remove-socketdir" to clean up
    obsolete socket directories is however recommended to avoid
    cluttering /run/user with useless directories.

  * Fixed build problems on some platforms.



Noteworthy changes in version 2.1.19 (2017-03-01)
-------------------------------------------------

  * gpg: Print a warning if Tor mode is requested but the Tor daemon
    is not running.

  * gpg: New status code DECRYPTION_KEY to print the actual private
    key used for decryption.

  * gpgv: New options --log-file and --debug.

  * gpg-agent: Revamp the prompts to ask for card PINs.

  * scd: Support for multiple card readers.

  * scd: Removed option --debug-disable-ticker.  Ticker is used
    only when it is required to watch removal of device/card.

  * scd: Improved detection of card inserting and removal.

  * dirmngr: New option --disable-ipv4.

  * dirmngr: New option --no-use-tor to explicitly disable the use of
    Tor.

  * dirmngr: The option --allow-version-check is now required even if
    the option --use-tor is also used.

  * dirmngr: Handle a missing nsswitch.conf gracefully.

  * dirmngr: Avoid PTR lookups for keyserver pools.  The are only done
    for the debug command "keyserver --hosttable".

  * dirmngr: Rework the internal certificate cache to support classes
    of certificates.  Load system provided certificates on startup.
    Add options --tls, --no-crl, and --systrust to the "VALIDATE"
    command.

  * dirmngr: Add support for the ntbtls library.

  * wks: Create mails with a "WKS-Phase" header.  Fix detection of
    Draft-2 mode.

  * The Windows installer is now build with limited TLS support.

  * Many other bug fixes and new regression tests.

  See-also: gnupg-announce/2017q1/000402.html

3 files changed, 12 insertions, 8 deletions

diff --git a/security/gnupg21/Makefile b/security/gnupg21/Makefile
index 95549f17a10..272200bb4bd 100644
--- a/security/gnupg21/Makefile
+++ b/security/gnupg21/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2017/02/04 07:12:35 maya Exp $
+# $NetBSD: Makefile,v 1.28 2017/04/16 07:21:48 wiz Exp $
 
-DISTNAME=	gnupg-2.1.18
+DISTNAME=	gnupg-2.1.20
 PKGNAME=	${DISTNAME:S/gnupg-/gnupg21-/}
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/gnupg/
@@ -23,6 +23,8 @@ INFO_FILES=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-g13
 
+# one test failure in 2.1.20, fixed upstream; see
+# https://dev.gnupg.org/T3047
 TEST_TARGET=		check
 
 # SunOS does have getaddrinfo() and the code knows how to use it
diff --git a/security/gnupg21/PLIST b/security/gnupg21/PLIST
index 5bd79e3f54e..69e4b8c2b5f 100644
--- a/security/gnupg21/PLIST
+++ b/security/gnupg21/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2017/02/04 07:12:35 maya Exp $
+@comment $NetBSD: PLIST,v 1.9 2017/04/16 07:21:48 wiz Exp $
 bin/dirmngr
 bin/dirmngr-client
 bin/g13
@@ -48,6 +48,7 @@ share/doc/gnupg/OpenPGP
 share/doc/gnupg/README
 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
@@ -60,6 +61,7 @@ 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/dirmngr-conf.skel
 share/gnupg/distsigkey.gpg
 share/gnupg/gpg-conf.skel
diff --git a/security/gnupg21/distinfo b/security/gnupg21/distinfo
index d15ca1c8ac3..b944b2a7339 100644
--- a/security/gnupg21/distinfo
+++ b/security/gnupg21/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.14 2017/02/04 07:12:35 maya Exp $
+$NetBSD: distinfo,v 1.15 2017/04/16 07:21:48 wiz Exp $
 
-SHA1 (gnupg-2.1.18.tar.bz2) = b698012cc2d77c2652afd168a15e679d1394fa89
-RMD160 (gnupg-2.1.18.tar.bz2) = a11128b9228b5b990fd8fe52923ea348d6571ffd
-SHA512 (gnupg-2.1.18.tar.bz2) = b8357f0a883a33c2e4f6ab5a8f5ddb171c899b7a2899e8ce4cac232938fe1dffb789a54980dfc4b758c4cb47f11f1fc570fea905244735048dfc6f06b3353baf
-Size (gnupg-2.1.18.tar.bz2) = 6308666 bytes
+SHA1 (gnupg-2.1.20.tar.bz2) = 500ddae8e4225ae2e300934090f9b9a427b8def1
+RMD160 (gnupg-2.1.20.tar.bz2) = 6f2448b16d69e81d0f6e82db5250f5acf0217b5f
+SHA512 (gnupg-2.1.20.tar.bz2) = 14a9890bc64e143f87cff121dd298d490d78dbd34e36883e0f25763ff9064e5706a7632893d7c5d0e8e9b8cf9cdb0d378b4ce1715348729f0fc080455b61eca9
+Size (gnupg-2.1.20.tar.bz2) = 6456128 bytes
 SHA1 (patch-dirmngr_Makefile.in) = fa74bcf4ea214945c64d383dff039ab938ae1446
 SHA1 (patch-g13_sh-dmcrypt.c) = a2505039fff9e1e90ab81076776542fa83f55d5e