Update security/cyrus-sasl2 and associated plugins to 2.1.20. Changes

from version 2.1.19 include:

* Fixes to cram plugin to avoid attempting to canonify uninitialized data
  (This removes the need for patch-af).
* NTLM portability fixes.
* Avoid potential attack using SASL_PATH when sasl is used in a setuid
  environment.
* A trivial number of small bugfixes.

20 files changed, 133 insertions, 209 deletions

diff --git a/security/cy2-digestmd5/Makefile b/security/cy2-digestmd5/Makefile
index 472ccb52e9d..285b807d4d7 100644
--- a/security/cy2-digestmd5/Makefile
+++ b/security/cy2-digestmd5/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2004/10/03 00:18:07 tv Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/15 21:58:17 jlam Exp $
 
 PKGNAME=	${DISTNAME:S/cyrus-sasl/cy2-digestmd5/}
-PKGREVISION=	1
 COMMENT=	Cyrus SASL DIGEST-MD5 authentication plugin
 SASL_PLUGIN=	yes
 
diff --git a/security/cy2-gssapi/Makefile b/security/cy2-gssapi/Makefile
index 7a6f533a104..b659c69cd43 100644
--- a/security/cy2-gssapi/Makefile
+++ b/security/cy2-gssapi/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2004/10/03 00:18:07 tv Exp $
+# $NetBSD: Makefile,v 1.5 2004/11/15 21:58:17 jlam Exp $
 
 PKGNAME=	${DISTNAME:S/cyrus-sasl/cy2-gssapi/}
-PKGREVISION=	2
 COMMENT=	Cyrus SASL GSSAPI authentication plugin
 SASL_PLUGIN=	yes
 
diff --git a/security/cy2-ntlm/Makefile b/security/cy2-ntlm/Makefile
index b9a758c65b4..6bda4cc5a7f 100644
--- a/security/cy2-ntlm/Makefile
+++ b/security/cy2-ntlm/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2004/10/03 00:18:07 tv Exp $
+# $NetBSD: Makefile,v 1.11 2004/11/15 21:58:17 jlam Exp $
 
 PKGNAME=	${DISTNAME:S/cyrus-sasl/cy2-ntlm/}
-PKGREVISION=	1
 COMMENT=	Cyrus SASL NTLM authentication plugin
 SASL_PLUGIN=	yes
 
diff --git a/security/cy2-otp/Makefile b/security/cy2-otp/Makefile
index b5fba3025bd..5b911d99e11 100644
--- a/security/cy2-otp/Makefile
+++ b/security/cy2-otp/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2004/10/03 00:18:08 tv Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/15 21:58:17 jlam Exp $
 
 PKGNAME=	${DISTNAME:S/cyrus-sasl/cy2-otp/}
-PKGREVISION=	1
 COMMENT=	Cyrus SASL OTP authentication plugin
 SASL_PLUGIN=	yes
 
diff --git a/security/cy2-sql/Makefile b/security/cy2-sql/Makefile
index 4054ec146ec..3baf49f6e83 100644
--- a/security/cy2-sql/Makefile
+++ b/security/cy2-sql/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2004/10/03 00:18:08 tv Exp $
+# $NetBSD: Makefile,v 1.5 2004/11/15 21:58:17 jlam Exp $
 
 PKGNAME=	${DISTNAME:S/cyrus-sasl/cy2-sql/}
-PKGREVISION=	1
 COMMENT=	Cyrus SASL SQL authentication plugin
 SASL_PLUGIN=	yes
 
@@ -31,7 +30,7 @@ CONFIGURE_ARGS+=	--with-pgsql=${PGSQL_PREFIX}
 CONFIGURE_ARGS+=	--with-sqlite=${BUILDLINK_PREFIX.sqlite}
 .endif
 
-CONFIGURE_ARGS+=	--enable-sql		# LOGIN
+CONFIGURE_ARGS+=	--enable-sql
 
 BUILD_DIRS=	${WRKSRC}/plugins
 ALL_TARGET=	libsql.la
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index 54e81c2b649..140b3158dea 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2004/10/03 00:18:08 tv Exp $
+# $NetBSD: Makefile,v 1.39 2004/11/15 21:58:16 jlam Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=	3
+PKGREVISION=	# empty
 SVR4_PKGNAME=	csasl
 COMMENT=	Simple Authentication and Security Layer
 
@@ -67,9 +67,9 @@ OWN_DIRS=		${PLUGINDIR}
 MESSAGE_SUBST+=		_PLUGINDIR=${_PLUGINDIR}
 
 post-install:
