Update security/cyrus-sasl2 to 2.1.18. Changes from version 2.1.17

include:

* Better error-handling.
* Support for Courier-IMAP authdaemond for plaintext password verification.
* Fixed resource leaks and buffer overruns.

pkgsrc changes include:

* SASL_DBTYPE is either "ndbm" or "berkeley" and sets the db format of the
  sasldb authentication database, defaulting to ndbm.
* SASLSOCKETDIR is the location of the saslauthd socket directory.
* AUTHDAEMONVAR is the localt of the authdaemond socket directory.
* SASL_ENTROPY_SOURCE is a file of random bytes used as a PRNG.

This closes PR 24649 and PR 24694.

21 files changed, 144 insertions, 120 deletions

diff --git a/doc/CHANGES b/doc/CHANGES
index f5ce97fbb6d..0ba91350222 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.5341 2004/03/29 05:15:43 ben Exp $
+$NetBSD: CHANGES,v 1.5342 2004/03/29 05:47:30 jlam Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -1569,3 +1569,4 @@ Changes to the packages collection and infrastructure in 2004:
 	Updated sqsh to 2.1 [grant 2004-03-29]
 	Updated qmail to 1.03nb4 [snj 2004-03-29]
 	Updated xmill to 0.9.1 [ben 2004-03-29]
+	Updated cyrus-sasl2 to 2.1.18 [jlam 2004-03-29]
diff --git a/security/cy2-login/Makefile b/security/cy2-login/Makefile
index 388e80a09c6..1276417741d 100644
--- a/security/cy2-login/Makefile
+++ b/security/cy2-login/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2004/03/26 02:27:52 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2004/03/29 05:47:31 jlam Exp $
 
 PKGNAME=	${DISTNAME:S/cyrus-sasl/cy2-login/}
 PKGREVISION=	1
 COMMENT=	Cyrus SASL LOGIN authentication plugin
-SASL_PLUGIN=	YES
+SASL_PLUGIN=	yes
 
 .include "../cyrus-sasl2/Makefile.common"
 
diff --git a/security/cy2-login/PLIST b/security/cy2-login/PLIST
index 0964a95b51d..2b14de6d5a0 100644
--- a/security/cy2-login/PLIST
+++ b/security/cy2-login/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 2004/02/14 14:43:51 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/03/29 05:47:31 jlam Exp $
 lib/sasl2/liblogin.la
 lib/sasl2/liblogin.so
 lib/sasl2/liblogin.so.2
-lib/sasl2/liblogin.so.2.17
+lib/sasl2/liblogin.so.2.18
diff --git a/security/cy2-ntlm/Makefile b/security/cy2-ntlm/Makefile
index 3701ad083f2..f715568bef9 100644
--- a/security/cy2-ntlm/Makefile
+++ b/security/cy2-ntlm/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2004/03/26 02:27:52 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2004/03/29 05:47:31 jlam Exp $
 
 PKGNAME=	${DISTNAME:S/cyrus-sasl/cy2-ntlm/}
-PKGREVISION=	2
 COMMENT=	Cyrus SASL NTLM authentication plugin
-SASL_PLUGIN=	YES
+SASL_PLUGIN=	yes
 
 .include "../cyrus-sasl2/Makefile.common"
 
diff --git a/security/cy2-ntlm/PLIST b/security/cy2-ntlm/PLIST
index 346f654d192..668b0c43a9f 100644
--- a/security/cy2-ntlm/PLIST
+++ b/security/cy2-ntlm/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 2004/02/14 14:43:51 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/03/29 05:47:31 jlam Exp $
 lib/sasl2/libntlm.la
 lib/sasl2/libntlm.so
 lib/sasl2/libntlm.so.2
-lib/sasl2/libntlm.so.2.17
+lib/sasl2/libntlm.so.2.18
diff --git a/security/cyrus-sasl2/DEINSTALL b/security/cyrus-sasl2/DEINSTALL
index 965f46f65e4..0547c41f257 100644
--- a/security/cyrus-sasl2/DEINSTALL
+++ b/security/cyrus-sasl2/DEINSTALL
@@ -1,13 +1,12 @@
 #!/bin/sh
 #
