update to 1.0.3

changes:
* New option --url for the LOOKUP command and dirmngr-client.
* The LOOKUP command does now also consults the local cache.  New
  option --cache-only for it and --local for dirmngr-client.
* Port to Windows completed.
* Improved certificate chain construction.
* Support loading of PEM encoded CRLs via HTTP.
* Client based trust anchors are now supported.
* Configured certificates with the suffix ".der" are now also used.
* Libgcrypt 1.4 is now required.

reviewed by John R. Shannon

pkgsrc notes:
I've left the build against a private libassuan with GNU-pth support
alone for now, just updated libassuan to 1.0.5. We might build
pkgsrc/libassuan against pkgsrc/pth at some point, but this needs
to be checked for side effects. (As this pkg doesn't export a library
which might propagate the pth dependency, the possibility of
pthread-pth conflicts should be limited. Other uses of libassuan
need to be checked.)
Beiing here, support DESTDIR.

6 files changed, 85 insertions, 32 deletions

diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile
index 9b00c59b8e1..17676c91ce3 100644
--- a/security/dirmngr/Makefile
+++ b/security/dirmngr/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.33 2009/01/29 17:11:25 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2009/12/15 19:43:16 drochner Exp $
 #
 
-DISTNAME=		dirmngr-1.0.1
-PKGREVISION=		2
+DISTNAME=		dirmngr-1.0.3
 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.3.tar.bz2
-SITES.libassuan-1.0.3.tar.bz2=	ftp://ftp.gnupg.org/gcrypt/libassuan/
+DISTFILES+=		libassuan-1.0.5.tar.bz2
+SITES.libassuan-1.0.5.tar.bz2=	ftp://ftp.gnupg.org/gcrypt/libassuan/
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		shannonjr@NetBSD.org
@@ -63,12 +62,13 @@ OWN_DIRS_PERMS+=	${PREFIX}/libdata/dirmngr ${DIRMNGR_PERMS}
 OWN_DIRS_PERMS+=	${PREFIX}/libdata/dirmngr/extra-certs ${DIRMNGR_PERMS}
 
 INSTALLATION_DIRS=	sbin
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 # We are building a static pth library and linking against it
 # 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.3 && \
