Update to 1.0.1. Changes:

* The option --ocsp-signer may now take a filename to allow several
  certificates to be valid signers for the default responder.
* New option --ocsp-max-period and improved the OCSP time checks.
* New option --force-default-signer for dirmngr-client.

5 files changed, 40 insertions, 35 deletions

diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile
index 280c1d71895..fec28f537b4 100644
--- a/security/dirmngr/Makefile
+++ b/security/dirmngr/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.29 2007/07/04 20:54:57 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2007/11/07 12:43:21 shannonjr Exp $
 #
 
-DISTNAME=		dirmngr-1.0.0
+DISTNAME=		dirmngr-1.0.1
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.gnupg.org/gcrypt/dirmngr/
 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.3.tar.bz2
+SITES.libassuan-1.0.3.tar.bz2=	ftp://ftp.gnupg.org/gcrypt/libassuan/
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		shannonjr@NetBSD.org
@@ -22,6 +22,8 @@ PKG_USERS=		${DIRMNGR_USER}:${DIRMNGR_GROUP}
 PKG_GROUPS_VARS+=	DIRMNGR_GROUP
 PKG_USERS_VARS+=	DIRMNGR_USER
 
+BUILD_DEFS+=		VARBASE
+
 PKG_HOME.${DIRMNGR_USER}=	${VARBASE}/dirmngr
 
 GNU_CONFIGURE=		yes
@@ -37,22 +39,25 @@ INFO_FILES=		YES
 
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
 CONFIGURE_ARGS+=	--sharedstatedir=${VARBASE:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ENV+=		BUILDLINK_PREFIX_openldap-client=${BUILDLINK_PREFIX.openldap-client}
 CONFIGURE_ARGS+=	--with-pth-prefix=${WRKDIR}/pth
 CONFIGURE_ARGS+=	--with-libassuan-prefix=${WRKDIR}/libassuan
 
-SUBST_FILES+=		VARBASE=${VARBASE}
-SUBST_FILES+=		PREFIX=${PREFIX}
-SUBST_FILES+=		SYSCONFDIR=${SYSCONFDIR}
-SUBST_FILES+=		DIRMNGR_USER=${DIRMNGR_USER}
-SUBST_FILES+=		DIRMNGR_PATH=${DIRMNGR_PATH:Q}
+FILES_SUBST+=		VARBASE=${VARBASE:Q}
+FILES_SUBST+=		PREFIX=${PREFIX:Q}
+FILES_SUBST+=		SYSCONFDIR=${SYSCONFDIR:Q}
+FILES_SUBST+=		DIRMNGR_USER=${DIRMNGR_USER:Q}
+FILES_SUBST+=		DIRMNGR_GROUP=${DIRMNGR_GROUP:Q}
+FILES_SUBST+=		DIRMNGR_PATH=${DIRMNGR_PATH:Q}
 
 OWN_DIRS+=		${PKG_SYSCONFDIR}/dirmngr
 OWN_DIRS+=		${PKG_SYSCONFDIR}/dirmngr/trusted-certs
+OWN_DIRS+=		${VARBASE}/cache/dirmngr
 
 DIRMNGR_PERMS=		${DIRMNGR_USER} ${DIRMNGR_GROUP} 0755
-OWN_DIRS_PERMS+=	${VARBASE}/dirmngr ${DIRMNGR_PERMS}
-OWN_DIRS_PERMS+=	${VARBASE}/dirmngr/cache ${DIRMNGR_PERMS}
+#OWN_DIRS_PERMS+=	${VARBASE}/dirmngr ${DIRMNGR_PERMS}
+OWN_DIRS_PERMS+=	${VARBASE}/cache/dirmngr ${DIRMNGR_PERMS}
 OWN_DIRS_PERMS+=	${PREFIX}/libdata/dirmngr ${DIRMNGR_PERMS}
 OWN_DIRS_PERMS+=	${PREFIX}/libdata/dirmngr/extra-certs ${DIRMNGR_PERMS}
 
@@ -60,7 +65,7 @@ OWN_DIRS_PERMS+=	${PREFIX}/libdata/dirmngr/extra-certs ${DIRMNGR_PERMS}
 # We are also building libassuan here to get libassuan-pth.
 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.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/dirmngr/distinfo b/security/dirmngr/distinfo
index 1f7020e8681..523e753d425 100644
--- a/security/dirmngr/distinfo
+++ b/security/dirmngr/distinfo
@@ -1,18 +1,18 @@
-$NetBSD: distinfo,v 1.12 2007/05/12 11:19:18 shannonjr Exp $
+$NetBSD: distinfo,v 1.13 2007/11/07 12:43:22 shannonjr Exp $
 
-SHA1 (dirmngr-1.0.0.tar.bz2) = 7ab362ec505ed154b00408bb4fd902bf4773fcea
-RMD160 (dirmngr-1.0.0.tar.bz2) = c91b2ddca2e8efa36a78c4dbb395e6ab10794971
-Size (dirmngr-1.0.0.tar.bz2) = 425303 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 (dirmngr-1.0.1.tar.bz2) = 39eb62907e5c4ddc29da00b1291c24e5267f113e
+RMD160 (dirmngr-1.0.1.tar.bz2) = eca2e5622ffe7af7ddece1b76977e5f696465385
+Size (dirmngr-1.0.1.tar.bz2) = 490079 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-aa) = 5f3cb038a5d799a91394406aecf855e77c931412
-SHA1 (patch-ab) = 0f5d068c1587f0e58a46555633a119b327bea225
+SHA1 (patch-ab) = 97fbb195fa8ab33c4fddfee9b23ae2024f99c615
 SHA1 (patch-ac) = c148a6f0c3066decdbd91abb8725d6f2bd3b0d38
 SHA1 (patch-ad) = 94c789bd308208c147a24f05b371602ec74185f4