-# $NetBSD: DEINSTALL,v 1.3 2004/01/09 19:37:48 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.4 2004/03/29 05:47:31 jlam Exp $
 
 SASLDB=@PKG_SYSCONFDIR@/sasldb.db
 
 case ${STAGE} in
 POST-DEINSTALL)
-	if [ -e ${SASLDB} ]
-	then
+	if [ -f ${SASLDB} ]; then
 		${CAT} << EOF
 ===========================================================================
 You may want to remove the SASL password data file:
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index 6bff978377f..f89b274bdfd 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -1,13 +1,27 @@
-# $NetBSD: Makefile,v 1.27 2004/03/26 02:27:52 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2004/03/29 05:47:31 jlam Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=	2
 SVR4_PKGNAME=	csasl
 COMMENT=	Simple Authentication and Security Layer
 
 PLIST_SRC+=		${PKGDIR}/PLIST.common
 
+.if exists(/usr/include/ndbm.h)
+SASL_DBTYPE?=		ndbm
+.else
+SASL_DBTYPE?=		berkeley
+.endif
+BUILD_DEFS+=		SASL_DBTYPE
+
+.if ${SASL_DBTYPE} == "berkeley"
+USE_DB185=		no
+.  include "../../mk/bdb.buildlink3.mk"
+.endif
+
+CONFIGURE_ARGS+=	--with-dblib=${SASL_DBTYPE}
+CONFIGURE_ARGS+=	--with-dbpath=${PKG_SYSCONFDIR}/sasldb
+
 # Authentication mechanisms
 CONFIGURE_ARGS+=	--enable-anon		# ANONYMOUS
 CONFIGURE_ARGS+=	--enable-checkapop	# CHECKAPOP
@@ -20,14 +34,25 @@ CONFIGURE_ARGS+=	--with-rc4
 CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
 .include "../../security/openssl/buildlink3.mk"
 
-BUILD_DEFS+=		SASL_USE_GSSAPI
+# Support using the Courier authdaemon (mail/courier-auth*) for
+# plaintext password authentication.
+#
+AUTHDAEMONVAR?=		/var/authdaemon
+CONFIGURE_ARGS+=        --with-authdaemond=${AUTHDAEMONVAR}
+BUILD_DEFS+=		AUTHDAEMONVAR
 
 .if exists(/dev/urandom)
-CONFIGURE_ARGS+=	--with-devrandom=/dev/urandom
+SASL_ENTROPY_SOURCE?=	/dev/urandom
+.endif
+.if defined(SASL_ENTROPY_SOURCE)
+CONFIGURE_ARGS+=	--with-devrandom=${SASL_ENTROPY_SOURCE}
 .endif
+BUILD_DEFS+=		SASL_ENTROPY_SOURCE
 
-.if defined(KERBEROS) || \
-    (defined(SASL_USE_GSSAPI) && !empty(SASL_USE_GSSAPI:M[yY][eE][sS]))
+.if defined(KERBEROS)
+SASL_USE_GSSAPI=	yes
+.endif
+.if (defined(SASL_USE_GSSAPI) && !empty(SASL_USE_GSSAPI:M[yY][eE][sS]))
 .  include "../../mk/krb5.buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-gssapi=${KRB5BASE}	# GSSAPI
 CONFIGURE_ARGS+=	--with-gss_impl=${GSSIMPL.${KRB5_TYPE}}
@@ -35,6 +60,7 @@ GSSIMPL.heimdal=	heimdal
 GSSIMPL.mit-krb5=	mit
 PLIST_SRC+=		${PKGDIR}/PLIST.krb5
 .endif
+BUILD_DEFS+=		SASL_USE_GSSAPI
 
 PLIST_SRC+=		${PKGDIR}/PLIST.plugins
 
@@ -49,6 +75,8 @@ MESSAGE_SUBST+=		_PLUGINDIR=${_PLUGINDIR}
 
 post-install:
 	${INSTALL_DATA_DIR} ${HTMLDIR}
-	cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html *.txt ${HTMLDIR}
+	cd ${WRKSRC}/doc; for file in *.fig *.html *.txt; do		\
+		${INSTALL_DATA} $$file ${HTMLDIR};			\
+	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/cyrus-sasl2/Makefile.common b/security/cyrus-sasl2/Makefile.common
index 143f63b8086..2650cc57401 100644
--- a/security/cyrus-sasl2/Makefile.common
+++ b/security/cyrus-sasl2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2004/02/14 17:21:50 jlam Exp $
+# $NetBSD: Makefile.common,v 1.19 2004/03/29 05:47:31 jlam Exp $
 #
 # This file is currently included by:
 #