+	cd  ${WRKDIR}/libassuan-1.0.5 && \
 	${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/PLIST b/security/dirmngr/PLIST
index 62608cf291a..02ea53530e5 100644
--- a/security/dirmngr/PLIST
+++ b/security/dirmngr/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2006/10/11 11:09:48 shannonjr Exp $
+@comment $NetBSD: PLIST,v 1.10 2009/12/15 19:43:16 drochner Exp $
 bin/dirmngr
 bin/dirmngr-client
 info/dirmngr.info
@@ -6,5 +6,58 @@ libexec/dirmngr_ldap
 man/man1/dirmngr-client.1
 man/man1/dirmngr.1
 sbin/runDirmngr
+share/doc/dirmngr/examples/README
+share/doc/dirmngr/examples/bnetza-10r-ocsp.signer
+share/doc/dirmngr/examples/dirmngr.conf
+share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-001.final.v3.509.crt
+share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-002.final.v3.509.crt
+share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-003.final.v3.509.crt
+share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-004.final.v3.509.crt
+share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-005.final.v3.509.crt
+share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-006.final.v3.509.crt
+share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-007.final.v3.509.crt
+share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-008.final.v3.509.crt
+share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-009.final.v3.509.crt
+share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-010.final.v3.509.crt
+share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-011.final.v3.509.crt
+share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-012.final.v3.509.crt
+share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-013.final.v3.509.crt
+share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-014.final.v3.509.crt
+share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-015.final.v3.509.crt
+share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-016.final.v3.509.crt
+share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-017.final.v3.509.crt
+share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-018.final.v3.509.crt
+share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-019.final.v3.509.crt
+share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-020.final.v3.509.crt
+share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-021.final.v3.509.crt
+share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-022.final.v3.509.crt
+share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-023.final.v3.509.crt
+share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-024.final.v3.509.crt
+share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-025.final.v3.509.crt
+share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-026.final.v3.509.crt
+share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-027.final.v3.509.crt
+share/doc/dirmngr/examples/extra-certs/S-TRUSTQualSigOCSP2008-028.final.v3.509.crt
+share/doc/dirmngr/examples/extra-certs/S-TRUSTQualifiedSignatureCA2008-001.final.v3.509.crt
+share/doc/dirmngr/examples/extra-certs/S-TRUSTQualifiedSignatureCA2008-002.final.v3.509.crt
+share/doc/dirmngr/examples/extra-certs/S-TRUSTQualifiedSignatureCA2008-003.final.v3.509.crt
+share/doc/dirmngr/examples/extra-certs/S-TRUSTQualifiedSignatureCA2008-004.final.v3.509.crt
+share/doc/dirmngr/examples/extra-certs/S-TRUSTQualifiedSignatureCA2008-005.final.v3.509.crt
+share/doc/dirmngr/examples/extra-certs/S-TRUSTQualifiedSignatureCA2008-006.final.v3.509.crt
+share/doc/dirmngr/examples/extra-certs/bnetza-10r-ocsp-1.crt
+share/doc/dirmngr/examples/extra-certs/bnetza-10r-ocsp-10.crt
+share/doc/dirmngr/examples/extra-certs/bnetza-10r-ocsp-11.crt
+share/doc/dirmngr/examples/extra-certs/bnetza-10r-ocsp-12.crt
+share/doc/dirmngr/examples/extra-certs/bnetza-10r-ocsp-2.crt
+share/doc/dirmngr/examples/extra-certs/bnetza-10r-ocsp-3.crt
+share/doc/dirmngr/examples/extra-certs/bnetza-10r-ocsp-4.crt
+share/doc/dirmngr/examples/extra-certs/bnetza-10r-ocsp-5.crt
+share/doc/dirmngr/examples/extra-certs/bnetza-10r-ocsp-6.crt
+share/doc/dirmngr/examples/extra-certs/bnetza-10r-ocsp-7.crt
+share/doc/dirmngr/examples/extra-certs/bnetza-10r-ocsp-8.crt
+share/doc/dirmngr/examples/extra-certs/bnetza-10r-ocsp-9.crt
+share/doc/dirmngr/examples/trusted-certs/README
+share/doc/dirmngr/examples/trusted-certs/S-TRUSTQualifiedRootCA2008-001.final.v3.509.crt
+share/doc/dirmngr/examples/trusted-certs/S-TRUSTQualifiedRootCA2008-002.final.v3.509.crt
+share/doc/dirmngr/examples/trusted-certs/bnetza-10r-ca.crt
 share/examples/rc.d/dirmngr
 share/locale/de/LC_MESSAGES/dirmngr.mo
diff --git a/security/dirmngr/distinfo b/security/dirmngr/distinfo
index 7c7418a785f..62239d15e67 100644
--- a/security/dirmngr/distinfo
+++ b/security/dirmngr/distinfo
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.14 2007/11/07 19:38:12 shannonjr Exp $
+$NetBSD: distinfo,v 1.15 2009/12/15 19:43:16 drochner Exp $
 
-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 (dirmngr-1.0.3.tar.bz2) = 437d381c937b1f1d0699d1ed37cf50f14bfbcd32
+RMD160 (dirmngr-1.0.3.tar.bz2) = 208a078e11df1d850dfe50a6e74bde8c2640b1e4
+Size (dirmngr-1.0.3.tar.bz2) = 556184 bytes
+SHA1 (libassuan-1.0.5.tar.bz2) = f6c36e9d99736883a8ce5b80b0a51d854cbbbc70
+RMD160 (libassuan-1.0.5.tar.bz2) = 7c4a75c71a3117cf140ea66ca89765349f39218e
+Size (libassuan-1.0.5.tar.bz2) = 297786 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) = 7a82dce7d558914e2a95b1f464c9d5760a9357b6
-SHA1 (patch-ab) = 97fbb195fa8ab33c4fddfee9b23ae2024f99c615
-SHA1 (patch-ac) = 6726d6dcd897cddaf068e400ceddfdaed0094cba
+SHA1 (patch-aa) = bbc030ab815f6fbbcc440768c3a73ab0f74ba2f0
+SHA1 (patch-ab) = 908fd76d67f837367121e493d239f8b377eb1c3f
+SHA1 (patch-ac) = 1f611619771e9c5258037e2f97855e9a9513a135
 SHA1 (patch-ad) = 94c789bd308208c147a24f05b371602ec74185f4
 SHA1 (patch-ae) = 3d77aff4b2ee779106dee329f3a6cd5b8f332e26
 SHA1 (patch-af) = b6ae3b526e344ca63af1babb9eb6707b90edc837
diff --git a/security/dirmngr/patches/patch-aa b/security/dirmngr/patches/patch-aa
index cc4e9e9d3ba..927286f1780 100644
--- a/security/dirmngr/patches/patch-aa
+++ b/security/dirmngr/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.5 2007/11/07 19:38:12 shannonjr Exp $
+$NetBSD: patch-aa,v 1.6 2009/12/15 19:43:16 drochner Exp $
 
---- src/Makefile.am.orig	2007-08-13 02:54:50.000000000 -0600
+--- src/Makefile.am.orig	2008-06-12 15:23:02.000000000 +0000
 +++ src/Makefile.am
 @@ -20,7 +20,7 @@
  
@@ -18,5 +18,5 @@ $NetBSD: patch-aa,v 1.5 2007/11/07 19:38:12 shannonjr Exp $
 -AM_CPPFLAGS += -DDIRMNGR_DATADIR="\"$(localstatedir)/lib/@PACKAGE@\""
 +AM_CPPFLAGS += -DDIRMNGR_DATADIR="\"$(datadir)/@PACKAGE@\""
  AM_CPPFLAGS += -DDIRMNGR_CACHEDIR="\"$(localstatedir)/cache/@PACKAGE@\""
+ AM_CPPFLAGS += -DDIRMNGR_SOCKETDIR="\"$(localstatedir)/run/@PACKAGE@\""
  
- AM_CFLAGS = -I$(top_srcdir)/jnlib $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_CFLAGS) \
diff --git a/security/dirmngr/patches/patch-ab b/security/dirmngr/patches/patch-ab
index eac602debf9..8c555597045 100644
--- a/security/dirmngr/patches/patch-ab
+++ b/security/dirmngr/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.5 2007/11/07 12:43:22 shannonjr Exp $
+$NetBSD: patch-ab,v 1.6 2009/12/15 19:43:16 drochner Exp $
 
---- ../libassuan-1.0.3/src/Makefile.am.orig	2006-11-21 11:17:18.000000000 -0700
-+++ ../libassuan-1.0.3/src/Makefile.am
+--- ../libassuan-1.0.5/src/Makefile.am.orig	2006-11-21 11:17:18.000000000 -0700
++++ ../libassuan-1.0.5/src/Makefile.am
 @@ -26,6 +26,7 @@ MOSTLYCLEANFILES = assuan-errors.c
  
  if HAVE_PTH
diff --git a/security/dirmngr/patches/patch-ac b/security/dirmngr/patches/patch-ac
index a8c73dac825..e02c72dc3e0 100644
--- a/security/dirmngr/patches/patch-ac
+++ b/security/dirmngr/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.4 2007/11/07 19:38:12 shannonjr Exp $
+$NetBSD: patch-ac,v 1.5 2009/12/15 19:43:16 drochner Exp $
 
---- src/dirmngr.c.orig	2007-08-16 07:11:53.000000000 -0600
+--- src/dirmngr.c.orig	2008-12-09 10:52:06.000000000 +0000
 +++ src/dirmngr.c
 @@ -39,6 +39,7 @@
  #include <unistd.h>
@@ -10,14 +10,14 @@ $NetBSD: patch-ac,v 1.4 2007/11/07 19:38:12 shannonjr Exp $
  
  #include <gcrypt.h>
  #include <ksba.h>
-@@ -945,7 +946,10 @@ main (int argc, char **argv)
- 	  rc = _w32_sock_bind (fd, (struct sockaddr*) &serv_addr, len);
- 	}
- #else
+@@ -954,7 +955,10 @@ main (int argc, char **argv)
+       len = (offsetof (struct sockaddr_un, sun_path)
+              + strlen (serv_addr.sun_path) + 1);
+ 
 +      /* FreeBSD honors users umask */
 +      mode_t oldumask = umask(0);
-       rc = bind (fd, (struct sockaddr*)&serv_addr, len);
+       rc = assuan_sock_bind (fd, (struct sockaddr*) &serv_addr, len);
 +      umask(oldumask);
        if (rc == -1 && errno == EADDRINUSE)
-         {
-           remove (socket_name);
+ 	{
+ 	  remove (socket_name);