-	${INSTALL_DATA_DIR} ${HTMLDIR}
+	${INSTALL_DATA_DIR} ${DOCDIR}
 	cd ${WRKSRC}/doc; for file in *.fig *.html *.txt; do		\
-		${INSTALL_DATA} $$file ${HTMLDIR};			\
+		${INSTALL_DATA} $$file ${DOCDIR};			\
 	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/cyrus-sasl2/Makefile.common b/security/cyrus-sasl2/Makefile.common
index a2f1865d375..9ad935d2ff8 100644
--- a/security/cyrus-sasl2/Makefile.common
+++ b/security/cyrus-sasl2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.25 2004/09/12 05:08:49 jlam Exp $
+# $NetBSD: Makefile.common,v 1.26 2004/11/15 21:58:17 jlam Exp $
 #
 # This file is currently included by:
 #
@@ -16,7 +16,7 @@
 # This Makefile fragment should be included _below_ any SASL_PLUGIN
 # definition and _above_ any CONFIGURE_ARGS definitions.
 
-DISTNAME=	cyrus-sasl-2.1.19
+DISTNAME=	cyrus-sasl-2.1.20
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/
@@ -34,6 +34,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 .if defined(SASL_PLUGIN) && !empty(SASL_PLUGIN:M[yY][eE][sS])
 .  include "../../security/cyrus-sasl2/buildlink3.mk"
+CPPFLAGS+=		-I${BUILDLINK_PREFIX.cyrus-sasl}/include/sasl
 .  if defined(DEFAULT_VIEW.cyrus-sasl)
 DEFAULT_VIEW.${PKGBASE}=	${DEFAULT_VIEW.cyrus-sasl}
 .  endif
@@ -47,7 +48,7 @@ USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 MAKE_ENV+=		SHLIBTOOL=${SHLIBTOOL:Q}
 
-HTMLDIR=		${PREFIX}/share/doc/html/cyrus-sasl
+DOCDIR=			${PREFIX}/share/doc/cyrus-sasl
 PLUGINDIR=		${PREFIX}/lib/sasl2
 _PLUGINDIR=		${VIEWBASE}/lib/sasl2
 
diff --git a/security/cyrus-sasl2/PLIST b/security/cyrus-sasl2/PLIST
index d4029f2da61..897bd4fc673 100644
--- a/security/cyrus-sasl2/PLIST
+++ b/security/cyrus-sasl2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:52 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/11/15 21:58:17 jlam Exp $
 include/sasl/hmac-md5.h
 include/sasl/md5.h
 include/sasl/md5global.h
@@ -54,45 +54,46 @@ man/man8/sasldblistusers2.8
 man/man8/saslpasswd2.8
 sbin/sasldblistusers2
 sbin/saslpasswd2