@@ -9,7 +9,7 @@
 # This Makefile fragment should be included _below_ any SASL_PLUGIN
 # definition and _above_ any CONFIGURE_ARGS definitions.
 
-DISTNAME=	cyrus-sasl-2.1.17
+DISTNAME=	cyrus-sasl-2.1.18
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/
@@ -32,11 +32,11 @@ DEFAULT_VIEW.${PKGBASE}=	${DEFAULT_VIEW.cyrus-sasl}
 .  endif
 .endif
 
-USE_BUILDLINK3=		YES
-USE_PKGINSTALL=		YES
-GNU_CONFIGURE=		YES
+USE_BUILDLINK3=		yes
+USE_PKGINSTALL=		yes
+GNU_CONFIGURE=		yes
 
-USE_LIBTOOL=		YES
+USE_LIBTOOL=		yes
 MAKE_ENV+=		SHLIBTOOL=${SHLIBTOOL:Q}
 
 # CYRUS_USER		username of the Cyrus administrator
@@ -46,19 +46,16 @@ CYRUS_USER?=		cyrus
 CYRUS_GROUP?=		mail
 FILES_SUBST+=		CYRUS_USER=${CYRUS_USER}
 FILES_SUBST+=		ROOT_USER=${ROOT_USER}
+BUILD_DEFS+=		CYRUS_USER CYRUS_GROUP
 
 PLUGINDIR=		${PREFIX}/lib/sasl2
 _PLUGINDIR=		${VIEWBASE}/lib/sasl2
 
 HTMLDIR=		${PREFIX}/share/doc/html/cyrus-sasl
-# /var/run/saslauthd matches the default value in configure.
-SASLSOCKETDIR=		/var/run/saslauthd
-
-BUILD_DEFS+=		CYRUS_USER CYRUS_GROUP
+SASLSOCKETDIR?=		/var/run/saslauthd
+BUILD_DEFS+=		SASLSOCKETDIR
 
 CONFIGURE_ARGS+=	--with-saslauthd=${SASLSOCKETDIR}
-CONFIGURE_ARGS+=	--with-dblib=ndbm
-CONFIGURE_ARGS+=	--with-dbpath=${PKG_SYSCONFDIR}/sasldb
 CONFIGURE_ARGS+=	--with-plugindir=${_PLUGINDIR}
 
 # Authentication mechanisms
@@ -75,20 +72,23 @@ CONFIGURE_ARGS+=	--disable-plain		# PLAIN
 CONFIGURE_ARGS+=	--disable-sql		# SQL
 CONFIGURE_ARGS+=	--disable-srp		# SRP
 CONFIGURE_ARGS+=	--disable-srp-setpass
+CONFIGURE_ARGS+=	--with-dblib=none
 CONFIGURE_ARGS+=	--without-pam
 
 # clean up a bit to help package maintainer produce patch files
 post-extract:
-	${_PKG_SILENT}${_PKG_DEBUG}			\
+	${_PKG_SILENT}${_PKG_DEBUG}					\
 	${FIND} ${WRKSRC} -type f -name "*.orig" -print | ${XARGS} ${RM} -f
 
 # Left here as reference for patch makers...
 #pre-configure:
-#	cd ${WRKSRC};					\
-#	${ACLOCAL} -I cmulocal -I config;		\
-#	${AUTOHEADER};					\
-#	${AUTOMAKE} -a --gnu -i ;			\
+#	cd ${WRKSRC};							\
+#	${ACLOCAL} -I cmulocal -I config;				\
+#	${AUTOHEADER};							\
+#	${AUTOMAKE} -a --gnu -i ;					\
 #	${AUTOCONF}
+#
+#.include "../../mk/automake.mk"
 
 post-configure:
 	cd ${WRKSRC}; for file in plugins/Makefile; do			\
