Update to Version 2.0.5. Changes:

 * Switched license to GPLv3.
 * Fixed bug when using the --p12-charset without --armor.
 * The command --gen-key may now be used instead of the
   gpgsm-gencert.sh script.
 * Changed key generation to reveal less information about the
   machine.  Bug fixes for gpg2's card key generation.

7 files changed, 22 insertions, 116 deletions

diff --git a/security/gnupg2/Makefile b/security/gnupg2/Makefile
index 2718bc372ba..5405ab72079 100644
--- a/security/gnupg2/Makefile
+++ b/security/gnupg2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2007/06/01 00:12:35 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2007/08/04 12:00:02 shannonjr Exp $
 #
 
-DISTNAME=		gnupg-2.0.4
+DISTNAME=		gnupg-2.0.5
 PKGNAME=		${DISTNAME:S/gnupg/gnupg2/}
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.gnupg.org/gcrypt/gnupg/
@@ -9,8 +9,8 @@ EXTRACT_SUFX=		.tar.bz2
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
 DISTFILES+=		pth-2.0.7.tar.gz
 SITES.pth-2.0.7.tar.gz=	${MASTER_SITE_GNU:=pth/}
-DISTFILES+=		libassuan-1.0.1.tar.bz2
-SITES.libassuan-1.0.1.tar.bz2=	ftp://ftp.gnupg.org/gcrypt/libassuan/
+DISTFILES+=		libassuan-1.0.2.tar.bz2
+SITES.libassuan-1.0.2.tar.bz2=	ftp://ftp.gnupg.org/gcrypt/libassuan/
 
 MAINTAINER=		shannonjr@NetBSD.org
 HOMEPAGE=		ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/
@@ -26,6 +26,7 @@ USE_TOOLS+=		automake
 USE_TOOLS+=		gettext
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
+#LICENSE=		GPLv3
 
 CONFIGURE_ARGS+=	--with-static-rnd=auto
 CONFIGURE_ARGS+=	--without-included-gettext
@@ -62,14 +63,14 @@ pre-configure:
 	cd  ${WRKDIR}/pth-2.0.7 && \
 	./configure --prefix=${WRKDIR}/pth --enable-pthread --enable-static --disable-shared && \
 	${MAKE} install
-	cd  ${WRKDIR}/libassuan-1.0.1 && \
+	cd  ${WRKDIR}/libassuan-1.0.2 && \
 	${SETENV} ${CONFIGURE_ENV} ./autogen.sh && \
 	${SETENV} ${CONFIGURE_ENV} ./configure --enable-maintainer-mode --prefix=${WRKDIR}/libassuan --with-pth-prefix=${WRKDIR}/pth && \
 	${SETENV} ${PKGSRC_MAKE_ENV} ${MAKE} install
 	cd  ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./autogen.sh
 
 BUILDLINK_API_DEPENDS.libgpg-error+=	libgpg-error>=1.4
-BUILDLINK_API_DEPENDS.libksba+=		libksba>=1.0.0
+BUILDLINK_API_DEPENDS.libksba+=		libksba>=1.0.2
 
 .include "../../databases/openldap-client/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/security/gnupg2/distinfo b/security/gnupg2/distinfo
index 2a3927412cf..6b3c960223b 100644
--- a/security/gnupg2/distinfo
+++ b/security/gnupg2/distinfo
@@ -1,18 +1,15 @@
-$NetBSD: distinfo,v 1.7 2007/05/12 11:08:31 shannonjr Exp $
+$NetBSD: distinfo,v 1.8 2007/08/04 12:00:02 shannonjr Exp $
 
-SHA1 (gnupg-2.0.4.tar.bz2) = cc230636bb4226f6d7ac2db9b259d8e7f5529f84
-RMD160 (gnupg-2.0.4.tar.bz2) = 7d31526012e32c2fe39fea62c01b5c17d16118ad
-Size (gnupg-2.0.4.tar.bz2) = 3575021 bytes
-SHA1 (libassuan-1.0.1.tar.bz2) = 4e12bd924e01c31c7d4c021b465c94ec55b1cb17
-RMD160 (libassuan-1.0.1.tar.bz2) = 0ff13f97d20c9fc8c08d92e5cf14bb26d9afa69b
-Size (libassuan-1.0.1.tar.bz2) = 268874 bytes
+SHA1 (gnupg-2.0.5.tar.bz2) = 9435e7fabe525ce943a5818008d412ecad244018
+RMD160 (gnupg-2.0.5.tar.bz2) = f026dacee15b1b4dc5f7c2ecd287d65f49f1064e
+Size (gnupg-2.0.5.tar.bz2) = 3513529 bytes
+SHA1 (libassuan-1.0.2.tar.bz2) = 6f9bbee22719cd75fae6a5a5c38d557b971fe8fe
+RMD160 (libassuan-1.0.2.tar.bz2) = a445757e6a3bbaf9c5d010cba22368923dcc522b
+Size (libassuan-1.0.2.tar.bz2) = 275499 bytes
 SHA1 (pth-2.0.7.tar.gz) = 9a71915c89ff2414de69fe104ae1016d513afeee
 RMD160 (pth-2.0.7.tar.gz) = 80bc66777ba20d9648b7aaf3f58d593be6416910
 Size (pth-2.0.7.tar.gz) = 652640 bytes
-SHA1 (patch-aa) = 916346ad387ae4efd638b2c19bbedfe6f309eb2e
-SHA1 (patch-ab) = 501bce9a8474ac37a8e01eceae9b52f0e87868d5
-SHA1 (patch-ac) = 8baffc127ae84ef0a3e8a68bb84c69489be3ac1f
-SHA1 (patch-af) = 0f5d068c1587f0e58a46555633a119b327bea225
+SHA1 (patch-af) = 28808080d2bbec146ef13586db591c27029e0088
 SHA1 (patch-ah) = e31a1e863be10884e03bfcdceffcdad79d19e9ab