-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-sasl-anon-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-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
-share/doc/html/cyrus-sasl/index.html
-share/doc/html/cyrus-sasl/install.html
-share/doc/html/cyrus-sasl/macosx.html
-share/doc/html/cyrus-sasl/mechanisms.html
-share/doc/html/cyrus-sasl/options.html
-share/doc/html/cyrus-sasl/plugprog.html
-share/doc/html/cyrus-sasl/programming.html
-share/doc/html/cyrus-sasl/readme.html
-share/doc/html/cyrus-sasl/rfc1321.txt
-share/doc/html/cyrus-sasl/rfc1939.txt
-share/doc/html/cyrus-sasl/rfc2104.txt
-share/doc/html/cyrus-sasl/rfc2195.txt
-share/doc/html/cyrus-sasl/rfc2222.txt
-share/doc/html/cyrus-sasl/rfc2243.txt
-share/doc/html/cyrus-sasl/rfc2245.txt
-share/doc/html/cyrus-sasl/rfc2289.txt
-share/doc/html/cyrus-sasl/rfc2444.txt
-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
-share/doc/html/cyrus-sasl/windows.html
-@dirrm share/doc/html/cyrus-sasl
+share/doc/cyrus-sasl/advanced.html
+share/doc/cyrus-sasl/appconvert.html
+share/doc/cyrus-sasl/components.html
+share/doc/cyrus-sasl/draft-burdis-cat-srp-sasl-08.txt
+share/doc/cyrus-sasl/draft-ietf-sasl-anon-02.txt
+share/doc/cyrus-sasl/draft-ietf-sasl-crammd5-01.txt
+share/doc/cyrus-sasl/draft-ietf-sasl-gssapi-00.txt
+share/doc/cyrus-sasl/draft-ietf-sasl-plain-03.txt
+share/doc/cyrus-sasl/draft-ietf-sasl-rfc2222bis-03.txt
+share/doc/cyrus-sasl/draft-ietf-sasl-rfc2831bis-02.txt
+share/doc/cyrus-sasl/draft-ietf-sasl-saslprep-04.txt
+share/doc/cyrus-sasl/draft-murchison-sasl-login-00.txt
+share/doc/cyrus-sasl/draft-newman-sasl-c-api-01.txt
+share/doc/cyrus-sasl/gssapi.html
+share/doc/cyrus-sasl/index.html
+share/doc/cyrus-sasl/install.html
+share/doc/cyrus-sasl/macosx.html
+share/doc/cyrus-sasl/mechanisms.html
+share/doc/cyrus-sasl/options.html
+share/doc/cyrus-sasl/os390.html
+share/doc/cyrus-sasl/plugprog.html
+share/doc/cyrus-sasl/programming.html
+share/doc/cyrus-sasl/readme.html
+share/doc/cyrus-sasl/rfc1321.txt
+share/doc/cyrus-sasl/rfc1939.txt
+share/doc/cyrus-sasl/rfc2104.txt
+share/doc/cyrus-sasl/rfc2195.txt
+share/doc/cyrus-sasl/rfc2222.txt
+share/doc/cyrus-sasl/rfc2243.txt
+share/doc/cyrus-sasl/rfc2245.txt
+share/doc/cyrus-sasl/rfc2289.txt
+share/doc/cyrus-sasl/rfc2444.txt
+share/doc/cyrus-sasl/rfc2595.txt
+share/doc/cyrus-sasl/rfc2831.txt
+share/doc/cyrus-sasl/rfc2945.txt
+share/doc/cyrus-sasl/rfc3174.txt
+share/doc/cyrus-sasl/server-plugin-flow.fig
+share/doc/cyrus-sasl/sysadmin.html
+share/doc/cyrus-sasl/testing.txt
+share/doc/cyrus-sasl/upgrading.html
+share/doc/cyrus-sasl/windows.html
+@dirrm share/doc/cyrus-sasl
 @dirrm include/sasl
diff --git a/security/cyrus-sasl2/distinfo b/security/cyrus-sasl2/distinfo
index 2eb2bb4af4e..ec6d1c87f7d 100644
--- a/security/cyrus-sasl2/distinfo
+++ b/security/cyrus-sasl2/distinfo
@@ -1,21 +1,17 @@
-$NetBSD: distinfo,v 1.22 2004/08/13 18:08:02 jlam Exp $
+$NetBSD: distinfo,v 1.23 2004/11/15 21:58:17 jlam Exp $
 
-SHA1 (cyrus-sasl-2.1.19.tar.gz) = 9512d70ecea33b9d44e69d185a323a0f7b133705
-Size (cyrus-sasl-2.1.19.tar.gz) = 1537350 bytes
-SHA1 (patch-aa) = c81a2f854ee445fde7a480c9f6c64dfa55f168c2
-SHA1 (patch-ab) = 33be71f563bdfeee75c9b965ca8ef8d85d38968a
-SHA1 (patch-ac) = 8536fec6241a87e2a199b4aa8da788a2439f5507
-SHA1 (patch-ad) = 351184f685a8e71f1add59452cca44728ddfec25
+SHA1 (cyrus-sasl-2.1.20.tar.gz) = d1eec5644c4e87edb95fa5ab8bf124cfdf277eb6
+Size (cyrus-sasl-2.1.20.tar.gz) = 1775163 bytes
+SHA1 (patch-aa) = a6da3823a3a8bd9e90f757245e0e5a60f44123ab
+SHA1 (patch-ab) = f3e86c1125e302466e876e5bf31764b9b5cff3ac
+SHA1 (patch-ac) = e03731395cefef42c5070021c09928c939fc6a58
+SHA1 (patch-ad) = 8a6663e358a67c27380e37be72d71841fd553fdf
 SHA1 (patch-ae) = cfd176eea2e1dba320be14a7d9bf2a4426ba39ad
-SHA1 (patch-af) = c024ff3fe7712b9fce2e064bdc037323838231ef
 SHA1 (patch-ag) = f62062ecee2bf133572d09049a77c5624ddb7f70
 SHA1 (patch-ah) = 1b0cd2d822dac2b01523fbc712f6544cd9fc298d