diff --git a/security/cyrus-sasl2/PLIST.common b/security/cyrus-sasl2/PLIST.common
index 1243fa57eda..3a4421e68cb 100644
--- a/security/cyrus-sasl2/PLIST.common
+++ b/security/cyrus-sasl2/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.12 2004/02/14 03:16:58 jlam Exp $
+@comment $NetBSD: PLIST.common,v 1.13 2004/03/29 05:47:31 jlam Exp $
 include/sasl/hmac-md5.h
 include/sasl/md5.h
 include/sasl/md5global.h
@@ -10,7 +10,7 @@ lib/libsasl2.a
 lib/libsasl2.la
 lib/libsasl2.so
 lib/libsasl2.so.2
-lib/libsasl2.so.2.17
+lib/libsasl2.so.2.18
 man/man3/sasl.3
 man/man3/sasl_authorize_t.3
 man/man3/sasl_auxprop.3
@@ -61,13 +61,13 @@ share/doc/html/cyrus-sasl/advanced.html
 share/doc/html/cyrus-sasl/appconvert.html
 share/doc/html/cyrus-sasl/components.html
 share/doc/html/cyrus-sasl/draft-burdis-cat-srp-sasl-08.txt
-share/doc/html/cyrus-sasl/draft-ietf-cat-sasl-gssapi-05.txt
 share/doc/html/cyrus-sasl/draft-ietf-sasl-anon-02.txt
-share/doc/html/cyrus-sasl/draft-ietf-sasl-crammd5-00.txt
-share/doc/html/cyrus-sasl/draft-ietf-sasl-plain-02.txt
-share/doc/html/cyrus-sasl/draft-ietf-sasl-rfc2222bis-02.txt
+share/doc/html/cyrus-sasl/draft-ietf-sasl-crammd5-01.txt
+share/doc/html/cyrus-sasl/draft-ietf-sasl-gssapi-00.txt
+share/doc/html/cyrus-sasl/draft-ietf-sasl-plain-03.txt
+share/doc/html/cyrus-sasl/draft-ietf-sasl-rfc2222bis-03.txt
 share/doc/html/cyrus-sasl/draft-ietf-sasl-rfc2831bis-02.txt
-share/doc/html/cyrus-sasl/draft-ietf-sasl-saslprep-03.txt
+share/doc/html/cyrus-sasl/draft-ietf-sasl-saslprep-04.txt
 share/doc/html/cyrus-sasl/draft-murchison-sasl-login-00.txt
 share/doc/html/cyrus-sasl/draft-newman-sasl-c-api-01.txt
 share/doc/html/cyrus-sasl/gssapi.html
@@ -92,6 +92,7 @@ share/doc/html/cyrus-sasl/rfc2595.txt
 share/doc/html/cyrus-sasl/rfc2831.txt
 share/doc/html/cyrus-sasl/rfc2945.txt
 share/doc/html/cyrus-sasl/rfc3174.txt
+share/doc/html/cyrus-sasl/server-plugin-flow.fig
 share/doc/html/cyrus-sasl/sysadmin.html
 share/doc/html/cyrus-sasl/testing.txt
 share/doc/html/cyrus-sasl/upgrading.html
diff --git a/security/cyrus-sasl2/PLIST.krb5 b/security/cyrus-sasl2/PLIST.krb5
index 255c2df443d..d6e66038610 100644
--- a/security/cyrus-sasl2/PLIST.krb5
+++ b/security/cyrus-sasl2/PLIST.krb5
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST.krb5,v 1.8 2004/02/14 03:16:58 jlam Exp $
+@comment $NetBSD: PLIST.krb5,v 1.9 2004/03/29 05:47:31 jlam Exp $
 lib/sasl2/libgssapiv2.la
 lib/sasl2/libgssapiv2.so
 lib/sasl2/libgssapiv2.so.2
-lib/sasl2/libgssapiv2.so.2.17
+lib/sasl2/libgssapiv2.so.2.18
diff --git a/security/cyrus-sasl2/PLIST.plugins b/security/cyrus-sasl2/PLIST.plugins
index 72203f0acd3..12b69f45061 100644
--- a/security/cyrus-sasl2/PLIST.plugins
+++ b/security/cyrus-sasl2/PLIST.plugins
@@ -1,25 +1,25 @@
-@comment $NetBSD: PLIST.plugins,v 1.7 2004/02/14 03:16:58 jlam Exp $
+@comment $NetBSD: PLIST.plugins,v 1.8 2004/03/29 05:47:31 jlam Exp $
 lib/sasl2/libanonymous.la
 lib/sasl2/libanonymous.so
 lib/sasl2/libanonymous.so.2
