Update to 1.9.22

3 files changed, 5 insertions, 35 deletions

diff --git a/security/gnupg-devel/Makefile b/security/gnupg-devel/Makefile
index e3d7a51d7bb8..26333ce88f5b 100644
--- a/security/gnupg-devel/Makefile
+++ b/security/gnupg-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnupg
-PORTVERSION=	1.9.20
-PORTREVISION=	1
+PORTVERSION=	1.9.22
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	alpha/gnupg
@@ -18,7 +17,7 @@ COMMENT=	Prerelease package of GnuPG extensions for GnuPG 2.0
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libassuan.a:${PORTSDIR}/security/libassuan
 LIB_DEPENDS=	gcrypt.13:${PORTSDIR}/security/libgcrypt \
-		ksba.15:${PORTSDIR}/security/libksba \
+		ksba.17:${PORTSDIR}/security/libksba \
 		pth.20:${PORTSDIR}/devel/pth \
 		usb-0.1:${PORTSDIR}/devel/libusb
 RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg \
diff --git a/security/gnupg-devel/distinfo b/security/gnupg-devel/distinfo
index 294eba598584..63177230c1b1 100644
--- a/security/gnupg-devel/distinfo
+++ b/security/gnupg-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnupg-1.9.20.tar.bz2) = 93899203fc0530f03e146d49b65c1e28
-SHA256 (gnupg-1.9.20.tar.bz2) = 6272727e5a0e019743e8520a2ff6b42eb4cc89251cb5bbca73dda09cb765487e
-SIZE (gnupg-1.9.20.tar.bz2) = 1810059
+MD5 (gnupg-1.9.22.tar.bz2) = ccea28fbab26bcb01890f2687d71f900
+SHA256 (gnupg-1.9.22.tar.bz2) = 2e4472e00c14c881ee1f93deddbe91d3c520311839f30d336ca48a51939e45cf
+SIZE (gnupg-1.9.22.tar.bz2) = 1908546
diff --git a/security/gnupg-devel/files/patch-tools_gpgparsemail.c b/security/gnupg-devel/files/patch-tools_gpgparsemail.c
deleted file mode 100644
index 327c7bef8354..000000000000
--- a/security/gnupg-devel/files/patch-tools_gpgparsemail.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- tools/gpgparsemail.c.orig	Mon Jun 19 18:18:11 2006
-+++ tools/gpgparsemail.c	Mon Jun 19 18:18:55 2006
-@@ -24,6 +24,9 @@
-    for the content of the line.  Several options are available to
-    scrutinize the message.  S/MIME and OpenPGP support is included. */
- 
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
- 
- #include <stdio.h>
- #include <stdlib.h>
-@@ -145,6 +148,7 @@
-   return p;
- }
- 
-+#ifndef HAVE_STPCPY
- static char *
- stpcpy (char *a,const char *b)
- {
-@@ -154,7 +158,7 @@
-   
-   return (char*)a;
- }
--
-+#endif
- 
- static int
- run_gnupg (int smime, int sig_fd, int data_fd, int *close_list)