-SHA1 (patch-ae) = d3584d0c4de0335f32e10a5517978fa77ca862b9
+SHA1 (patch-ae) = 3d77aff4b2ee779106dee329f3a6cd5b8f332e26
 SHA1 (patch-af) = b6ae3b526e344ca63af1babb9eb6707b90edc837
 SHA1 (patch-ag) = a08f7c82ed32e72f52a69baa64e97a86cbe8fa70
diff --git a/security/dirmngr/files/dirmngr.sh b/security/dirmngr/files/dirmngr.sh
index 3856c147bca..94ed7f75d1a 100644
--- a/security/dirmngr/files/dirmngr.sh
+++ b/security/dirmngr/files/dirmngr.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: dirmngr.sh,v 1.1 2005/05/02 22:33:37 shannonjr Exp $
+# $NetBSD: dirmngr.sh,v 1.2 2007/11/07 12:43:22 shannonjr Exp $
 #
 # PROVIDE: dirmngr
 # REQUIRE: DAEMON
@@ -12,8 +12,8 @@ fi
 
 name="dirmngr"
 rcvar="${name}"
-dirmngr_user="dirmngr"
-dirmngr_group="dirmngr"
+dirmngr_user="@DIRMNGR_USER@"
+dirmngr_group="@DIRMNGR_GROUP@"
 dirmngr_flags="--daemon"
 dirmngr_command="@PREFIX@/sbin/runDirmngr"
 start_precmd="dirmngr_precmd"
@@ -26,10 +26,10 @@ required_files="@PKG_SYSCONFDIR@/dirmngr/ldapservers.conf"
 dirmngr_precmd()
 {
 	mkdir -p @VARBASE@/run/dirmngr
-	chgrp dirmngr @VARBASE@/run/dirmngr
+	chgrp @DIRMNGR_GROUP@ @VARBASE@/run/dirmngr
 	chmod 775 @VARBASE@/run/dirmngr
 	mkdir -p /tmp/dirmngr
-	chgrp dirmngr /tmp/dirmngr
+	chgrp @DIRMNGR_GROUP@ /tmp/dirmngr
 	chmod 755 /tmp/dirmngr
 }
 
diff --git a/security/dirmngr/patches/patch-ab b/security/dirmngr/patches/patch-ab
index 3bda5e89060..eac602debf9 100644
--- a/security/dirmngr/patches/patch-ab
+++ b/security/dirmngr/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.4 2007/05/12 11:19:18 shannonjr Exp $
+$NetBSD: patch-ab,v 1.5 2007/11/07 12:43:22 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.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
diff --git a/security/dirmngr/patches/patch-ae b/security/dirmngr/patches/patch-ae
index f5e60521322..5fe1adba0e0 100644
--- a/security/dirmngr/patches/patch-ae
+++ b/security/dirmngr/patches/patch-ae
@@ -1,12 +1,12 @@
-$NetBSD: patch-ae,v 1.1 2006/12/12 13:09:21 shannonjr Exp $
+$NetBSD: patch-ae,v 1.2 2007/11/07 12:43:22 shannonjr Exp $
 
---- ./src/dirmngr_ldap.c.orig	2006-11-29 06:04:41.000000000 -0700
+--- ./src/dirmngr_ldap.c.orig	2007-08-16 07:19:40.000000000 -0600
 +++ ./src/dirmngr_ldap.c
-@@ -31,6 +31,7 @@
+@@ -30,6 +30,7 @@
+ #include <assert.h>
  #include <sys/time.h>
  #include <unistd.h>
- #include <ldap.h>
 +#include <locale.h>
  
- 
- 
+ #ifdef HAVE_W32_SYSTEM
+ #include <winsock2.h>