-lib/sasl2/libanonymous.so.2.17
+lib/sasl2/libanonymous.so.2.18
 lib/sasl2/libcrammd5.la
 lib/sasl2/libcrammd5.so
 lib/sasl2/libcrammd5.so.2
-lib/sasl2/libcrammd5.so.2.17
+lib/sasl2/libcrammd5.so.2.18
 lib/sasl2/libdigestmd5.la
 lib/sasl2/libdigestmd5.so
 lib/sasl2/libdigestmd5.so.2
-lib/sasl2/libdigestmd5.so.2.17
+lib/sasl2/libdigestmd5.so.2.18
 lib/sasl2/libotp.la
 lib/sasl2/libotp.so
 lib/sasl2/libotp.so.2
-lib/sasl2/libotp.so.2.17
+lib/sasl2/libotp.so.2.18
 lib/sasl2/libplain.la
 lib/sasl2/libplain.so
 lib/sasl2/libplain.so.2
-lib/sasl2/libplain.so.2.17
+lib/sasl2/libplain.so.2.18
 lib/sasl2/libsasldb.la
 lib/sasl2/libsasldb.so
 lib/sasl2/libsasldb.so.2
-lib/sasl2/libsasldb.so.2.17
+lib/sasl2/libsasldb.so.2.18
diff --git a/security/cyrus-sasl2/distinfo b/security/cyrus-sasl2/distinfo
index fb96a194f43..fcd633da1bd 100644
--- a/security/cyrus-sasl2/distinfo
+++ b/security/cyrus-sasl2/distinfo
@@ -1,15 +1,16 @@
-$NetBSD: distinfo,v 1.15 2004/02/14 07:45:36 jlam Exp $
+$NetBSD: distinfo,v 1.16 2004/03/29 05:47:31 jlam Exp $
 
-SHA1 (cyrus-sasl-2.1.17.tar.gz) = c91e073274279ea59d8ca9514559140e23e3be57
-Size (cyrus-sasl-2.1.17.tar.gz) = 1499725 bytes
-SHA1 (patch-aa) = 8ab6ded44e92c548a989f5e2d43102411e899504
-SHA1 (patch-ab) = 526138ba60cb33e1f03d6afe9499c1dd50208503
+SHA1 (cyrus-sasl-2.1.18.tar.gz) = 74496a61a87edd710303d13f8df0534d6765f6ec
+Size (cyrus-sasl-2.1.18.tar.gz) = 1522578 bytes
+SHA1 (patch-aa) = 04dcce761b77b7abb218837ae1ff0410a02669dc
+SHA1 (patch-ab) = 7d8e74662718cffe38a55dc226300b9000471951
 SHA1 (patch-ac) = 8536fec6241a87e2a199b4aa8da788a2439f5507
+SHA1 (patch-ad) = 351184f685a8e71f1add59452cca44728ddfec25
 SHA1 (patch-ae) = cfd176eea2e1dba320be14a7d9bf2a4426ba39ad
-SHA1 (patch-af) = a25efa52dd7c77cebb5432af1617877935a46918
-SHA1 (patch-ai) = d1c88ee3724edc958565c7911daf24f8bf85f547
-SHA1 (patch-ak) = aa71ba83a0d805f8595a64faf9afd76f8667bb6c
-SHA1 (patch-al) = 68576f62af7517dc09014d61427b58e76d361f8a
+SHA1 (patch-af) = c024ff3fe7712b9fce2e064bdc037323838231ef
+SHA1 (patch-ai) = ec9b2c155d3615d4e9443e314235484d8de2ad4c
+SHA1 (patch-ak) = 32521eef7f8a9b590089f078edaa706c74d91651
+SHA1 (patch-al) = f4a2c97d4894a4089b6960bf5a2542dfdec4df6e
 SHA1 (patch-am) = f0bd15b4f55e5204936a25c558d4bd2b1d4816d5