-SHA1 (patch-ai) = 6cc7ee82c3e0faad0c39868ac156fddf53d36ba7
-SHA1 (patch-ak) = 32521eef7f8a9b590089f078edaa706c74d91651
-SHA1 (patch-al) = fd99c13ec5618888eb79201363475da6e376d7cb
-SHA1 (patch-am) = f0bd15b4f55e5204936a25c558d4bd2b1d4816d5
-SHA1 (patch-an) = d6ccabc24d16b63a1c1f4b4f2667b60c37aa88ec
-SHA1 (patch-ao) = c4388bd3d467a91539e9adedc287a2a7ba333744
+SHA1 (patch-ai) = a85078230b06189f4705cfd48b7a6156fbd6ee56
+SHA1 (patch-ak) = 1f727d2bc0536ac5d9ba28f5e4cf01c6c1998987
+SHA1 (patch-al) = a4d7aa722b334df6b7b9f532b02eb5bc7a797486
 SHA1 (patch-ap) = 3c1f4e554fd49772d2f8f279af3b571eca3a7076
 SHA1 (patch-aq) = 7e4375f0bc8c5b346d050a269fd2eea87f0aaf7c
 SHA1 (patch-ar) = f03a9bddfeb7aeb8af19c2bde315a630ce03f331
diff --git a/security/cyrus-sasl2/patches/patch-aa b/security/cyrus-sasl2/patches/patch-aa
index aaf4acfe4ac..cf67c15ca4d 100644
--- a/security/cyrus-sasl2/patches/patch-aa
+++ b/security/cyrus-sasl2/patches/patch-aa
@@ -1,15 +1,12 @@
-$NetBSD: patch-aa,v 1.8 2004/08/04 19:41:07 jlam Exp $
+$NetBSD: patch-aa,v 1.9 2004/11/15 21:58:17 jlam Exp $
 
---- configure.in.orig	Fri Jul  2 15:39:34 2004
+--- configure.in.orig	2004-10-24 16:05:13.000000000 -0400
 +++ configure.in
-@@ -485,10 +485,6 @@ SASL_KERBEROS_V4_CHK
+@@ -486,7 +486,6 @@ SASL_KERBEROS_V4_CHK
  SASL_GSSAPI_CHK
- SASL_PLAIN_CHK
  
--if test "$gssapi" != "no"; then
+ 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,
+   mutex_default="no"
+   if test "$gss_impl" = "mit"; then
+      mutex_default="yes"
diff --git a/security/cyrus-sasl2/patches/patch-ab b/security/cyrus-sasl2/patches/patch-ab
index 7b031366e15..d77b5fb75d4 100644
--- a/security/cyrus-sasl2/patches/patch-ab
+++ b/security/cyrus-sasl2/patches/patch-ab
@@ -1,17 +1,17 @@
-$NetBSD: patch-ab,v 1.7 2004/08/04 19:41:07 jlam Exp $
+$NetBSD: patch-ab,v 1.8 2004/11/15 21:58:17 jlam Exp $
 
---- aclocal.m4.orig	Fri Jul  2 15:39:50 2004
+--- aclocal.m4.orig	2004-10-24 16:21:05.000000000 -0400
 +++ aclocal.m4
