Update to 2.0.7. This is maintenance release with a few minor enhancements.

Changes:
 * Fixed encryption problem if duplicate certificates are in the
   keybox.
 * Add new options min-passphrase-nonalpha, check-passphrase-pattern,
   enforce-passphrase-constraints and max-passphrase-days to
   gpg-agent.
 * Add command --check-components to gpgconf.  Gpgconf now uses the
   installed versions of the programs and does not anymore search via
   PATH for them.

4 files changed, 21 insertions, 20 deletions

diff --git a/security/gnupg2/Makefile b/security/gnupg2/Makefile
index 140b1ed0987..2b47bafda1c 100644
--- a/security/gnupg2/Makefile
+++ b/security/gnupg2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2007/09/23 12:05:44 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2007/11/07 15:24:26 shannonjr Exp $
 #
 
-DISTNAME=		gnupg-2.0.6
+DISTNAME=		gnupg-2.0.7
 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.2.tar.bz2
-SITES.libassuan-1.0.2.tar.bz2=	ftp://ftp.gnupg.org/gcrypt/libassuan/
+DISTFILES+=		libassuan-1.0.3.tar.bz2
+SITES.libassuan-1.0.3.tar.bz2=	ftp://ftp.gnupg.org/gcrypt/libassuan/
 
 MAINTAINER=		shannonjr@NetBSD.org
 HOMEPAGE=		http://www.gnupg.org/
@@ -36,6 +36,7 @@ CONFIGURE_ARGS+=	--with-static-rnd=auto
 CONFIGURE_ARGS+=	--without-included-gettext
 CONFIGURE_ARGS+=	--with-pth-prefix=${WRKDIR}/pth
 CONFIGURE_ARGS+=	--with-libassuan-prefix=${WRKDIR}/libassuan
+CONFIGURE_ARGS+=	--with-pinentry-pgm=${BUILDLINK_PREFIX.pinentry}/bin/pinentry
 CONFIGURE_ARGS+=	--enable-maintainer-mode
 CONFIGURE_ENV+=		gnupg_cv_pth_is_sane=yes
 
@@ -51,7 +52,7 @@ 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.2 && \
+	cd  ${WRKDIR}/libassuan-1.0.3 && \
 	${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
diff --git a/security/gnupg2/distinfo b/security/gnupg2/distinfo
index beab6771bad..378c05a2d33 100644
--- a/security/gnupg2/distinfo
+++ b/security/gnupg2/distinfo
@@ -1,18 +1,15 @@
-$NetBSD: distinfo,v 1.9 2007/08/29 23:19:07 wiz Exp $
+$NetBSD: distinfo,v 1.10 2007/11/07 15:24:26 shannonjr Exp $
 
-SHA1 (gnupg-2.0.4-idea.patch) = 0f56a3d656d8ec3227c1b597bee010b8dbe1d7cd
-RMD160 (gnupg-2.0.4-idea.patch) = df2f628ee03880ff5b0916185cffe0b28316d08b
-Size (gnupg-2.0.4-idea.patch) = 906 bytes
-SHA1 (gnupg-2.0.6.tar.bz2) = 4aa9a3ecc954126cfc0a30bef94ec6e1fbbc7009
-RMD160 (gnupg-2.0.6.tar.bz2) = 6b6bb3455a996d558d1a664f3267cd151388f230
-Size (gnupg-2.0.6.tar.bz2) = 3566190 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 (gnupg-2.0.7.tar.bz2) = f7d9ae7695bd9b849475b482bb7b027ec6fadbae
+RMD160 (gnupg-2.0.7.tar.bz2) = 70bd8dbf52fe2ccc9d89791c374a5507f6a61ee8
+Size (gnupg-2.0.7.tar.bz2) = 3609953 bytes
+SHA1 (libassuan-1.0.3.tar.bz2) = 1a16c9d1086e2cda819a3f7d4e5ebd41eb350e5f
+RMD160 (libassuan-1.0.3.tar.bz2) = fd4fa8bff29d8a7ee9901aa2ad665df989c5c82e
+Size (libassuan-1.0.3.tar.bz2) = 292168 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-af) = 28808080d2bbec146ef13586db591c27029e0088
+SHA1 (patch-af) = 97fbb195fa8ab33c4fddfee9b23ae2024f99c615
 SHA1 (patch-ah) = e31a1e863be10884e03bfcdceffcdad79d19e9ab
 SHA1 (patch-ai) = 555b8768c30f470e98e5be62a4a4bea29eefdf78
 SHA1 (patch-aj) = 20be6b455167962ffa556979d8d0f167dd14131e
diff --git a/security/gnupg2/options.mk b/security/gnupg2/options.mk
index d597e6d0b1c..c211987dd1f 100644
--- a/security/gnupg2/options.mk
+++ b/security/gnupg2/options.mk
@@ -1,8 +1,9 @@
-# $NetBSD: options.mk,v 1.1 2007/08/29 23:19:07 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2007/11/07 15:24:27 shannonjr Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gnupg2
 PKG_SUPPORTED_OPTIONS=	gpgsm idea
 
+.include "../../mk/bsd.prefs.mk"
 .include "../../mk/bsd.options.mk"
 
 ## If no options are specified, only gpg-agent is built. This
@@ -17,6 +18,8 @@ PLIST_SRC=      ${.CURDIR}/PLIST
 .if empty(PKG_OPTIONS:Mgpgsm)
 CONFIGURE_ARGS+=        --enable-agent-only
 .else
+CONFIGURE_ARGS+=	--enable-gpgsm
+CONFIGURE_ARGS+=	--with-dirmngr-pgm=${BUILDLINK_PREFIX.dirmngr}/bin/dirmngr
 PLIST_SRC+=     ${.CURDIR}/PLIST.gpgsm
 .  include "../../security/dirmngr/buildlink3.mk"
 .endif
diff --git a/security/gnupg2/patches/patch-af b/security/gnupg2/patches/patch-af
index c52b7126008..1616325981d 100644
--- a/security/gnupg2/patches/patch-af
+++ b/security/gnupg2/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.3 2007/08/04 12:00:03 shannonjr Exp $
+$NetBSD: patch-af,v 1.4 2007/11/07 15:24:27 shannonjr Exp $
 
---- ../libassuan-1.0.2/src/Makefile.am.orig	2006-11-21 11:17:18.000000000 -0700
-+++ ../libassuan-1.0.2/src/Makefile.am
+--- ../libassuan-1.0.3/src/Makefile.am.orig	2006-11-21 11:17:18.000000000 -0700
++++ ../libassuan-1.0.3/src/Makefile.am
 @@ -26,6 +26,7 @@ MOSTLYCLEANFILES = assuan-errors.c
  
  if HAVE_PTH