-SHA1 (patch-an) = 65a0ec173ea1f0114318ffb922cad4470e1cd7e9
-SHA1 (patch-ao) = 2d26106ea33ac0625195214e18fc9e00deb9dc15
+SHA1 (patch-an) = d6ccabc24d16b63a1c1f4b4f2667b60c37aa88ec
+SHA1 (patch-ao) = 727830d2f72d6a18a8f0f2959c76dee0c58c5b2c
diff --git a/security/cyrus-sasl2/patches/patch-aa b/security/cyrus-sasl2/patches/patch-aa
index 78223eea821..52215e20792 100644
--- a/security/cyrus-sasl2/patches/patch-aa
+++ b/security/cyrus-sasl2/patches/patch-aa
@@ -1,29 +1,15 @@
-$NetBSD: patch-aa,v 1.6 2004/02/14 07:45:36 jlam Exp $
+$NetBSD: patch-aa,v 1.7 2004/03/29 05:47:31 jlam Exp $
 
---- configure.in.orig	Fri Nov 28 10:37:10 2003
+--- configure.in.orig	Tue Mar  9 11:54:13 2004
 +++ configure.in
-@@ -104,6 +104,13 @@ target=$save_target
- 
- dnl ltconfig might not have found support for shared libs
- dnl just do static libs if so.
-+
-+_build_libtool_libs=`${CONFIG_SHELL-/bin/sh} $srcdir/libtool --config | grep '^build_libtool_libs='`
-+case "x$_build_libtool_libs" in
-+       x*=yes) ac_cv_can_build_shared=yes;;
-+       x*) ac_cv_can_build_shared=no;;
-+esac
-+
- if test "$ac_cv_can_build_shared" = no; then
- 	enable_shared=no
- 	enable_static=yes
-@@ -477,10 +484,6 @@ fi
- SASL_KERBEROS_V4_CHK
+@@ -483,10 +483,6 @@ SASL_KERBEROS_V4_CHK
  SASL_GSSAPI_CHK
  SASL_PLAIN_CHK
--
+ 
 -if test "$gssapi" != "no"; then
 -  AC_DEFINE(STATIC_GSSAPIV2,[],[Link GSSAPI Staticly])
 -fi