-@@ -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
-@@ -2910,7 +2910,10 @@ AC_DEFUN([SASL_GSSAPI_CHK],[
+@@ -1678,7 +1678,7 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB],
+ 	    LIBS="$saved_LIBS -l$dbname"
+ 	    AC_TRY_LINK([#include <db.h>],
+ 	    [db_create(NULL, NULL, 0);],
+-	    BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db,
++	    BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db; break,
+             dblib="no")
+           done
+         if test "$dblib" = "no"; then
+@@ -2923,7 +2923,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-ac b/security/cyrus-sasl2/patches/patch-ac
index 6276a35db3b..25b92b480be 100644
--- a/security/cyrus-sasl2/patches/patch-ac
+++ b/security/cyrus-sasl2/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2004/02/14 07:45:36 jlam Exp $
+$NetBSD: patch-ac,v 1.5 2004/11/15 21:58:17 jlam Exp $
 
---- cmulocal/sasl2.m4.orig	Thu Nov 27 15:07:18 2003
+--- cmulocal/sasl2.m4.orig	2004-09-13 17:06:34.000000000 -0400
 +++ cmulocal/sasl2.m4
-@@ -221,7 +221,10 @@ AC_DEFUN([SASL_GSSAPI_CHK],[
+@@ -227,7 +227,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
index 543b4df6f64..5f247e54218 100644
--- a/security/cyrus-sasl2/patches/patch-ad
+++ b/security/cyrus-sasl2/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.4 2004/03/29 05:47:31 jlam Exp $
+$NetBSD: patch-ad,v 1.5 2004/11/15 21:58:17 jlam Exp $
 
---- cmulocal/berkdb.m4.orig	Sat Feb 14 16:13:03 2004
+--- cmulocal/berkdb.m4.orig	2004-09-13 17:57:17.000000000 -0400
 +++ 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
+@@ -217,7 +217,7 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB],
+ 	    LIBS="$saved_LIBS -l$dbname"
+ 	    AC_TRY_LINK([#include <db.h>],
+ 	    [db_create(NULL, NULL, 0);],
+-	    BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db,
++	    BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db; break,
+             dblib="no")
+           done
+         if test "$dblib" = "no"; then
diff --git a/security/cyrus-sasl2/patches/patch-af b/security/cyrus-sasl2/patches/patch-af
deleted file mode 100644
index a740445d118..00000000000
--- a/security/cyrus-sasl2/patches/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-af,v 1.6 2004/03/29 05:47:31 jlam Exp $
-
---- plugins/cram.c.orig	Mon Dec 15 15:04:22 2003
-+++ plugins/cram.c
-@@ -538,7 +538,8 @@ static int crammd5_client_mech_step(void
- 	
- 	if ((auth_result != SASL_OK) && (auth_result != SASL_INTERACT))
- 	    return auth_result;
--    }
-+    } else
-+	authid = oparams->authid;
-     
-     /* try to get the password */
-     if (password == NULL) {
diff --git a/security/cyrus-sasl2/patches/patch-ai b/security/cyrus-sasl2/patches/patch-ai
index 7159350cd5a..8a24544a870 100644
--- a/security/cyrus-sasl2/patches/patch-ai
+++ b/security/cyrus-sasl2/patches/patch-ai
@@ -1,8 +1,26 @@
-$NetBSD: patch-ai,v 1.9 2004/08/04 19:41:07 jlam Exp $
+$NetBSD: patch-ai,v 1.10 2004/11/15 21:58:17 jlam Exp $
 
---- configure.orig	Fri Jul  2 15:39:54 2004
+--- configure.orig	2004-10-24 16:21:08.000000000 -0400
 +++ configure
-@@ -10765,7 +10765,14 @@ if test $ac_cv_lib_resolv_res_search = y
+@@ -5160,7 +5160,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db
++  BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db; break
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -5916,7 +5916,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db
++  BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db; break
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -10680,7 +10680,14 @@ if test $ac_cv_lib_resolv_res_search = y
  fi
  
    SASL_MECHS="$SASL_MECHS libgssapiv2.la"
@@ -18,18 +36,15 @@ $NetBSD: patch-ai,v 1.9 2004/08/04 19:41:07 jlam Exp $
  
    cmu_save_LIBS="$LIBS"
    LIBS="$LIBS $GSSAPIBASE_LIBS"
-@@ -10899,14 +10906,6 @@ _ACEOF
- echo "${ECHO_T}disabled" >&6
-  fi
+@@ -10778,11 +10785,6 @@ fi
  
--
--if test "$gssapi" != "no"; then
+ 
+ if test "$gssapi" != "no"; then
 -
 -cat >>confdefs.h <<\_ACEOF
 -#define STATIC_GSSAPIV2
 -_ACEOF
 -
--fi
- 
- # Check whether --enable-anon or --disable-anon was given.
- if test "${enable_anon+set}" = set; then
+   mutex_default="no"
+   if test "$gss_impl" = "mit"; then
+      mutex_default="yes"
diff --git a/security/cyrus-sasl2/patches/patch-ak b/security/cyrus-sasl2/patches/patch-ak
index 8c5514b2666..9159c001302 100644
--- a/security/cyrus-sasl2/patches/patch-ak
+++ b/security/cyrus-sasl2/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.4 2004/03/29 05:47:31 jlam Exp $
+$NetBSD: patch-ak,v 1.5 2004/11/15 21:58:17 jlam Exp $
 
---- Makefile.am.orig	Wed Mar 10 10:51:35 2004
+--- Makefile.am.orig	2004-10-19 19:48:11.000000000 -0400
 +++ Makefile.am
-@@ -68,7 +68,7 @@ else 
+@@ -69,7 +69,7 @@ else 
  INSTALLOSX = 
  endif
  
diff --git a/security/cyrus-sasl2/patches/patch-al b/security/cyrus-sasl2/patches/patch-al
index 3ce14d10671..fbc4f2a3271 100644
--- a/security/cyrus-sasl2/patches/patch-al
+++ b/security/cyrus-sasl2/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.4 2004/08/04 19:41:07 jlam Exp $
+$NetBSD: patch-al,v 1.5 2004/11/15 21:58:17 jlam Exp $
 
---- Makefile.in.orig	Fri Jul  2 15:39:53 2004
+--- Makefile.in.orig	2004-10-24 16:21:09.000000000 -0400
 +++ Makefile.in
-@@ -237,7 +237,7 @@ target_vendor = @target_vendor@
+@@ -237,7 +237,7 @@ AUTOMAKE_OPTIONS = 1.7
  @MACOSX_FALSE@INSTALLOSX = 
  @MACOSX_TRUE@INSTALLOSX = install-exec-local-osx
  
diff --git a/security/cyrus-sasl2/patches/patch-am b/security/cyrus-sasl2/patches/patch-am
deleted file mode 100644
index 2902b04b968..00000000000
--- a/security/cyrus-sasl2/patches/patch-am
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-am,v 1.1 2004/01/09 20:29:47 jlam Exp $
-
---- include/md5global.h.orig	Tue Jul 15 11:43:46 2003
-+++ include/md5global.h
-@@ -3,6 +3,13 @@
- #ifndef MD5GLOBAL_H
- #define MD5GLOBAL_H
- 
-+#ifdef HAVE_STDINT_H
-+#include <stdint.h>
-+#endif
-+#ifdef HAVE_INTTYPES_H
-+#include <inttypes.h>
-+#endif
-+
- /* PROTOTYPES should be set to one if and only if the compiler supports
-   function argument prototyping.
- The following makes PROTOTYPES default to 0 if it has not already
-@@ -15,13 +22,13 @@ The following makes PROTOTYPES default t
- /* POINTER defines a generic pointer type */
- typedef unsigned char *POINTER;
- 
--typedef signed char INT1;		/*  8 bits */
--typedef short INT2;			/* 16 bits */
--typedef int INT4;			/* 32 bits */
-+typedef int8_t INT1;		/*  8 bits */
-+typedef int16_t INT2;		/* 16 bits */
-+typedef int32_t INT4;		/* 32 bits */
- /* There is no 64 bit type */
--typedef unsigned char UINT1;		/*  8 bits */
--typedef unsigned short UINT2;		/* 16 bits */
--typedef unsigned int UINT4;		/* 32 bits */
-+typedef uint8_t UINT1;		/*  8 bits */
-+typedef uint16_t UINT2;		/* 16 bits */
-+typedef uint32_t UINT4;		/* 32 bits */
- /* There is no 64 bit type */
- 
- /* PROTO_LIST is defined depending on how PROTOTYPES is defined above.
diff --git a/security/cyrus-sasl2/patches/patch-an b/security/cyrus-sasl2/patches/patch-an
deleted file mode 100644
index 5ae761aed25..00000000000
--- a/security/cyrus-sasl2/patches/patch-an
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-an,v 1.2 2004/03/29 05:47:31 jlam Exp $
-
---- include/Makefile.am.orig	Wed Mar 10 10:51:35 2004
-+++ include/Makefile.am
-@@ -51,10 +51,6 @@ noinst_PROGRAMS = makemd5
- 
- makemd5_SOURCES = makemd5.c
- 
--md5global.h: makemd5
--	-rm -f md5global.h
--	./makemd5 md5global.h
--
- EXTRA_DIST = NTMakefile
- 
- if MACOSX
diff --git a/security/cyrus-sasl2/patches/patch-ao b/security/cyrus-sasl2/patches/patch-ao
deleted file mode 100644
index ca2bfb240c9..00000000000
--- a/security/cyrus-sasl2/patches/patch-ao
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ao,v 1.4 2004/08/04 19:41:07 jlam Exp $
-
---- include/Makefile.in.orig	Fri Jul  2 15:40:19 2004
-+++ include/Makefile.in
-@@ -562,9 +562,6 @@ uninstall-am: uninstall-frameheaderDATA 
- 	uninstall-info-am uninstall-saslincludeHEADERS
- 
- 
--md5global.h: makemd5
--	-rm -f md5global.h
--	./makemd5 md5global.h
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT: