Updated security/cyrus-sasl to 2.1.21. Changes from version 2.1.20 include:

* lib/dlopen.c: log the reason for opendir() failure
  when loading plugin.
* lib/common.c: honor log level setting
* sample/sample-client.c, sample/sample-server.c: Fixed several
  64 bit portability warnings.
* utils/testsuite.c: Fixed several 64 bit portability warnings.
* utils/saslpasswd.c: Fixed typo in an auxprop name.
* include/saslplug.h, lib/common.c, lib/saslint.h,
  lib/server.c: Added sasl_server_plugin_info().
* lib/common.c: initialize path in case caller didn't.

19 files changed, 100 insertions, 161 deletions

diff --git a/security/cyrus-sasl/DEINSTALL b/security/cyrus-sasl/DEINSTALL
index 858ba8a8d2b..2c96993c6ee 100644
--- a/security/cyrus-sasl/DEINSTALL
+++ b/security/cyrus-sasl/DEINSTALL
@@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $NetBSD: DEINSTALL,v 1.8 2006/04/13 21:32:40 wiz Exp $
+# $NetBSD: DEINSTALL,v 1.9 2006/04/18 17:41:30 jlam Exp $
 
 SASLDB=@PKG_SYSCONFDIR@/sasldb.db
 
 case ${STAGE} in
 POST-DEINSTALL)
-	if [ -f ${SASLDB} ]; then
+	if ${TEST} -f ${SASLDB}; then
 		${CAT} << EOF
 ===========================================================================
 You may want to remove the SASL password data file:
diff --git a/security/cyrus-sasl/MESSAGE b/security/cyrus-sasl/MESSAGE
index 0df78cbb432..9f145cac201 100644
--- a/security/cyrus-sasl/MESSAGE
+++ b/security/cyrus-sasl/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2006/04/13 21:32:40 wiz Exp $
+$NetBSD: MESSAGE,v 1.2 2006/04/18 17:41:30 jlam Exp $
 
 ${PKGNAME} by default does *not* install any authentication plugin
 modules.  Until the necessary authentication plugin modules are
@@ -9,7 +9,7 @@ will probably get errors about "no appropriate mechs available".
 ${PKGNAME} will use the following directory as the default
 path to its plugin modules:
 
-	${_PLUGINDIR}
+	${PLUGINDIR}
 
 The search path for plugin modules can be customized by setting the
 SASL_PATH variable to a colon-delimted list of directories in the shell
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index dd926aa4c63..6efb9de59fa 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2006/04/13 21:32:40 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2006/04/18 17:41:30 jlam Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=	3
 SVR4_PKGNAME=	csasl
 COMMENT=	Simple Authentication and Security Layer
 
@@ -60,7 +59,7 @@ BUILD_DEFS+=		CYRUS_USER CYRUS_GROUP
 PKG_GROUPS=		${CYRUS_GROUP}
 PKG_USERS=		${CYRUS_USER}:${CYRUS_GROUP}::::${SH}
 
-MESSAGE_SUBST+=		_PLUGINDIR=${_PLUGINDIR:Q}
+MESSAGE_SUBST+=		PLUGINDIR=${PLUGINDIR:Q}
 
 post-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