-SHA1 (patch-ai) = 4721bf8dd6c0e1e8fedb763c38776aeeba4e763c
+SHA1 (patch-ai) = 555b8768c30f470e98e5be62a4a4bea29eefdf78
 SHA1 (patch-aj) = 20be6b455167962ffa556979d8d0f167dd14131e
diff --git a/security/gnupg2/patches/patch-aa b/security/gnupg2/patches/patch-aa
deleted file mode 100644
index 9c3426a16c9..00000000000
--- a/security/gnupg2/patches/patch-aa
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/11/17 12:13:11 shannonjr Exp $
-
---- common/memrchr.c.orig	2006-10-19 04:13:12.000000000 -0600
-+++ common/memrchr.c
-@@ -0,0 +1,49 @@
-+/* memrchr.c - libc replacement function
-+ * Copyright (C) 2005 Free Software Foundation, Inc.
-+ *
-+ * This file is part of GnuPG.
-+ *
-+ * GnuPG is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * GnuPG is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-+ * USA.
-+ */
-+
-+/*
-+  memrchr() is a GNU function that might not be available everywhere.
-+  It's basically the inverse of memchr() - search backwards in a
-+  memory block for a particular character.
-+*/
-+
-+#include <config.h>
-+#include <string.h>
-+
-+/* There are many ways to optimize this, but this is a simple
-+   unoptimized implementation. */
-+void *
-+memrchr(const void *s, int c, size_t n)
-+{
-+  const unsigned char *start=s,*end=s;
-+
-+  end+=n-1;
-+
-+  while(end>=start)
-+    {
-+      if(*end==c)
-+	return (void *)end;
-+      else
-+	end--;
-+    }
-+
-+  return NULL;
-+}
diff --git a/security/gnupg2/patches/patch-ab b/security/gnupg2/patches/patch-ab
deleted file mode 100644
index 8c6cb0d43d6..00000000000
--- a/security/gnupg2/patches/patch-ab
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/11/17 12:13:11 shannonjr Exp $
-
---- common/memrchr.h.orig	2006-10-19 04:13:17.000000000 -0600
-+++ common/memrchr.h
-@@ -0,0 +1,3 @@
-+#include <string.h>
-+void *
-+memrchr(const void *s, int c, size_t n);
diff --git a/security/gnupg2/patches/patch-ac b/security/gnupg2/patches/patch-ac
deleted file mode 100644
index 9792898ce19..00000000000
--- a/security/gnupg2/patches/patch-ac
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2007/05/12 11:08:31 shannonjr Exp $
-
---- common/Makefile.am.orig	2007-01-31 05:11:51.000000000 -0700
-+++ common/Makefile.am
-@@ -26,7 +26,7 @@ TESTS = $(module_tests)
- 
- AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl
- 
--AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS)
-+AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) $(LIBASSUAN_CFLAGS)
- 
- common_sources = \
- 	common-defs.h \
-@@ -46,6 +46,7 @@ common_sources = \
- 	xasprintf.c \
- 	xreadline.c \
- 	membuf.c membuf.h \
-+	memrchr.c memrchr.h \
- 	iobuf.c iobuf.h \
- 	ttyio.c ttyio.h \
- 	asshelp.c asshelp.h \
diff --git a/security/gnupg2/patches/patch-af b/security/gnupg2/patches/patch-af
index 10fe34bcbe4..c52b7126008 100644
--- a/security/gnupg2/patches/patch-af
+++ b/security/gnupg2/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.2 2007/05/12 11:08:31 shannonjr Exp $
+$NetBSD: patch-af,v 1.3 2007/08/04 12:00:03 shannonjr Exp $
 
---- ../libassuan-1.0.1/src/Makefile.am.orig	2006-11-21 11:17:18.000000000 -0700
-+++ ../libassuan-1.0.1/src/Makefile.am
+--- ../libassuan-1.0.2/src/Makefile.am.orig	2006-11-21 11:17:18.000000000 -0700
++++ ../libassuan-1.0.2/src/Makefile.am
 @@ -26,6 +26,7 @@ MOSTLYCLEANFILES = assuan-errors.c
  
  if HAVE_PTH
diff --git a/security/gnupg2/patches/patch-ai b/security/gnupg2/patches/patch-ai
index 132f24c381b..718d05171be 100644
--- a/security/gnupg2/patches/patch-ai
+++ b/security/gnupg2/patches/patch-ai
@@ -1,17 +1,8 @@
-$NetBSD: patch-ai,v 1.2 2007/05/12 11:08:31 shannonjr Exp $
+$NetBSD: patch-ai,v 1.3 2007/08/04 12:00:03 shannonjr Exp $
 
---- autogen.sh.orig	2007-05-07 12:11:13.000000000 -0600
+--- autogen.sh.orig	2007-06-22 10:18:30.000000000 -0600
 +++ autogen.sh
-@@ -40,7 +40,7 @@ MSGMERGE=${GETTEXT_PREFIX}${MSGMERGE:-ms
- 
- DIE=no
- FORCE=
--if test "$1" == "--force"; then
-+if test "$1" = "--force"; then
-   FORCE=" --force"
-   shift
- fi
-@@ -182,9 +182,9 @@ fi
+@@ -183,9 +183,9 @@ fi
  if check_version $AUTOMAKE $automake_vers_num $automake_vers; then
    check_version $ACLOCAL $automake_vers_num $autoconf_vers automake
  fi