Update to 1.9.20. This is a bugfix release.

5 files changed, 17 insertions, 30 deletions

diff --git a/security/gnupg-devel/Makefile b/security/gnupg-devel/Makefile
index 9eb06eb4835..661c909c695 100644
--- a/security/gnupg-devel/Makefile
+++ b/security/gnupg-devel/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2005/06/23 09:24:39 shannonjr Exp $
+# $NetBSD: Makefile,v 1.13 2006/01/06 11:05:18 shannonjr Exp $
 #
 
-DISTNAME=		gnupg-1.9.17
+DISTNAME=		gnupg-1.9.20
 PKGNAME=		${DISTNAME:S/gnupg/gnupg-devel/}
 #PKGREVISION=		1
 CATEGORIES=		security
@@ -55,6 +55,7 @@ pre-configure:
 
 BUILDLINK_DEPENDS.libgpg-error+=	libgpg-error>=1.0.0
 
+.include "../../databases/openldap/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/security/gnupg-devel/PLIST b/security/gnupg-devel/PLIST
index aa84bc5ee29..0fcd96e1e07 100644
--- a/security/gnupg-devel/PLIST
+++ b/security/gnupg-devel/PLIST
@@ -1,8 +1,15 @@
-@comment $NetBSD: PLIST,v 1.2 2004/11/05 22:20:17 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/01/06 11:05:18 shannonjr Exp $
 bin/gpg-agent
+bin/gpg-connect-agent
 bin/gpgconf
+bin/gpgkey2ssh
+bin/gpgparsemail
+bin/gpgsm-gencert.sh
 bin/watchgnupg
 info/gnupg.info
+libexec/gpg-preset-passphrase
 libexec/gpg-protect-tool
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gnupg2.mo
 sbin/addgnupghome
+share/gnupg/qualified.txt
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gnupg2.mo
+@dirrm share/gnupg
diff --git a/security/gnupg-devel/PLIST.gpgsm b/security/gnupg-devel/PLIST.gpgsm
index 9e14f3f04c4..75fbbe8c737 100644
--- a/security/gnupg-devel/PLIST.gpgsm
+++ b/security/gnupg-devel/PLIST.gpgsm
@@ -1,12 +1,6 @@
-@comment $NetBSD: PLIST.gpgsm,v 1.2 2004/11/05 22:20:17 jmmv Exp $
-bin/gpg2
+@comment $NetBSD: PLIST.gpgsm,v 1.3 2006/01/06 11:05:18 shannonjr Exp $
 bin/gpgsm
-bin/gpgv2
 bin/kbxutil
-bin/sc-copykeys
-bin/sc-investigate
 bin/scdaemon
 lib/gnupg/pcsc-wrapper
-share/gnupg/gpg-conf.skel
-@dirrm share/gnupg
 @dirrm lib/gnupg
diff --git a/security/gnupg-devel/distinfo b/security/gnupg-devel/distinfo
index eb26eb5b7b7..2d43892e96f 100644
--- a/security/gnupg-devel/distinfo
+++ b/security/gnupg-devel/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.10 2005/08/25 11:10:00 shannonjr Exp $
+$NetBSD: distinfo,v 1.11 2006/01/06 11:05:18 shannonjr Exp $
 
-SHA1 (gnupg-1.9.17.tar.bz2) = f089490450b99263332c71f6e296a3a83b28433c
-RMD160 (gnupg-1.9.17.tar.bz2) = 5911c9a60ca4361f320d787e009abe7b4ba86f60
-Size (gnupg-1.9.17.tar.bz2) = 1750557 bytes
+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 (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-ab) = 9cdcc084bc210bbe2aaa207051094c604a80b0cc
diff --git a/security/gnupg-devel/patches/patch-ab b/security/gnupg-devel/patches/patch-ab
deleted file mode 100644
index b9a98b56a12..00000000000
--- a/security/gnupg-devel/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2005/06/23 10:57:00 shannonjr Exp $
-
---- ./scd/scdaemon.c.orig	2005-06-06 11:31:23.000000000 -0600
-+++ ./scd/scdaemon.c
-@@ -456,7 +456,9 @@ main (int argc, char **argv )
-           allow_coredump = 1;
-           break;
-         case oDebugCCIDDriver: 
-+#ifdef TEST
-           ccid_set_debug_level (ccid_set_debug_level (-1)+1);
-+#endif
-           break;
-         case oDebugDisableTicker: ticker_disabled = 1; break;
-