- 
+-
  dnl ANONYMOUS
  AC_ARG_ENABLE(anon, [  --enable-anon           enable ANONYMOUS authentication [yes] ],
+   anon=$enableval,
diff --git a/security/cyrus-sasl2/patches/patch-ab b/security/cyrus-sasl2/patches/patch-ab
index 6de3baff91a..ad4d922903d 100644
--- a/security/cyrus-sasl2/patches/patch-ab
+++ b/security/cyrus-sasl2/patches/patch-ab
@@ -1,8 +1,17 @@
-$NetBSD: patch-ab,v 1.5 2004/02/14 07:45:36 jlam Exp $
+$NetBSD: patch-ab,v 1.6 2004/03/29 05:47:31 jlam Exp $
 
---- aclocal.m4.orig	Mon Dec  1 08:35:02 2003
+--- aclocal.m4.orig	Wed Mar 10 10:56:07 2004
 +++ aclocal.m4
-@@ -2905,7 +2905,10 @@ AC_DEFUN([SASL_GSSAPI_CHK],[
+@@ -1714,7 +1714,7 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK],
+ 	dnl Note that FreeBSD puts it in a wierd place
+         dnl (but they should use with-bdb-incdir)
+         AC_CHECK_HEADER(db.h,
+-                        CYRUS_BERKELEY_DB_CHK_LIB(),
++                        [CYRUS_BERKELEY_DB_CHK_LIB()],
+                         dblib="no")
+ 
+ 	CPPFLAGS=$cmu_save_CPPFLAGS
+@@ -2908,7 +2908,10 @@ AC_DEFUN([SASL_GSSAPI_CHK],[
    AC_MSG_RESULT(with implementation ${gss_impl})
    AC_CHECK_LIB(resolv,res_search,GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv")
    SASL_MECHS="$SASL_MECHS libgssapiv2.la"
diff --git a/security/cyrus-sasl2/patches/patch-ad b/security/cyrus-sasl2/patches/patch-ad
new file mode 100644
index 00000000000..543b4df6f64
--- /dev/null
+++ b/security/cyrus-sasl2/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.4 2004/03/29 05:47:31 jlam Exp $
+
+--- cmulocal/berkdb.m4.orig	Sat Feb 14 16:13:03 2004
++++ cmulocal/berkdb.m4
+@@ -253,7 +253,7 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK],
+ 	dnl Note that FreeBSD puts it in a wierd place
+         dnl (but they should use with-bdb-incdir)
+         AC_CHECK_HEADER(db.h,
+-                        CYRUS_BERKELEY_DB_CHK_LIB(),
++                        [CYRUS_BERKELEY_DB_CHK_LIB()],
+                         dblib="no")
+ 
+ 	CPPFLAGS=$cmu_save_CPPFLAGS
diff --git a/security/cyrus-sasl2/patches/patch-af b/security/cyrus-sasl2/patches/patch-af
index d94e06794d4..a740445d118 100644
--- a/security/cyrus-sasl2/patches/patch-af
+++ b/security/cyrus-sasl2/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.5 2004/02/14 03:16:59 jlam Exp $
+$NetBSD: patch-af,v 1.6 2004/03/29 05:47:31 jlam Exp $
 
---- plugins/cram.c.orig	Mon Nov  3 10:25:24 2003
+--- plugins/cram.c.orig	Mon Dec 15 15:04:22 2003
 +++ plugins/cram.c
-@@ -531,7 +531,8 @@ static int crammd5_client_mech_step(void
+@@ -538,7 +538,8 @@ static int crammd5_client_mech_step(void
  	
  	if ((auth_result != SASL_OK) && (auth_result != SASL_INTERACT))
  	    return auth_result;
diff --git a/security/cyrus-sasl2/patches/patch-ai b/security/cyrus-sasl2/patches/patch-ai
index f7e5ffc3147..65d382b92de 100644
--- a/security/cyrus-sasl2/patches/patch-ai
+++ b/security/cyrus-sasl2/patches/patch-ai
@@ -1,21 +1,8 @@
-$NetBSD: patch-ai,v 1.7 2004/02/14 07:45:36 jlam Exp $
+$NetBSD: patch-ai,v 1.8 2004/03/29 05:47:31 jlam Exp $
 
---- configure.orig	Mon Dec  1 08:35:06 2003
+--- configure.orig	Wed Mar 10 10:56:10 2004
 +++ configure
-@@ -3915,6 +3915,12 @@ exec 5>>./config.log
- 
- target=$save_target
- 
-+_build_libtool_libs=`${CONFIG_SHELL-/bin/sh} $srcdir/libtool --config | grep '^build_libtool_libs='`
-+case "x$_build_libtool_libs" in
-+	x*=yes) ac_cv_can_build_shared=yes;;
-+	x*) ac_cv_can_build_shared=no;;
-+esac
-+
- if test "$ac_cv_can_build_shared" = no; then
- 	enable_shared=no
- 	enable_static=yes
-@@ -10731,7 +10737,14 @@ if test $ac_cv_lib_resolv_res_search = y
+@@ -10762,7 +10762,14 @@ if test $ac_cv_lib_resolv_res_search = y
  fi
  
    SASL_MECHS="$SASL_MECHS libgssapiv2.la"
@@ -31,7 +18,7 @@ $NetBSD: patch-ai,v 1.7 2004/02/14 07:45:36 jlam Exp $
  
    cmu_save_LIBS="$LIBS"
    LIBS="$LIBS $GSSAPIBASE_LIBS"
-@@ -10865,14 +10878,6 @@ _ACEOF
+@@ -10896,14 +10903,6 @@ _ACEOF
  echo "${ECHO_T}disabled" >&6
   fi
  
diff --git a/security/cyrus-sasl2/patches/patch-ak b/security/cyrus-sasl2/patches/patch-ak
index 17e9ff8c047..8c5514b2666 100644
--- a/security/cyrus-sasl2/patches/patch-ak
+++ b/security/cyrus-sasl2/patches/patch-ak
@@ -1,6 +1,6 @@
-$NetBSD: patch-ak,v 1.3 2004/02/14 03:16:59 jlam Exp $
+$NetBSD: patch-ak,v 1.4 2004/03/29 05:47:31 jlam Exp $
 
---- Makefile.am.orig	Tue Oct 14 13:36:34 2003
+--- Makefile.am.orig	Wed Mar 10 10:51:35 2004
 +++ Makefile.am
 @@ -68,7 +68,7 @@ else 
  INSTALLOSX = 
@@ -8,6 +8,6 @@ $NetBSD: patch-ak,v 1.3 2004/02/14 03:16:59 jlam Exp $
  
 -SUBDIRS=include sasldb plugins lib utils doc man $(PWC) $(SAM) $(JAV) $(SAD)
 +SUBDIRS=include sasldb plugins lib utils doc man $(PWC) $(SAM) $(JAV)
- EXTRA_DIST=config cmulocal win32 mac dlcompat-20010505
+ EXTRA_DIST=config cmulocal win32 mac dlcompat-20010505 NTMakefile
  
  dist-hook:
diff --git a/security/cyrus-sasl2/patches/patch-al b/security/cyrus-sasl2/patches/patch-al
index 07c87f6347c..6eb664e5a62 100644
--- a/security/cyrus-sasl2/patches/patch-al
+++ b/security/cyrus-sasl2/patches/patch-al
@@ -1,6 +1,6 @@
-$NetBSD: patch-al,v 1.2 2004/02/14 03:16:59 jlam Exp $
+$NetBSD: patch-al,v 1.3 2004/03/29 05:47:31 jlam Exp $
 
---- Makefile.in.orig	Mon Dec  1 08:35:06 2003
+--- Makefile.in.orig	Wed Mar 10 10:56:11 2004
 +++ Makefile.in
 @@ -235,7 +235,7 @@ target_vendor = @target_vendor@
  @MACOSX_FALSE@INSTALLOSX = 
@@ -8,6 +8,6 @@ $NetBSD: patch-al,v 1.2 2004/02/14 03:16:59 jlam Exp $
  
 -SUBDIRS = include sasldb plugins lib utils doc man $(PWC) $(SAM) $(JAV) $(SAD)
 +SUBDIRS = include sasldb plugins lib utils doc man $(PWC) $(SAM) $(JAV)
- EXTRA_DIST = config cmulocal win32 mac dlcompat-20010505
+ EXTRA_DIST = config cmulocal win32 mac dlcompat-20010505 NTMakefile
  
  framedir = /Library/Frameworks/SASL2.framework
diff --git a/security/cyrus-sasl2/patches/patch-an b/security/cyrus-sasl2/patches/patch-an
index 744c79980b0..5ae761aed25 100644
--- a/security/cyrus-sasl2/patches/patch-an
+++ b/security/cyrus-sasl2/patches/patch-an
@@ -1,6 +1,6 @@
-$NetBSD: patch-an,v 1.1 2004/01/09 20:29:47 jlam Exp $
+$NetBSD: patch-an,v 1.2 2004/03/29 05:47:31 jlam Exp $
 
---- include/Makefile.am.orig	Thu Feb 13 12:11:00 2003
+--- include/Makefile.am.orig	Wed Mar 10 10:51:35 2004
 +++ include/Makefile.am
 @@ -51,10 +51,6 @@ noinst_PROGRAMS = makemd5
  
@@ -10,6 +10,6 @@ $NetBSD: patch-an,v 1.1 2004/01/09 20:29:47 jlam Exp $
 -	-rm -f md5global.h
 -	./makemd5 md5global.h
 -
+ EXTRA_DIST = NTMakefile
+ 
  if MACOSX
- framedir = /Library/Frameworks/SASL2.framework
- frameheaderdir = $(framedir)/Versions/A/Headers
diff --git a/security/cyrus-sasl2/patches/patch-ao b/security/cyrus-sasl2/patches/patch-ao
index 7037c9778fd..bbe87007a22 100644
--- a/security/cyrus-sasl2/patches/patch-ao
+++ b/security/cyrus-sasl2/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.2 2004/02/14 03:16:59 jlam Exp $
+$NetBSD: patch-ao,v 1.3 2004/03/29 05:47:31 jlam Exp $
 
---- include/Makefile.in.orig	Mon Dec  1 08:35:06 2003
+--- include/Makefile.in.orig	Wed Mar 10 10:56:11 2004
 +++ include/Makefile.in
-@@ -558,9 +558,6 @@ uninstall-am: uninstall-frameheaderDATA 
+@@ -560,9 +560,6 @@ uninstall-am: uninstall-frameheaderDATA 
  	uninstall-info-am uninstall-saslincludeHEADERS