Updated gnupg21 to 2.1.21.

Noteworthy changes in version 2.1.21 (2017-05-15)
-------------------------------------------------

  * gpg,gpgsm: Fix corruption of old style keyring.gpg files.  This
    bug was introduced with version 2.1.20.  Note that the default
    pubring.kbx format was not affected.

  * gpg,dirmngr: Removed the skeleton config file support.  The
    system's standard methods for providing default configuration
    files should be used instead.

  * w32: The Windows installer now allows installion of GnuPG without
    Administrator permissions.

  * gpg: Fixed import filter property match bug.

  * scd: Removed Linux support for Cardman 4040 PCMCIA reader.

  * scd: Fixed some corner case bugs in resume/suspend handling.

  * Many minor bug fixes and code cleanup.

4 files changed, 8 insertions, 29 deletions

diff --git a/security/gnupg21/Makefile b/security/gnupg21/Makefile
index 5db6f56616a..a48c2245501 100644
--- a/security/gnupg21/Makefile
+++ b/security/gnupg21/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2017/05/15 13:20:45 jperkin Exp $
+# $NetBSD: Makefile,v 1.31 2017/05/16 12:08:01 wiz Exp $
 
-DISTNAME=	gnupg-2.1.20
+DISTNAME=	gnupg-2.1.21
 PKGNAME=	${DISTNAME:S/gnupg-/gnupg21-/}
-PKGREVISION=	1
 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 69e4b8c2b5f..ee886657dbc 100644
--- a/security/gnupg21/PLIST
+++ b/security/gnupg21/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2017/04/16 07:21:48 wiz Exp $
+@comment $NetBSD: PLIST,v 1.10 2017/05/16 12:08:01 wiz Exp $
 bin/dirmngr
 bin/dirmngr-client
 bin/g13
@@ -62,9 +62,7 @@ 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
 share/gnupg/help.be.txt
 share/gnupg/help.ca.txt
 share/gnupg/help.cs.txt
diff --git a/security/gnupg21/distinfo b/security/gnupg21/distinfo
index 8d2b7c1d9ce..e570fc16343 100644
--- a/security/gnupg21/distinfo
+++ b/security/gnupg21/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.17 2017/04/20 09:55:28 wiz Exp $
+$NetBSD: distinfo,v 1.18 2017/05/16 12:08:01 wiz Exp $
 
-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-g13_sh-dmcrypt.c) = 0680c2a847e7fdf890697c9066a85ced7cdfb5f1
+SHA1 (gnupg-2.1.21.tar.bz2) = 1852c066bc21893bc52026ead78edf50fdf15e13
+RMD160 (gnupg-2.1.21.tar.bz2) = a414f5a86eea9243267e26525287a213208ddab2
+SHA512 (gnupg-2.1.21.tar.bz2) = ddced44c37a220af8371ba36357fc0f23b22b57daec1cba6d4a1a015d345eac7f6060c88b22a5cd457ee364d0ec1f02175644aed1970a97abfa84a3d285bc512
+Size (gnupg-2.1.21.tar.bz2) = 6472887 bytes
diff --git a/security/gnupg21/patches/patch-g13_sh-dmcrypt.c b/security/gnupg21/patches/patch-g13_sh-dmcrypt.c
deleted file mode 100644
index a2c726572e8..00000000000
--- a/security/gnupg21/patches/patch-g13_sh-dmcrypt.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-g13_sh-dmcrypt.c,v 1.2 2017/04/20 09:55:28 wiz Exp $
-
-Fix linking on Solaris.
-https://dev.gnupg.org/T3098
-
---- g13/sh-dmcrypt.c.orig	2016-05-04 11:43:16.000000000 +0200
-+++ g13/sh-dmcrypt.c	2016-07-26 11:24:35.449662123 +0200
-@@ -25,6 +25,9 @@
- #include <errno.h>
- #include <assert.h>
- #include <sys/types.h>
-+#ifdef __sun
-+#include <sys/mkdev.h>
-+#endif
- #ifdef HAVE_STAT
- # include <sys/stat.h>
- #endif