pkg/52165: [UPDATE] gnupg21 2.1.20

[js-pkgsrc%heap.zone@localhost]

>Number:         52165
>Category:       pkg
>Synopsis:       [UPDATE] gnupg21 2.1.20
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sat Apr 15 20:25:00 +0000 2017
>Originator:     Jonathan Schleifer
>Release:        HEAD
>Organization:
>Environment:
>Description:

>How-To-Repeat:

>Fix:
diff --git a/security/gnupg21/Makefile b/security/gnupg21/Makefile
index 95549f17a10..0d4f27e9e8e 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 $
 
-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/
diff --git a/security/gnupg21/PLIST b/security/gnupg21/PLIST
index 5bd79e3f54e..efbaa7549ea 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$
 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..6a2248d9531 100644
--- a/security/gnupg21/distinfo
+++ b/security/gnupg21/distinfo
@@ -1,8 +1,9 @@
 $NetBSD: distinfo,v 1.14 2017/02/04 07:12:35 maya 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_Makefile.in) = 33b4d2a8421f147d4b3c48815afcb7bec2f9cf74
 SHA1 (patch-g13_sh-dmcrypt.c) = a2505039fff9e1e90ab81076776542fa83f55d5e
diff --git a/security/gnupg21/patches/patch-g13_Makefile.in b/security/gnupg21/patches/patch-g13_Makefile.in
new file mode 100644
index 00000000000..4ef0db40187
--- /dev/null
+++ b/security/gnupg21/patches/patch-g13_Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- g13/Makefile.in.orig	2017-04-15 19:56:58.000000000 +0000
++++ g13/Makefile.in
+@@ -506,7 +506,7 @@ g13_syshelp_LDADD = $(libcommon) \
+ 
+ module_tests = t-g13tuple
+ t_common_ldadd = $(libcommon) $(LIBGCRYPT_LIBS) \
+-	         $(LIBASSUAN_LIBS) $(LIBICONV)
++	         $(LIBASSUAN_LIBS) $(LIBINTL) $(LIBICONV)
+ 
+ t_g13tuple_SOURCES = t-g13tuple.c g13tuple.c
+ t_g13tuple_LDADD = $(t_common_ldadd)