Update to 1.9.22.

4 files changed, 8 insertions, 33 deletions

diff --git a/security/gnupg-devel/Makefile b/security/gnupg-devel/Makefile
index 05a2d06b2bf..35151b688c8 100644
--- a/security/gnupg-devel/Makefile
+++ b/security/gnupg-devel/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2006/06/23 12:28:55 shannonjr Exp $
+# $NetBSD: Makefile,v 1.18 2006/08/29 10:23:10 shannonjr Exp $
 #
 
-DISTNAME=		gnupg-1.9.20
+DISTNAME=		gnupg-1.9.22
 PKGNAME=		${DISTNAME:S/gnupg/gnupg-devel/}
-PKGREVISION=		2
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/security/gnupg-devel/buildlink3.mk b/security/gnupg-devel/buildlink3.mk
index 2b6ac3cbde1..320637be6b0 100644
--- a/security/gnupg-devel/buildlink3.mk
+++ b/security/gnupg-devel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:11:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/08/29 10:23:10 shannonjr Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNUPG_DEVEL_BUILDLINK3_MK:=	${GNUPG_DEVEL_BUILDLINK3_MK}+
@@ -21,6 +21,7 @@ BUILDLINK_PREFIX.gnupg-devel?=	${LOCALBASE}
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../security/libassuan/buildlink3.mk"
 .include "../../security/libksba/buildlink3.mk"
+.include "../../security/pinentry/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/gnupg-devel/distinfo b/security/gnupg-devel/distinfo
index cbba4d9eba1..d4c78f09561 100644
--- a/security/gnupg-devel/distinfo
+++ b/security/gnupg-devel/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.12 2006/06/23 12:28:55 shannonjr Exp $
+$NetBSD: distinfo,v 1.13 2006/08/29 10:23:10 shannonjr Exp $
 
-SHA1 (gnupg-1.9.20.tar.bz2) = 557be26c21c114a3b345ce6b177fcb088883f827
-RMD160 (gnupg-1.9.20.tar.bz2) = 3501de32f1526f64510a77fe3cc0905dd7fc8854
-Size (gnupg-1.9.20.tar.bz2) = 1810059 bytes
+SHA1 (gnupg-1.9.22.tar.bz2) = 10b2a5c256598d9ed25c84d55ea111710b3f8906
+RMD160 (gnupg-1.9.22.tar.bz2) = 43b3e8a17d5e116f5fa0c34bc3beaf68250ec3c3
+Size (gnupg-1.9.22.tar.bz2) = 1908546 bytes
 SHA1 (pth-2.0.4.tar.gz) = c5ee066185a042a5cf1341a0ec10bcb94a1d4c53
 RMD160 (pth-2.0.4.tar.gz) = ba78260cb8860433cd240e24e2e90dc6997943d8
 Size (pth-2.0.4.tar.gz) = 641851 bytes
 SHA1 (patch-aa) = 4fdedc1f98dbe717fd5a1229944703f19c3c10e5
-SHA1 (patch-ba) = 9ae61eb17f5f447f05d663e97b6b4d288c7f648a
diff --git a/security/gnupg-devel/patches/patch-ba b/security/gnupg-devel/patches/patch-ba
deleted file mode 100644
index 8385bda3ab9..00000000000
--- a/security/gnupg-devel/patches/patch-ba
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2006/06/23 12:28:55 shannonjr Exp $
-
---- ./g10/parse-packet.c.orig	2005-07-27 08:18:03.000000000 -0600
-+++ ./g10/parse-packet.c
-@@ -1995,6 +1995,19 @@ parse_attribute( iobuf_t inp, int pkttyp
-     byte *p;
- 
- #define EXTRA_UID_NAME_SPACE 71
-+    /* Cap the size of a user ID at 2k: a value absurdly large enough
-+       that there is no sane user ID string (which is printable text
-+       as of RFC2440bis) that won't fit in it, but yet small enough to
-+       avoid allocation problems.  A large pktlen may not be
-+       allocatable, and a very large pktlen could actually cause our
-+       allocation to wrap around in xmalloc to a small number. */
-+      
-+    if(pktlen>2048)
-+    {
-+      log_error("packet(%d) too large\n", pkttype);
-+      iobuf_skip_rest(inp, pktlen, 0);
-+      return G10ERR_INVALID_PACKET;
-+    }
-     packet->pkt.user_id = xmalloc (sizeof *packet->pkt.user_id
-                                   + EXTRA_UID_NAME_SPACE);
-