Update to 2.0.1.

This is maintenance release to fix build problems found after the
release of 2.0.0 and to fix a buffer overflow in gpg2

4 files changed, 25 insertions, 11 deletions

diff --git a/security/gnupg2/Makefile b/security/gnupg2/Makefile
index f069eb9d71e..fa1e1c919c9 100644
--- a/security/gnupg2/Makefile
+++ b/security/gnupg2/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2006/12/09 13:39:28 shannonjr Exp $
+# $NetBSD: Makefile,v 1.8 2006/12/12 13:11:35 shannonjr Exp $
 #
 
-DISTNAME=		gnupg-2.0.0
+DISTNAME=		gnupg-2.0.1
 PKGNAME=		${DISTNAME:S/gnupg/gnupg2/}
-PKGREVISION=		4
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.gnupg.org/gcrypt/gnupg/
 EXTRACT_SUFX=		.tar.bz2
@@ -69,7 +68,6 @@ pre-configure:
 	${SETENV} ${PKGSRC_MAKE_ENV} ${MAKE} install
 	cd  ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./autogen.sh
 
-BUILDLINK_API_DEPENDS.gettext+=		gettext-lib>=0.14.1
 BUILDLINK_API_DEPENDS.libgpg-error+=	libgpg-error>=1.4
 BUILDLINK_API_DEPENDS.libksba+=		libksba>=1.0.0
 
diff --git a/security/gnupg2/PLIST.gpgsm b/security/gnupg2/PLIST.gpgsm
index 3f334f9a45a..594420af451 100644
--- a/security/gnupg2/PLIST.gpgsm
+++ b/security/gnupg2/PLIST.gpgsm
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.gpgsm,v 1.2 2006/11/20 22:23:24 shannonjr Exp $
+@comment $NetBSD: PLIST.gpgsm,v 1.3 2006/12/12 13:11:35 shannonjr Exp $
 bin/gpg-connect-agent
 bin/gpg2
 bin/gpgconf
@@ -12,7 +12,6 @@ bin/scdaemon
 bin/watchgnupg
 info/gnupg.info
 info/gnupg.info-1
-lib/gnupg/pcsc-wrapper
 libexec/gpg2keys_curl
 libexec/gpg2keys_finger
 libexec/gpg2keys_hkp
diff --git a/security/gnupg2/distinfo b/security/gnupg2/distinfo
index 83395b23511..dddb2a9ae66 100644
--- a/security/gnupg2/distinfo
+++ b/security/gnupg2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2006/12/09 13:39:28 shannonjr Exp $
+$NetBSD: distinfo,v 1.4 2006/12/12 13:11:35 shannonjr Exp $
 
-SHA1 (gnupg-2.0.0.tar.bz2) = c335957368ea88bcb658922e7d3aae7e3ac6896d
-RMD160 (gnupg-2.0.0.tar.bz2) = 739e303f1380ec9cb5c3a248179001700efe6f2e
-Size (gnupg-2.0.0.tar.bz2) = 3904270 bytes
+SHA1 (gnupg-2.0.1.tar.bz2) = ec84ffb1d2ac013dc0afb5bdf8b9df2c838673e9
+RMD160 (gnupg-2.0.1.tar.bz2) = 3b9252b9b8b1ff5c242a3e541adc0a9700e55df1
+Size (gnupg-2.0.1.tar.bz2) = 3923924 bytes
 SHA1 (libassuan-1.0.0.tar.bz2) = 5256d74a80619779a9802305a9f1ad7fd04277a1
 RMD160 (libassuan-1.0.0.tar.bz2) = 63b0cc77eb731ccd635e51543001a675c15a835f
 Size (libassuan-1.0.0.tar.bz2) = 260201 bytes
@@ -13,5 +13,5 @@ SHA1 (patch-aa) = 916346ad387ae4efd638b2c19bbedfe6f309eb2e
 SHA1 (patch-ab) = 501bce9a8474ac37a8e01eceae9b52f0e87868d5
 SHA1 (patch-ac) = ca9e1044a0eb8d3e25cd9c20174047a96038c236
 SHA1 (patch-af) = 04fdcbf19c4d530fc735c04dd785c07692d8b96d
-SHA1 (patch-ag) = 4fa09f0357ac2b5f2602ae0fbee91f4ff26eab20
 SHA1 (patch-ah) = 0b97e13ed0a8d4f1707b839520b1f8702cadacab
+SHA1 (patch-ai) = e3662ca1bde0c1946fdb6cbd7fc2033cc54bdd8d
diff --git a/security/gnupg2/patches/patch-ai b/security/gnupg2/patches/patch-ai
new file mode 100644
index 00000000000..c99b42490c0
--- /dev/null
+++ b/security/gnupg2/patches/patch-ai
@@ -0,0 +1,17 @@
+$NetBSD: patch-ai,v 1.1 2006/12/12 13:11:35 shannonjr Exp $
+
+--- autogen.sh.orig	2006-10-17 06:15:03.000000000 -0600
++++ autogen.sh
+@@ -129,9 +129,9 @@ fi
+ if check_version $AUTOMAKE $automake_vers_num $automake_vers; then
+   check_version $ACLOCAL $automake_vers_num $autoconf_vers automake
+ fi
+-if check_version $GETTEXT $gettext_vers_num $gettext_vers; then
+-  check_version $MSGMERGE $gettext_vers_num $gettext_vers gettext
+-fi
++#if check_version $GETTEXT $gettext_vers_num $gettext_vers; then
++#  check_version $MSGMERGE $gettext_vers_num $gettext_vers gettext
++#fi
+ 
+ if test "$DIE" = "yes"; then
+     cat <<EOF