Update to 0.90. From the changelog:

- Added support for chaining modules within the version client library.
  To use this, specify the module string as a list of modules separated
  with commas. For example:

	cvm-command:/path/to/module,cvm-local:/path/to/socket

  This enhancement deprecates the cvm-chain module.

- Introduced an "out of scope" fact, to be used on credential rejection
  results when the supplied credentials are outside of the scope of
  authority of the module. The cvm-vmailmgr and cvm-qmail modules
  report this fact as appropriate, and cvm-chain copies it as
  appropriate from the modules it invokes.

- A random anti-spoofing tag is added to all version 2 client requests.
  Its length is set by $CVM_RANDOM_BYTES and defaults to 8.

- Fixed a bug that caused the domain output to be set incorrectly when
  doing qmail lookups with a domain not in the control files with
  $CVM_QMAIL_ASSUME_LOCAL set.

5 files changed, 40 insertions, 10 deletions

diff --git a/security/cvm/Makefile b/security/cvm/Makefile
index 19b58085a8e..6c54bf2ecd7 100644
--- a/security/cvm/Makefile
+++ b/security/cvm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2007/03/24 07:25:28 schmonz Exp $
+# $NetBSD: Makefile,v 1.13 2008/04/13 06:51:19 schmonz Exp $
 #
 
-DISTNAME=		cvm-0.82
+DISTNAME=		cvm-0.90
 CATEGORIES=		security
 MASTER_SITES=		${HOMEPAGE}
 
@@ -22,16 +22,32 @@ SUBST_FILES.paths=	qmail-init.c
 SUBST_SED.paths=	-e 's|/var/qmail|${QMAILDIR}|g'
 SUBST_MESSAGE.paths=	Fixing paths.
 
+SUBST_CLASSES+=		shlibs
+SUBST_STAGE.shlibs=	do-configure
+SUBST_FILES.shlibs=	INSTHIER
+SUBST_SED.shlibs=	-e 's|@CVM_LIB_EXT@|${CVM_LIB_EXT}|g'
+SUBST_MESSAGE.shlibs=	Fixing shlibs.
+
 RCD_SCRIPTS=		cvm
 PKG_GROUPS+=		cvmlog
 PKG_USERS+=		cvmlog:cvmlog
 
 BUILD_DEFS+=		QMAILDIR
+PLIST_SUBST+=		CVM_LIB_EXT=${CVM_LIB_EXT:Q}
 
 DJB_CONFIG_CMDS=							\
 	${ECHO} ${DJB_CONFIG_PREFIX}/include > conf-include;		\
 	${ECHO} ${DJB_CONFIG_PREFIX}/lib > conf-lib
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${_OPSYS_SHLIB_TYPE} == "dylib"
+CVM_LIB_EXT=dylib
+.else
+CVM_LIB_EXT=so
+.endif
+
+
 .include "../../devel/bglibs/buildlink3.mk"
 .include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/cvm/PLIST b/security/cvm/PLIST
index a04400c47c1..a953dfa7995 100644
--- a/security/cvm/PLIST
+++ b/security/cvm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2006/07/31 01:23:00 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/04/13 06:51:19 schmonz Exp $
 bin/cvm-benchclient
 bin/cvm-chain
 bin/cvm-checkpassword
@@ -24,7 +24,7 @@ include/cvm/v1client.h
 include/cvm/v2client.h
 lib/libcvm-client.a
 lib/libcvm-client.la
-lib/libcvm-client.so
+lib/libcvm-client.${CVM_LIB_EXT}
 lib/libcvm-command.la
 lib/libcvm-local.la
 lib/libcvm-module.la
diff --git a/security/cvm/buildlink3.mk b/security/cvm/buildlink3.mk
index d925978b120..7b65f1734b3 100644
--- a/security/cvm/buildlink3.mk
+++ b/security/cvm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/31 01:23:55 schmonz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2008/04/13 06:51:19 schmonz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CVM_BUILDLINK3_MK:=	${CVM_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	cvm
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cvm
 
 .if !empty(CVM_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.cvm+=		cvm>=0.81
+BUILDLINK_API_DEPENDS.cvm+=		cvm>=0.90
 BUILDLINK_PKGSRCDIR.cvm?=	../../security/cvm
 BUILDLINK_DEPMETHOD.cvm?=	build
 .endif	# CVM_BUILDLINK3_MK
diff --git a/security/cvm/distinfo b/security/cvm/distinfo
index 043fddc8cd6..e702f30199a 100644
--- a/security/cvm/distinfo
+++ b/security/cvm/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2006/11/07 22:50:05 schmonz Exp $
+$NetBSD: distinfo,v 1.7 2008/04/13 06:51:19 schmonz Exp $
 
-SHA1 (cvm-0.82.tar.gz) = ee66c6b987655fc9c43fe303cf339dd7d4a7dfae
-RMD160 (cvm-0.82.tar.gz) = 3c46e49514bebd3d89a557f95cbaf45884d1376e
-Size (cvm-0.82.tar.gz) = 93615 bytes
+SHA1 (cvm-0.90.tar.gz) = 659c0bc349460cf19442b0bcdc06fad439d57491
+RMD160 (cvm-0.90.tar.gz) = a05d45e5cb9db1553813bf63c7adc0c313e5be16
+Size (cvm-0.90.tar.gz) = 99732 bytes
+SHA1 (patch-aa) = 49ed0270a0ecde312dd68acc9e9a6f1e87b672f6
diff --git a/security/cvm/patches/patch-aa b/security/cvm/patches/patch-aa
new file mode 100644
index 00000000000..446acece210
--- /dev/null
+++ b/security/cvm/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2008/04/13 06:51:19 schmonz Exp $
+
+--- INSTHIER.orig	2008-04-11 20:02:17.000000000 -0400
++++ INSTHIER
+@@ -1,7 +1,7 @@
+ >lib
+ s:::::libcvm-client.a:libcvm-v2client.a
+ s:::::libcvm-client.la:libcvm-v2client.la
+-s:::::libcvm-client.so:libcvm-v2client.so
++s:::::libcvm-client.@CVM_LIB_EXT@:libcvm-v2client.@CVM_LIB_EXT@
+ l:::755::libcvm-command.la
+ l:::755::libcvm-local.la
+ l:::755::libcvm-module.la