diff --git a/security/cyrus-sasl/Makefile.common b/security/cyrus-sasl/Makefile.common
index 3a722a52366..16dd7a1c1ea 100644
--- a/security/cyrus-sasl/Makefile.common
+++ b/security/cyrus-sasl/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2006/04/13 21:32:40 wiz Exp $
+# $NetBSD: Makefile.common,v 1.9 2006/04/18 17:41:30 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.20
+DISTNAME=	cyrus-sasl-2.1.21
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/
@@ -27,30 +27,26 @@ HOMEPAGE=	http://asg.web.cmu.edu/sasl/
 DISTINFO_FILE=		${.CURDIR}/../cyrus-sasl/distinfo
 PATCHDIR=		${.CURDIR}/../cyrus-sasl/patches
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(SASL_PLUGIN) && !empty(SASL_PLUGIN:M[yY][eE][sS])
+BUILDLINK_ABI_DEPENDS.cyrus-sasl+=	\
+			cyrus-sasl>=${PKGVERSION:S/nb*//}
 .  include "../../security/cyrus-sasl/buildlink3.mk"
 CPPFLAGS+=		-I${BUILDLINK_PREFIX.cyrus-sasl}/include/sasl
-.  if defined(DEFAULT_VIEW.cyrus-sasl)
-DEFAULT_VIEW.${PKGBASE}=	${DEFAULT_VIEW.cyrus-sasl}
-.  endif
 .endif
 
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
 
 USE_LIBTOOL=		yes
-LTCONFIG_OVERRIDE+=	${WRKSRC}/config/ltconfig
 MAKE_ENV+=		SHLIBTOOL=${SHLIBTOOL:Q}
 
 DOCDIR=			${PREFIX}/share/doc/cyrus-sasl
 PLUGINDIR=		${PREFIX}/lib/sasl2
-_PLUGINDIR=		${VIEWBASE}/lib/sasl2
 
-CONFIGURE_ARGS+=	--with-plugindir=${_PLUGINDIR:Q}
+CONFIGURE_ARGS+=	--with-plugindir=${PLUGINDIR:Q}
+CONFIGURE_ARGS+=	--disable-java
 
 # Authentication mechanisms
 CONFIGURE_ARGS+=	--disable-anon		# ANONYMOUS
@@ -59,9 +55,11 @@ CONFIGURE_ARGS+=	--disable-cram		# CRAM-MD5
 CONFIGURE_ARGS+=	--disable-digest	# DIGEST-MD5
 CONFIGURE_ARGS+=	--disable-gssapi	# GSSAPI
 CONFIGURE_ARGS+=	--disable-krb4		# KERBEROS_V4
+CONFIGURE_ARGS+=	--disable-ldapdb	# LDAP
 CONFIGURE_ARGS+=	--disable-login		# LOGIN
 CONFIGURE_ARGS+=	--disable-ntlm		# NTLM
 CONFIGURE_ARGS+=	--disable-otp		# OTP
+CONFIGURE_ARGS+=	--disable-passdss	# PASSDSS
 CONFIGURE_ARGS+=	--disable-plain		# PLAIN
 CONFIGURE_ARGS+=	--disable-sql		# SQL
 CONFIGURE_ARGS+=	--disable-srp		# SRP
diff --git a/security/cyrus-sasl/PLIST b/security/cyrus-sasl/PLIST
index b414326da94..21a4eb0c511 100644
--- a/security/cyrus-sasl/PLIST
+++ b/security/cyrus-sasl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2006/04/13 21:32:40 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/04/18 17:41:30 jlam Exp $
 include/sasl/hmac-md5.h
 include/sasl/md5.h
 include/sasl/md5global.h
@@ -57,23 +57,23 @@ sbin/saslpasswd2
 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/draft-burdis-cat-srp-sasl-xx.txt
+share/doc/cyrus-sasl/draft-ietf-sasl-anon-xx.txt
+share/doc/cyrus-sasl/draft-ietf-sasl-crammd5-xx.txt
+share/doc/cyrus-sasl/draft-ietf-sasl-gssapi-xx.txt
+share/doc/cyrus-sasl/draft-ietf-sasl-plain-xx.txt
+share/doc/cyrus-sasl/draft-ietf-sasl-rfc2222bis-xx.txt
+share/doc/cyrus-sasl/draft-ietf-sasl-rfc2831bis-xx.txt
+share/doc/cyrus-sasl/draft-ietf-sasl-saslprep-xx.txt
+share/doc/cyrus-sasl/draft-murchison-sasl-login-xx.txt
+share/doc/cyrus-sasl/draft-newman-sasl-c-api-xx.txt
+share/doc/cyrus-sasl/draft-newman-sasl-passdss-xx.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
diff --git a/security/cyrus-sasl/buildlink3.mk b/security/cyrus-sasl/buildlink3.mk
index 8ae0f991b2a..0a186c38e9c 100644
--- a/security/cyrus-sasl/buildlink3.mk
+++ b/security/cyrus-sasl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/04/13 21:32:40 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/18 17:41:30 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 CYRUS_SASL_BUILDLINK3_MK:=	${CYRUS_SASL_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncyrus-sasl}
 BUILDLINK_PACKAGES+=	cyrus-sasl
 
 .if !empty(CYRUS_SASL_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.cyrus-sasl+=		cyrus-sasl>=2.1.12
+BUILDLINK_API_DEPENDS.cyrus-sasl+=	cyrus-sasl>=2.1.12
 BUILDLINK_ABI_DEPENDS.cyrus-sasl?=	cyrus-sasl>=2.1.20nb3
 BUILDLINK_PKGSRCDIR.cyrus-sasl?=	../../security/cyrus-sasl
 .endif	# CYRUS_SASL_BUILDLINK3_MK
diff --git a/security/cyrus-sasl/distinfo b/security/cyrus-sasl/distinfo
index 1261f8bb3c4..3b49a6a0606 100644
--- a/security/cyrus-sasl/distinfo
+++ b/security/cyrus-sasl/distinfo
@@ -1,21 +1,19 @@
-$NetBSD: distinfo,v 1.14 2006/04/13 21:32:40 wiz Exp $
+$NetBSD: distinfo,v 1.15 2006/04/18 17:41:30 jlam Exp $
 
-SHA1 (cyrus-sasl-2.1.20.tar.gz) = d1eec5644c4e87edb95fa5ab8bf124cfdf277eb6
-RMD160 (cyrus-sasl-2.1.20.tar.gz) = 45f8d9e91e5ba4840f57d2f0526b8f41f90bbb8c
-Size (cyrus-sasl-2.1.20.tar.gz) = 1775163 bytes
-SHA1 (patch-aa) = c3542cc0e7887fa92b8b3cfa3c970b0dc2f27a8d
-SHA1 (patch-ab) = f3e86c1125e302466e876e5bf31764b9b5cff3ac
-SHA1 (patch-ac) = e03731395cefef42c5070021c09928c939fc6a58
-SHA1 (patch-ad) = 8a6663e358a67c27380e37be72d71841fd553fdf
+SHA1 (cyrus-sasl-2.1.21.tar.gz) = 6449f730c963d29d43600a95373a6e2db52d6d66
+RMD160 (cyrus-sasl-2.1.21.tar.gz) = 93e0e1868453c5781602b5cce23e746b8823a26b
+Size (cyrus-sasl-2.1.21.tar.gz) = 1584931 bytes
+SHA1 (patch-aa) = 0267569a89aade1c5aa455d618ebb0016022ecc4
+SHA1 (patch-ab) = 55cd67f8856239ab90696456a16af9498a4354ae
+SHA1 (patch-ac) = 671c462164f0c763b4a646aca9afe293be9448ef
+SHA1 (patch-ad) = c3fe38777a281b6800115711b732254f72887107
 SHA1 (patch-ae) = cfd176eea2e1dba320be14a7d9bf2a4426ba39ad
 SHA1 (patch-af) = 40ec1378971536daddc543a66a1923451a4c381c
-SHA1 (patch-ag) = f62062ecee2bf133572d09049a77c5624ddb7f70
-SHA1 (patch-ah) = 1b0cd2d822dac2b01523fbc712f6544cd9fc298d
-SHA1 (patch-ai) = 4181f13bf69fec11aa42d98bcb85d5d8bd83dfe2
+SHA1 (patch-ag) = 6a2713504078dad681dcc6f7ba296972d03d5b15
+SHA1 (patch-ah) = 595e58bd756e75bda5f25a19119f2fc7c27bc7d9
+SHA1 (patch-ai) = 6309e9117be65e64de635cb004385e9badcd687c
 SHA1 (patch-ak) = 1f727d2bc0536ac5d9ba28f5e4cf01c6c1998987
-SHA1 (patch-al) = a4d7aa722b334df6b7b9f532b02eb5bc7a797486
-SHA1 (patch-ap) = 3c1f4e554fd49772d2f8f279af3b571eca3a7076
-SHA1 (patch-aq) = 7e4375f0bc8c5b346d050a269fd2eea87f0aaf7c
-SHA1 (patch-ar) = f03a9bddfeb7aeb8af19c2bde315a630ce03f331
-SHA1 (patch-as) = c8cebac879afda69b282f5c334ffb2c8b5eee6cd
+SHA1 (patch-al) = d706fb15cdff279251bed0a2c0a7b5cd1bad3584
+SHA1 (patch-ap) = eb87cd283f99da69916a7eb251000f2d9254f17d
+SHA1 (patch-aq) = 6d2f126a52c589a4789d1d3e3d3e8ab5e31cd82f
 SHA1 (patch-at) = cf35ac66873a5bc18216e13a1240019da99563ca
diff --git a/security/cyrus-sasl/patches/patch-aa b/security/cyrus-sasl/patches/patch-aa
index 4022e64a101..2327ba38e33 100644
--- a/security/cyrus-sasl/patches/patch-aa
+++ b/security/cyrus-sasl/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.7 2006/04/13 21:32:40 wiz Exp $
+$NetBSD: patch-aa,v 1.8 2006/04/18 17:41:30 jlam Exp $
 
---- configure.in.orig	2005-02-15 07:16:40.000000000 -0500
+--- configure.in.orig	2005-05-07 00:54:18.000000000 -0400
 +++ configure.in
 @@ -44,12 +44,7 @@ dnl
  AC_INIT(lib/saslint.h)
@@ -15,7 +15,7 @@ $NetBSD: patch-aa,v 1.7 2006/04/13 21:32:40 wiz Exp $
  
  AC_CONFIG_AUX_DIR(config)
  AC_CANONICAL_HOST
-@@ -486,7 +481,6 @@ SASL_KERBEROS_V4_CHK
+@@ -506,7 +501,6 @@ SASL_KERBEROS_V4_CHK
  SASL_GSSAPI_CHK
  
  if test "$gssapi" != "no"; then
diff --git a/security/cyrus-sasl/patches/patch-ab b/security/cyrus-sasl/patches/patch-ab
index 361d4d3780d..c09079943f3 100644
--- a/security/cyrus-sasl/patches/patch-ab
+++ b/security/cyrus-sasl/patches/patch-ab
@@ -1,23 +1,25 @@
-$NetBSD: patch-ab,v 1.4 2006/04/13 21:32:40 wiz Exp $
+$NetBSD: patch-ab,v 1.5 2006/04/18 17:41:30 jlam Exp $
 
---- aclocal.m4.orig	2004-10-24 16:21:05.000000000 -0400
+--- aclocal.m4.orig	2005-05-15 01:58:02.000000000 -0400
 +++ aclocal.m4
-@@ -1678,7 +1678,7 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB],
+@@ -1696,7 +1696,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")
+ 	    if test "$dblib" = "berkeley"; then break; fi
            done
-         if test "$dblib" = "no"; then
-@@ -2923,7 +2923,10 @@ AC_DEFUN([SASL_GSSAPI_CHK],[
-   AC_MSG_RESULT(with implementation ${gss_impl})
+@@ -3010,8 +3010,11 @@ if test "$gssapi" != no; then
+   AC_MSG_RESULT([with implementation ${gss_impl}])
    AC_CHECK_LIB(resolv,res_search,GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv")
    SASL_MECHS="$SASL_MECHS libgssapiv2.la"
--  SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/gssapi.o"
+-  SASL_STATIC_OBJS="$SASL_STATIC_OBJS gssapi.o"
+-  SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/gssapi.c"
 +  if test "$enable_static" = yes; then
-+    SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/gssapi.o"
++    SASL_STATIC_OBJS="$SASL_STATIC_OBJS gssapi.o"
++    SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/gssapi.c"
 +    AC_DEFINE(STATIC_GSSAPIV2, [], [Link GSSAPI Staticly])
 +  fi
  
diff --git a/security/cyrus-sasl/patches/patch-ac b/security/cyrus-sasl/patches/patch-ac
index f3dcf63cf21..7759ed0cc78 100644
--- a/security/cyrus-sasl/patches/patch-ac
+++ b/security/cyrus-sasl/patches/patch-ac
@@ -1,14 +1,16 @@
-$NetBSD: patch-ac,v 1.3 2006/04/13 21:32:40 wiz Exp $
+$NetBSD: patch-ac,v 1.4 2006/04/18 17:41:30 jlam Exp $
 
---- cmulocal/sasl2.m4.orig	2004-09-13 17:06:34.000000000 -0400
+--- cmulocal/sasl2.m4.orig	2005-05-07 00:15:17.000000000 -0400
 +++ cmulocal/sasl2.m4
-@@ -227,7 +227,10 @@ AC_DEFUN([SASL_GSSAPI_CHK],[
-   AC_MSG_RESULT(with implementation ${gss_impl})
+@@ -249,8 +249,11 @@ if test "$gssapi" != no; then
+   AC_MSG_RESULT([with implementation ${gss_impl}])
    AC_CHECK_LIB(resolv,res_search,GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv")
    SASL_MECHS="$SASL_MECHS libgssapiv2.la"
--  SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/gssapi.o"
+-  SASL_STATIC_OBJS="$SASL_STATIC_OBJS gssapi.o"
+-  SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/gssapi.c"
 +  if test "$enable_static" = yes; then
-+    SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/gssapi.o"
++    SASL_STATIC_OBJS="$SASL_STATIC_OBJS gssapi.o"
++    SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/gssapi.c"
 +    AC_DEFINE(STATIC_GSSAPIV2, [], [Link GSSAPI Staticly])
 +  fi
  
diff --git a/security/cyrus-sasl/patches/patch-ad b/security/cyrus-sasl/patches/patch-ad
index 5b39a7f67cc..11af30062c4 100644
--- a/security/cyrus-sasl/patches/patch-ad
+++ b/security/cyrus-sasl/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.3 2006/04/13 21:32:40 wiz Exp $
+$NetBSD: patch-ad,v 1.4 2006/04/18 17:41:30 jlam Exp $
 
---- cmulocal/berkdb.m4.orig	2004-09-13 17:57:17.000000000 -0400
+--- cmulocal/berkdb.m4.orig	2005-04-26 15:14:07.000000000 -0400
 +++ cmulocal/berkdb.m4
-@@ -217,7 +217,7 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB],
+@@ -218,7 +218,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")
+ 	    if test "$dblib" = "berkeley"; then break; fi
            done
-         if test "$dblib" = "no"; then
diff --git a/security/cyrus-sasl/patches/patch-ag b/security/cyrus-sasl/patches/patch-ag
index 5aaa09d70e8..6753bf91623 100644
--- a/security/cyrus-sasl/patches/patch-ag
+++ b/security/cyrus-sasl/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.4 2006/04/13 21:32:40 wiz Exp $
+$NetBSD: patch-ag,v 1.5 2006/04/18 17:41:30 jlam Exp $
 
---- plugins/Makefile.in.orig	Fri Jul  2 15:40:16 2004
+--- plugins/Makefile.in.orig	2005-05-15 01:58:39.000000000 -0400
 +++ plugins/Makefile.in
-@@ -125,7 +125,7 @@ JAVA_TRUE = @JAVA_TRUE@
+@@ -126,7 +126,7 @@ JAVA_TRUE = @JAVA_TRUE@
  LDFLAGS = @LDFLAGS@
  LIBOBJS = @LIBOBJS@
  LIBS = @LIBS@
diff --git a/security/cyrus-sasl/patches/patch-ah b/security/cyrus-sasl/patches/patch-ah
index 3cc132f0539..6b4ac300e80 100644
--- a/security/cyrus-sasl/patches/patch-ah
+++ b/security/cyrus-sasl/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.5 2006/04/13 21:32:40 wiz Exp $
+$NetBSD: patch-ah,v 1.6 2006/04/18 17:41:30 jlam Exp $
 
---- lib/Makefile.in.orig	Fri Aug 13 13:53:00 2004
+--- lib/Makefile.in.orig	2005-05-15 01:58:38.000000000 -0400
 +++ lib/Makefile.in
-@@ -121,7 +121,7 @@ JAVA_TRUE = @JAVA_TRUE@
+@@ -122,7 +122,7 @@ JAVA_TRUE = @JAVA_TRUE@
  LDFLAGS = @LDFLAGS@
  LIBOBJS = @LIBOBJS@
  LIBS = @LIBS@
diff --git a/security/cyrus-sasl/patches/patch-ai b/security/cyrus-sasl/patches/patch-ai
index 7e499ef3205..f25affc41e8 100644
--- a/security/cyrus-sasl/patches/patch-ai
+++ b/security/cyrus-sasl/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.4 2006/04/13 21:32:40 wiz Exp $
+$NetBSD: patch-ai,v 1.5 2006/04/18 17:41:30 jlam Exp $
 
---- configure.orig	2004-10-24 16:21:08.000000000 -0400
+--- configure.orig	2005-05-15 01:58:28.000000000 -0400
 +++ configure
-@@ -1326,8 +1326,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -1331,8 +1331,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ai,v 1.4 2006/04/13 21:32:40 wiz Exp $
  if test -r "$cache_file"; then
    # Some versions of bash will fail to source /dev/null (special
    # files actually), so we avoid doing that.
-@@ -1345,8 +1343,6 @@ echo "$as_me: creating cache $cache_file
+@@ -1350,8 +1348,6 @@ echo "$as_me: creating cache $cache_file
    >$cache_file
  fi
  
@@ -20,7 +20,7 @@ $NetBSD: patch-ai,v 1.4 2006/04/13 21:32:40 wiz Exp $
  ac_aux_dir=
  for ac_dir in config $srcdir/config; do
    if test -f $ac_dir/install-sh; then
-@@ -5160,7 +5156,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -5155,7 +5151,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -29,7 +29,7 @@ $NetBSD: patch-ai,v 1.4 2006/04/13 21:32:40 wiz Exp $
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -5916,7 +5912,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -5912,7 +5908,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -38,13 +38,15 @@ $NetBSD: patch-ai,v 1.4 2006/04/13 21:32:40 wiz Exp $
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -10680,7 +10676,14 @@ if test $ac_cv_lib_resolv_res_search = y
+@@ -11158,8 +11154,15 @@ if test $ac_cv_lib_resolv_res_search = y
  fi
  
    SASL_MECHS="$SASL_MECHS libgssapiv2.la"
--  SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/gssapi.o"
+-  SASL_STATIC_OBJS="$SASL_STATIC_OBJS gssapi.o"
+-  SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/gssapi.c"
 +  if test "$enable_static" = yes; then
-+    SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/gssapi.o"
++    SASL_STATIC_OBJS="$SASL_STATIC_OBJS gssapi.o"
++    SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/gssapi.c"
 +
 +cat >>confdefs.h <<\_ACEOF
 +#define STATIC_GSSAPIV2
@@ -54,7 +56,7 @@ $NetBSD: patch-ai,v 1.4 2006/04/13 21:32:40 wiz Exp $
  
    cmu_save_LIBS="$LIBS"
    LIBS="$LIBS $GSSAPIBASE_LIBS"
-@@ -10778,11 +10781,6 @@ fi
+@@ -11257,11 +11260,6 @@ fi
  
  
  if test "$gssapi" != "no"; then
diff --git a/security/cyrus-sasl/patches/patch-al b/security/cyrus-sasl/patches/patch-al
index da19f913e36..cd30fb08e54 100644
--- a/security/cyrus-sasl/patches/patch-al
+++ b/security/cyrus-sasl/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.3 2006/04/13 21:32:41 wiz Exp $
+$NetBSD: patch-al,v 1.4 2006/04/18 17:41:30 jlam Exp $
 
---- Makefile.in.orig	2004-10-24 16:21:09.000000000 -0400
+--- Makefile.in.orig	2005-05-15 01:58:33.000000000 -0400
 +++ Makefile.in
-@@ -237,7 +237,7 @@ AUTOMAKE_OPTIONS = 1.7
+@@ -241,7 +241,7 @@ AUTOMAKE_OPTIONS = 1.7
  @MACOSX_FALSE@INSTALLOSX = 
  @MACOSX_TRUE@INSTALLOSX = install-exec-local-osx
  
diff --git a/security/cyrus-sasl/patches/patch-ap b/security/cyrus-sasl/patches/patch-ap
index 1dcf972feca..f4f0d4beab0 100644
--- a/security/cyrus-sasl/patches/patch-ap
+++ b/security/cyrus-sasl/patches/patch-ap
@@ -1,8 +1,8 @@
-$NetBSD: patch-ap,v 1.3 2006/04/13 21:32:41 wiz Exp $
+$NetBSD: patch-ap,v 1.4 2006/04/18 17:41:30 jlam Exp $
 
---- sasldb/Makefile.am.orig	Fri Jul  2 15:39:41 2004
+--- sasldb/Makefile.am.orig	2005-05-07 00:54:18.000000000 -0400
 +++ sasldb/Makefile.am
-@@ -51,20 +51,8 @@ extra_common_sources = db_none.c db_ndbm
+@@ -51,18 +51,8 @@ extra_common_sources = db_none.c db_ndbm
  EXTRA_DIST = NTMakefile
  
  noinst_LTLIBRARIES = libsasldb.la
@@ -13,13 +13,11 @@ $NetBSD: patch-ap,v 1.3 2006/04/13 21:32:41 wiz Exp $
  libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND)
  libsasldb_la_LIBADD = $(SASL_DB_BACKEND) 
 -
--LOCAL_SASL_DB_BACKEND_STATIC := $(shell echo $(SASL_DB_BACKEND_STATIC) | sed -e "s%\.\./sasldb/%%g")
--
 -# Prevent make dist stupidity
 -libsasldb_a_SOURCES =
 -EXTRA_libsasldb_a_SOURCES =
 -
--libsasldb.a: libsasldb.la $(LOCAL_SASL_DB_BACKEND_STATIC)
--	$(AR) cru .libs/$@ $(LOCAL_SASL_DB_BACKEND_STATIC)
+-libsasldb.a: libsasldb.la $(SASL_DB_BACKEND_STATIC)
+-	$(AR) cru .libs/$@ $(SASL_DB_BACKEND_STATIC)
 -
 -
diff --git a/security/cyrus-sasl/patches/patch-aq b/security/cyrus-sasl/patches/patch-aq
index 8a43834474b..cb7d2d1a66d 100644
--- a/security/cyrus-sasl/patches/patch-aq
+++ b/security/cyrus-sasl/patches/patch-aq
@@ -1,8 +1,8 @@
-$NetBSD: patch-aq,v 1.3 2006/04/13 21:32:41 wiz Exp $
+$NetBSD: patch-aq,v 1.4 2006/04/18 17:41:30 jlam Exp $
 
---- sasldb/Makefile.in.orig	Fri Jul  2 15:40:18 2004
+--- sasldb/Makefile.in.orig	2005-05-15 01:58:41.000000000 -0400
 +++ sasldb/Makefile.in
-@@ -235,28 +235,18 @@ extra_common_sources = db_none.c db_ndbm
+@@ -239,26 +239,18 @@ extra_common_sources = db_none.c db_ndbm
  EXTRA_DIST = NTMakefile
  
  noinst_LTLIBRARIES = libsasldb.la
@@ -13,8 +13,6 @@ $NetBSD: patch-aq,v 1.3 2006/04/13 21:32:41 wiz Exp $
  libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND)
  libsasldb_la_LIBADD = $(SASL_DB_BACKEND) 
  
--LOCAL_SASL_DB_BACKEND_STATIC := $(shell echo $(SASL_DB_BACKEND_STATIC) | sed -e "s%\.\./sasldb/%%g")
--
 -# Prevent make dist stupidity
 -libsasldb_a_SOURCES = 
 -EXTRA_libsasldb_a_SOURCES = 
@@ -31,7 +29,7 @@ $NetBSD: patch-aq,v 1.3 2006/04/13 21:32:41 wiz Exp $
  LTLIBRARIES = $(noinst_LTLIBRARIES)
  
  libsasldb_la_LDFLAGS =
-@@ -276,10 +266,9 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(
+@@ -278,10 +270,9 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(
  CCLD = $(CC)
  LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -44,12 +42,12 @@ $NetBSD: patch-aq,v 1.3 2006/04/13 21:32:41 wiz Exp $
  
  all: all-am
  
-@@ -540,8 +529,6 @@ uninstall-am: uninstall-info-am
+@@ -542,8 +533,6 @@ uninstall-am: uninstall-info-am
  	tags uninstall uninstall-am uninstall-info-am
  
  
--libsasldb.a: libsasldb.la $(LOCAL_SASL_DB_BACKEND_STATIC)
--	$(AR) cru .libs/$@ $(LOCAL_SASL_DB_BACKEND_STATIC)
+-libsasldb.a: libsasldb.la $(SASL_DB_BACKEND_STATIC)
+-	$(AR) cru .libs/$@ $(SASL_DB_BACKEND_STATIC)
  # 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:
diff --git a/security/cyrus-sasl/patches/patch-ar b/security/cyrus-sasl/patches/patch-ar
deleted file mode 100644
index bd234336b7f..00000000000
--- a/security/cyrus-sasl/patches/patch-ar
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ar,v 1.3 2006/04/13 21:32:41 wiz Exp $
-
---- utils/Makefile.am.orig	Thu May 27 15:11:25 2004
-+++ utils/Makefile.am
-@@ -56,11 +56,11 @@ else
- man_MANS = saslpasswd2.8 sasldblistusers2.8
- endif
- 
--saslpasswd2_LDADD = ../sasldb/libsasldb.la $(all_sasl_libs)
-+saslpasswd2_LDADD = $(SASL_DB_BACKEND_STATIC) $(all_sasl_libs)
- saslpasswd2_SOURCES = saslpasswd.c
--sasldblistusers2_LDADD = ../sasldb/libsasldb.la $(all_sasl_libs)
-+sasldblistusers2_LDADD = $(SASL_DB_BACKEND_STATIC) $(all_sasl_libs)
- sasldblistusers2_SOURCES = sasldblistusers.c
--dbconverter_2_LDADD = ../sasldb/libsasldb.la $(all_sasl_libs)
-+dbconverter_2_LDADD = $(SASL_DB_BACKEND_STATIC) $(all_sasl_libs)
- 
- testsuite_LDADD = $(all_sasl_libs) @DMALLOC_LIBS@
- 
diff --git a/security/cyrus-sasl/patches/patch-as b/security/cyrus-sasl/patches/patch-as
deleted file mode 100644
index fb95f2fc46e..00000000000
--- a/security/cyrus-sasl/patches/patch-as
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-as,v 1.1 2006/04/13 21:32:41 wiz Exp $
-
---- utils/Makefile.in.orig	Fri Jul  2 15:40:14 2004
-+++ utils/Makefile.in
-@@ -237,11 +237,11 @@ noinst_PROGRAMS = dbconverter-2
- 
- @NO_SASL_DB_MANS_TRUE@man_MANS = 
- 
--saslpasswd2_LDADD = ../sasldb/libsasldb.la $(all_sasl_libs)
-+saslpasswd2_LDADD = $(SASL_DB_BACKEND_STATIC) $(all_sasl_libs)
- saslpasswd2_SOURCES = saslpasswd.c
--sasldblistusers2_LDADD = ../sasldb/libsasldb.la $(all_sasl_libs)
-+sasldblistusers2_LDADD = $(SASL_DB_BACKEND_STATIC) $(all_sasl_libs)
- sasldblistusers2_SOURCES = sasldblistusers.c
--dbconverter_2_LDADD = ../sasldb/libsasldb.la $(all_sasl_libs)
-+dbconverter_2_LDADD = $(SASL_DB_BACKEND_STATIC) $(all_sasl_libs)
- 
- testsuite_LDADD = $(all_sasl_libs) @DMALLOC_LIBS@
- 
-@@ -287,16 +287,16 @@ PROGRAMS = $(noinst_PROGRAMS) $(sbin_PRO
- 
- dbconverter_2_SOURCES = dbconverter-2.c
- dbconverter_2_OBJECTS = dbconverter-2.$(OBJEXT)
--dbconverter_2_DEPENDENCIES = ../sasldb/libsasldb.la ../lib/libsasl2.la
-+dbconverter_2_DEPENDENCIES = $(SASL_DB_BACKEND_STATIC) ../lib/libsasl2.la
- dbconverter_2_LDFLAGS =
- am_sasldblistusers2_OBJECTS = sasldblistusers.$(OBJEXT)
- sasldblistusers2_OBJECTS = $(am_sasldblistusers2_OBJECTS)
--sasldblistusers2_DEPENDENCIES = ../sasldb/libsasldb.la \
-+sasldblistusers2_DEPENDENCIES = $(SASL_DB_BACKEND_STATIC) \
- 	../lib/libsasl2.la
- sasldblistusers2_LDFLAGS =
- am_saslpasswd2_OBJECTS = saslpasswd.$(OBJEXT)
- saslpasswd2_OBJECTS = $(am_saslpasswd2_OBJECTS)
--saslpasswd2_DEPENDENCIES = ../sasldb/libsasldb.la ../lib/libsasl2.la
-+saslpasswd2_DEPENDENCIES = $(SASL_DB_BACKEND_STATIC) ../lib/libsasl2.la
- saslpasswd2_LDFLAGS =
- am_smtptest_OBJECTS =
- smtptest_OBJECTS = $(am_smtptest_OBJECTS)