[pkgsrc/trunk]: pkgsrc/security/dirmngr Update to release 1.0.0.

[shannonjr <shannonjr%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f81356a30406
branches:  trunk
changeset: 522535:f81356a30406
user:      shannonjr <shannonjr%pkgsrc.org@localhost>
date:      Tue Dec 12 13:09:21 2006 +0000

description:
Update to release 1.0.0.

Dirmngr is a server for managing and downloading certificate
revocation lists (CRLs) for X.509 certificates and for downloading the
certificates themselves.  Dirmngr also handles OCSP requests as an
alternative to CRLs.  Dirmngr is either invoked internally by gpgsm
(from GnuPG-2) or when running as a system daemon through the
dirmngr-client tool.

diffstat:

 security/dirmngr/Makefile         |  21 +++++++++++++++++----
 security/dirmngr/distinfo         |  18 +++++++++++++-----
 security/dirmngr/patches/patch-aa |  10 +++++-----
 security/dirmngr/patches/patch-ab |  12 ++++++++++++
 security/dirmngr/patches/patch-ac |  12 ++++++++++++
 security/dirmngr/patches/patch-ad |  12 ++++++++++++
 security/dirmngr/patches/patch-ae |  12 ++++++++++++
 security/dirmngr/patches/patch-af |  17 +++++++++++++++++
 8 files changed, 100 insertions(+), 14 deletions(-)

diffs (199 lines):

diff -r b1c46a128590 -r f81356a30406 security/dirmngr/Makefile
--- a/security/dirmngr/Makefile Tue Dec 12 07:05:22 2006 +0000
+++ b/security/dirmngr/Makefile Tue Dec 12 13:09:21 2006 +0000
@@ -1,12 +1,14 @@
-# $NetBSD: Makefile,v 1.26 2006/10/11 11:09:48 shannonjr Exp $
+# $NetBSD: Makefile,v 1.27 2006/12/12 13:09:21 shannonjr Exp $
 #
 
-DISTNAME=              dirmngr-0.9.6
+DISTNAME=              dirmngr-1.0.0
 CATEGORIES=            security
-MASTER_SITES=          ftp://ftp.gnupg.org/gcrypt/alpha/dirmngr/
+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.0.tar.bz2
+SITES.libassuan-1.0.0.tar.bz2= ftp://ftp.gnupg.org/gcrypt/libassuan/
 EXTRACT_SUFX=          .tar.bz2
 
 MAINTAINER=            shannonjr%NetBSD.org@localhost
@@ -22,6 +24,11 @@
 
 GNU_CONFIGURE=         yes
 USE_TOOLS+=            gawk
+#USE_TOOLS+=           gmake
+USE_TOOLS+=            autoconf
+USE_TOOLS+=            automake
+USE_TOOLS+=            gettext
+USE_LIBTOOL=           yes
 USE_PKGLOCALEDIR=      yes
 RCD_SCRIPTS=           dirmngr
 INFO_FILES=            YES
@@ -30,6 +37,7 @@
 CONFIGURE_ARGS+=       --sharedstatedir=${VARBASE: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}
@@ -47,8 +55,14 @@
 OWN_DIRS_PERMS+=       ${PREFIX}/libdata/dirmngr/extra-certs ${DIRMNGR_PERMS}
 
 # 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.0 && \
+       ${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
 
 pre-build:
        ${CP} ${FILESDIR}/runDirmngr.c ${WRKDIR}/runDirmngr.c
@@ -64,7 +78,6 @@
 .include "../../databases/openldap-client/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libgetopt/buildlink3.mk"
-.include "../../security/libassuan/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../security/libgpg-error/buildlink3.mk"
 .include "../../security/libksba/buildlink3.mk"
diff -r b1c46a128590 -r f81356a30406 security/dirmngr/distinfo
--- a/security/dirmngr/distinfo Tue Dec 12 07:05:22 2006 +0000
+++ b/security/dirmngr/distinfo Tue Dec 12 13:09:21 2006 +0000
@@ -1,9 +1,17 @@
-$NetBSD: distinfo,v 1.9 2006/10/11 11:09:48 shannonjr Exp $
+$NetBSD: distinfo,v 1.10 2006/12/12 13:09:21 shannonjr Exp $
 
-SHA1 (dirmngr-0.9.6.tar.bz2) = 954e1dbed96a2bccfbdb1bee446fa75337a156ea
-RMD160 (dirmngr-0.9.6.tar.bz2) = fa83ca16be3a71a3d6106b18a7375f489eea593e
-Size (dirmngr-0.9.6.tar.bz2) = 499675 bytes
+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.0.tar.bz2) = 5256d74a80619779a9802305a9f1ad7fd04277a1
+RMD160 (libassuan-1.0.0.tar.bz2) = 63b0cc77eb731ccd635e51543001a675c15a835f
+Size (libassuan-1.0.0.tar.bz2) = 260201 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) = f3b4c18afa24ba7838876e46c0084502c7656f4b
+SHA1 (patch-aa) = 5f3cb038a5d799a91394406aecf855e77c931412
+SHA1 (patch-ab) = 04fdcbf19c4d530fc735c04dd785c07692d8b96d
+SHA1 (patch-ac) = c148a6f0c3066decdbd91abb8725d6f2bd3b0d38
+SHA1 (patch-ad) = 94c789bd308208c147a24f05b371602ec74185f4
+SHA1 (patch-ae) = d3584d0c4de0335f32e10a5517978fa77ca862b9
+SHA1 (patch-af) = b6ae3b526e344ca63af1babb9eb6707b90edc837
diff -r b1c46a128590 -r f81356a30406 security/dirmngr/patches/patch-aa
--- a/security/dirmngr/patches/patch-aa Tue Dec 12 07:05:22 2006 +0000
+++ b/security/dirmngr/patches/patch-aa Tue Dec 12 13:09:21 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2005/01/04 13:40:38 shannonjr Exp $
+$NetBSD: patch-aa,v 1.4 2006/12/12 13:09:21 shannonjr Exp $
 
---- src/Makefile.in.orig       2004-12-17 03:35:04.000000000 -0700
+--- src/Makefile.in.orig       2006-12-11 07:34:48.000000000 -0700
 +++ src/Makefile.in
-@@ -259,9 +259,9 @@ localedir = $(datadir)/locale
+@@ -246,9 +246,9 @@ target_alias = @target_alias@
  EXTRA_DIST = Manifest
  AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" \
        -DDIRMNGR_SYSCONFDIR="\"$(sysconfdir)/@PACKAGE@\"" \
@@ -12,6 +12,6 @@
 +      -DDIRMNGR_LIBEXECDIR="\"$(libexecdir)/@PACKAGE@\"" \
 +      -DDIRMNGR_DATADIR="\"$(prefix)/libdata/@PACKAGE@\"" \
 +      -DDIRMNGR_CACHEDIR="\"$(localstatedir)/@PACKAGE@/cache\""
- AM_CFLAGS = -I$(top_srcdir)/jnlib @LIBGCRYPT_CFLAGS@ @LIBASSUAN_CFLAGS@ \
-               @KSBA_CFLAGS@ @GPG_ERROR_CFLAGS@  $(PTH_CFLAGS)
+ AM_CFLAGS = -I$(top_srcdir)/jnlib $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_CFLAGS) \
+               $(KSBA_CFLAGS) $(GPG_ERROR_CFLAGS) $(PTH_CFLAGS)
  
diff -r b1c46a128590 -r f81356a30406 security/dirmngr/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/dirmngr/patches/patch-ab Tue Dec 12 13:09:21 2006 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.3 2006/12/12 13:09:21 shannonjr Exp $
+
+--- ../libassuan-1.0.0/src/Makefile.am.orig    2006-10-09 04:26:41.000000000 -0600
++++ ../libassuan-1.0.0/src/Makefile.am
+@@ -26,6 +26,7 @@ MOSTLYCLEANFILES = assuan-errors.c
+ 
+ if HAVE_PTH
+ libassuan_pth = libassuan-pth.a
++AM_CFLAGS=$(PTH_CFLAGS)
+ else
+ libassuan_pth = 
+ endif
diff -r b1c46a128590 -r f81356a30406 security/dirmngr/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/dirmngr/patches/patch-ac Tue Dec 12 13:09:21 2006 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.3 2006/12/12 13:09:21 shannonjr Exp $
+
+--- ./src/dirmngr.c.orig       2006-11-29 06:06:11.000000000 -0700
++++ ./src/dirmngr.c
+@@ -36,6 +36,7 @@
+ #include <unistd.h>
+ #include <signal.h>
+ #include <pth.h>
++#include <locale.h>
+ 
+ #include <gcrypt.h>
+ #include <ksba.h>
diff -r b1c46a128590 -r f81356a30406 security/dirmngr/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/dirmngr/patches/patch-ad Tue Dec 12 13:09:21 2006 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1 2006/12/12 13:09:21 shannonjr Exp $
+
+--- ./src/dirmngr-client.c.orig        2006-11-29 06:04:00.000000000 -0700
++++ ./src/dirmngr-client.c
+@@ -28,6 +28,7 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <assert.h>
++#include <locale.h>
+ 
+ #include <gpg-error.h>
+ #include <assuan.h> 
diff -r b1c46a128590 -r f81356a30406 security/dirmngr/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/dirmngr/patches/patch-ae Tue Dec 12 13:09:21 2006 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1 2006/12/12 13:09:21 shannonjr Exp $
+
+--- ./src/dirmngr_ldap.c.orig  2006-11-29 06:04:41.000000000 -0700
++++ ./src/dirmngr_ldap.c
+@@ -31,6 +31,7 @@
+ #include <sys/time.h>
+ #include <unistd.h>
+ #include <ldap.h>
++#include <locale.h>
+ 
+ 
+ 
diff -r b1c46a128590 -r f81356a30406 security/dirmngr/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/dirmngr/patches/patch-af Tue Dec 12 13:09:21 2006 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-af,v 1.1 2006/12/12 13:09:21 shannonjr Exp $
+
+--- autogen.sh.orig    2006-11-16 03:14:50.000000000 -0700
++++ autogen.sh
+@@ -125,9 +125,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