Update security/cyrus-sasl2 to 2.1.17. Changes from version 2.1.15 include:

* Now correctly do authorizaton callback in sasl_checkpass()
* Writable auxprop support
* Significantly improved documentation

16 files changed, 92 insertions, 267 deletions

diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index d99323dc0bb..b9b0e58431d 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2004/02/12 13:34:29 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2004/02/14 03:16:58 jlam Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=	2
+PKGREVISION=	# empty
 SVR4_PKGNAME=	csasl
 COMMENT=	Simple Authentication and Security Layer
 
@@ -31,7 +31,9 @@ CONFIGURE_ARGS+=	--with-devrandom=/dev/urandom
     (defined(SASL_USE_GSSAPI) && !empty(SASL_USE_GSSAPI:M[yY][eE][sS]))
 .  include "../../mk/krb5.buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-gssapi=${KRB5BASE}	# GSSAPI
-LIBS+=			-lcrypto
+CONFIGURE_ARGS+=	--with-gss_impl=${GSSIMPL.${KRB5_TYPE}}
+GSSIMPL.heimdal=	heimdal
+GSSIMPL.mit-krb5=	mit
 PLIST_SRC+=		${PKGDIR}/PLIST.krb5
 .endif
 
diff --git a/security/cyrus-sasl2/Makefile.common b/security/cyrus-sasl2/Makefile.common
index 2baabea0d6e..f0447cad883 100644
--- a/security/cyrus-sasl2/Makefile.common
+++ b/security/cyrus-sasl2/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.13 2004/02/12 13:34:29 jlam Exp $
+# $NetBSD: Makefile.common,v 1.14 2004/02/14 03:16:58 jlam Exp $
 #
 # This Makefile fragment should be included _below_ any SASL_PLUGIN
 # definition and _above_ any CONFIGURE_ARGS definitions.
 
-DISTNAME=	cyrus-sasl-2.1.15
+DISTNAME=	cyrus-sasl-2.1.17
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/
@@ -28,7 +28,10 @@ DEFAULT_VIEW.${PKGBASE}=	${DEFAULT_VIEW.cyrus-sasl}
 
 USE_BUILDLINK3=		YES
 USE_PKGINSTALL=		YES
+
 GNU_CONFIGURE=		YES
+CONFIG_STATUS_OVERRIDE=	config.status
+
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 MAKE_ENV+=		SHLIBTOOL=${SHLIBTOOL:Q}
@@ -82,3 +85,10 @@ post-extract:
 #	${AUTOHEADER};					\
 #	${AUTOMAKE} -a --gnu -i ;			\
 #	${AUTOCONF}
+
+post-configure:
+	cd ${WRKSRC}; for file in plugins/Makefile; do			\
+		${SED}	-e "s|^\(LIBTOOL =\).*|\1 \$$(SHLIBTOOL)|g"	\
+			$$file > $$file.new;				\
+		${MV} -f $$file.new $$file;				\
+	done
diff --git a/security/cyrus-sasl2/PLIST.common b/security/cyrus-sasl2/PLIST.common
index 23a4fff4bce..1243fa57eda 100644
--- a/security/cyrus-sasl2/PLIST.common
+++ b/security/cyrus-sasl2/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.11 2004/01/09 19:37:48 jlam Exp $
+@comment $NetBSD: PLIST.common,v 1.12 2004/02/14 03:16:58 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.15
+lib/libsasl2.so.2.17
 man/man3/sasl.3
 man/man3/sasl_authorize_t.3
 man/man3/sasl_auxprop.3
@@ -59,16 +59,17 @@ 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-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-01.txt
+share/doc/html/cyrus-sasl/draft-ietf-sasl-rfc2222bis-02.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-murchison-sasl-login-00.txt
 share/doc/html/cyrus-sasl/draft-newman-sasl-c-api-01.txt
-share/doc/html/cyrus-sasl/draft-sasl-login.txt
 share/doc/html/cyrus-sasl/gssapi.html
 share/doc/html/cyrus-sasl/index.html
 share/doc/html/cyrus-sasl/install.html
diff --git a/security/cyrus-sasl2/PLIST.krb5 b/security/cyrus-sasl2/PLIST.krb5
index ab9995fb6e1..255c2df443d 100644
--- a/security/cyrus-sasl2/PLIST.krb5
+++ b/security/cyrus-sasl2/PLIST.krb5
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST.krb5,v 1.7 2003/09/13 19:08:51 jlam Exp $
+@comment $NetBSD: PLIST.krb5,v 1.8 2004/02/14 03:16:58 jlam Exp $
 lib/sasl2/libgssapiv2.la
 lib/sasl2/libgssapiv2.so
 lib/sasl2/libgssapiv2.so.2
-lib/sasl2/libgssapiv2.so.2.15
+lib/sasl2/libgssapiv2.so.2.17
diff --git a/security/cyrus-sasl2/PLIST.plugins b/security/cyrus-sasl2/PLIST.plugins
index 1e6aaa771bb..72203f0acd3 100644
--- a/security/cyrus-sasl2/PLIST.plugins
+++ b/security/cyrus-sasl2/PLIST.plugins
@@ -1,25 +1,25 @@
-@comment $NetBSD: PLIST.plugins,v 1.6 2003/09/13 19:08:51 jlam Exp $
+@comment $NetBSD: PLIST.plugins,v 1.7 2004/02/14 03:16:58 jlam Exp $
 lib/sasl2/libanonymous.la
 lib/sasl2/libanonymous.so
 lib/sasl2/libanonymous.so.2
-lib/sasl2/libanonymous.so.2.15
+lib/sasl2/libanonymous.so.2.17
 lib/sasl2/libcrammd5.la
 lib/sasl2/libcrammd5.so
 lib/sasl2/libcrammd5.so.2
-lib/sasl2/libcrammd5.so.2.15
+lib/sasl2/libcrammd5.so.2.17
 lib/sasl2/libdigestmd5.la
 lib/sasl2/libdigestmd5.so
 lib/sasl2/libdigestmd5.so.2
-lib/sasl2/libdigestmd5.so.2.15
+lib/sasl2/libdigestmd5.so.2.17
 lib/sasl2/libotp.la
 lib/sasl2/libotp.so
 lib/sasl2/libotp.so.2
-lib/sasl2/libotp.so.2.15
+lib/sasl2/libotp.so.2.17
 lib/sasl2/libplain.la
 lib/sasl2/libplain.so
 lib/sasl2/libplain.so.2
-lib/sasl2/libplain.so.2.15
+lib/sasl2/libplain.so.2.17
 lib/sasl2/libsasldb.la
 lib/sasl2/libsasldb.so
 lib/sasl2/libsasldb.so.2
-lib/sasl2/libsasldb.so.2.15
+lib/sasl2/libsasldb.so.2.17
diff --git a/security/cyrus-sasl2/distinfo b/security/cyrus-sasl2/distinfo
index 0af5526ead7..0255c81ec53 100644
--- a/security/cyrus-sasl2/distinfo
+++ b/security/cyrus-sasl2/distinfo
@@ -1,16 +1,14 @@
-$NetBSD: distinfo,v 1.13 2004/01/09 20:29:47 jlam Exp $
+$NetBSD: distinfo,v 1.14 2004/02/14 03:16:58 jlam Exp $
 
-SHA1 (cyrus-sasl-2.1.15.tar.gz) = 747101ffec482ca566f00a9d34124ec8e79f6589
-Size (cyrus-sasl-2.1.15.tar.gz) = 1390131 bytes
-SHA1 (patch-aa) = f5a772976839388078a26f287844ba35bdf1a3b7
-SHA1 (patch-ab) = 711dd3d73da611bb5679bc8415e96517bf239778
+SHA1 (cyrus-sasl-2.1.17.tar.gz) = c91e073274279ea59d8ca9514559140e23e3be57
+Size (cyrus-sasl-2.1.17.tar.gz) = 1499725 bytes
+SHA1 (patch-aa) = 8844b837470fa171a0d0c8030107f9f9e93dac1a
 SHA1 (patch-ae) = cfd176eea2e1dba320be14a7d9bf2a4426ba39ad
-SHA1 (patch-af) = 305feccbe1d8545480f01b2797f9fd542fa951c7
-SHA1 (patch-ah) = 50ff4e8ec0f4232bd8c2121b105d4818b978b950
-SHA1 (patch-ai) = 743dddbd54ac19266fd66ef0c5a3e87ba7437ee9
-SHA1 (patch-aj) = e841641a92dacd0f38fc0f86391b54b394e5a54c
-SHA1 (patch-al) = 286b1c6c9980525f5ad8e1507dc3fe9708e755ca
+SHA1 (patch-af) = a25efa52dd7c77cebb5432af1617877935a46918
+SHA1 (patch-ai) = ba5778bb8a373138d5bf7a895c4ff0f41d497c26
+SHA1 (patch-ak) = aa71ba83a0d805f8595a64faf9afd76f8667bb6c
+SHA1 (patch-al) = 68576f62af7517dc09014d61427b58e76d361f8a
 SHA1 (patch-am) = f0bd15b4f55e5204936a25c558d4bd2b1d4816d5
 SHA1 (patch-an) = 65a0ec173ea1f0114318ffb922cad4470e1cd7e9
-SHA1 (patch-ao) = bb10eb052278c817603dd18128e711a9fedce840
-SHA1 (patch-as) = c8d35da93afe8be5e535b88681b23b169e813c02
+SHA1 (patch-ao) = 2d26106ea33ac0625195214e18fc9e00deb9dc15
+SHA1 (patch-as) = 0371be5fdd00df1e741753d6cc9b9f71b582874c
diff --git a/security/cyrus-sasl2/patches/patch-aa b/security/cyrus-sasl2/patches/patch-aa
index 4b78563b01a..87366a5294d 100644
--- a/security/cyrus-sasl2/patches/patch-aa
+++ b/security/cyrus-sasl2/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2003/08/16 09:06:42 recht Exp $
+$NetBSD: patch-aa,v 1.5 2004/02/14 03:16:59 jlam Exp $
 
---- configure.in.orig	2003-07-15 17:39:21.000000000 +0200
-+++ configure.in	2003-07-26 12:28:18.000000000 +0200
-@@ -114,6 +114,13 @@
+--- configure.in.orig	Fri Nov 28 10:37:10 2003
++++ 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.
diff --git a/security/cyrus-sasl2/patches/patch-ab b/security/cyrus-sasl2/patches/patch-ab
deleted file mode 100644
index e35eff89879..00000000000
--- a/security/cyrus-sasl2/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2003/09/13 19:08:53 jlam Exp $
-
---- plugins/Makefile.in.orig	Sat Sep 13 14:38:42 2003
-+++ plugins/Makefile.in	Sat Sep 13 14:43:04 2003
-@@ -147,7 +147,7 @@
- LIBSSL_INC_FLAGS = @LIBSSL_INC_FLAGS@
- LIBSSL_LIB_DIR = @LIBSSL_LIB_DIR@
- LIBSSL_LIB_FLAGS = @LIBSSL_LIB_FLAGS@
--LIBTOOL = @LIBTOOL@
-+LIBTOOL = $(SHLIBTOOL)
- LIB_CRYPT = @LIB_CRYPT@
- LIB_DES = @LIB_DES@
- LIB_DYN_SASL = @LIB_DYN_SASL@
diff --git a/security/cyrus-sasl2/patches/patch-af b/security/cyrus-sasl2/patches/patch-af
index 5a5f83624a4..d94e06794d4 100644
--- a/security/cyrus-sasl2/patches/patch-af
+++ b/security/cyrus-sasl2/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.4 2004/01/09 20:29:47 jlam Exp $
+$NetBSD: patch-af,v 1.5 2004/02/14 03:16:59 jlam Exp $
 
---- plugins/cram.c.orig	2003-02-18 13:27:37.000000000 -0500
-+++ plugins/cram.c	2003-10-06 12:09:33.000000000 -0400
-@@ -544,7 +544,8 @@
+--- plugins/cram.c.orig	Mon Nov  3 10:25:24 2003
++++ plugins/cram.c
+@@ -531,7 +531,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-ah b/security/cyrus-sasl2/patches/patch-ah
deleted file mode 100644
index 5e1ef2f6d5c..00000000000
--- a/security/cyrus-sasl2/patches/patch-ah
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2002/12/11 23:48:59 chris Exp $
-
---- lib/Makefile.am.orig	Wed Dec 11 23:29:42 2002
-+++ lib/Makefile.am	Wed Dec 11 23:30:35 2002
-@@ -51,10 +51,7 @@
- libsasl2_a_SOURCES=
- 
- common_headers = saslint.h
--common_sources = auxprop.c canonusr.c checkpw.c client.c common.c config.c external.c md5.c saslutil.c server.c seterror.c dlopen.c
--
--LTLIBOBJS = @LTLIBOBJS@ plugin_common.lo
--LIBOBJS = @LIBOBJS@ plugin_common.o
-+common_sources = auxprop.c canonusr.c checkpw.c client.c common.c config.c external.c md5.c saslutil.c server.c seterror.c dlopen.c plugin_common.c
- 
- lib_LTLIBRARIES = libsasl2.la
- 
-@@ -63,13 +60,9 @@
- libsasl2_la_DEPENDENCIES = $(LTLIBOBJS)
- libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET)
- 
--plugin_common.lo: plugin_common.o
--	rm -f plugin_common.lo
--	ln -s $(top_builddir)/plugins/plugin_common.lo plugin_common.lo
--
--plugin_common.o:
--	rm -f plugin_common.o
--	ln -s $(top_builddir)/plugins/plugin_common.o plugin_common.o
-+plugin_common.c:
-+	rm -f plugin_common.c
-+	ln -s $(top_builddir)/plugins/plugin_common.c plugin_common.c
- 
- if MACOSX
- framedir = /Library/Frameworks/SASL2.framework
diff --git a/security/cyrus-sasl2/patches/patch-ai b/security/cyrus-sasl2/patches/patch-ai
index 8cec969e000..0fee5c82d9a 100644
--- a/security/cyrus-sasl2/patches/patch-ai
+++ b/security/cyrus-sasl2/patches/patch-ai
@@ -1,93 +1,17 @@
-$NetBSD: patch-ai,v 1.5 2004/01/05 12:10:29 markd Exp $
+$NetBSD: patch-ai,v 1.6 2004/02/14 03:16:59 jlam Exp $
 
---- configure.orig	2003-07-16 03:42:27.000000000 +1200
+--- configure.orig	Mon Dec  1 08:35:06 2003
 +++ configure
-@@ -675,6 +675,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-
- echo "$ac_t""$host" 1>&6
- 
- 
-+am__api_version="1.4"
- # Find a good install program.  We prefer a C program (faster),
- # so one script is as good as another.  But avoid the broken or
- # incompatible versions:
-@@ -842,29 +843,29 @@ EOF
- 
- 
- missing_dir=`cd $ac_aux_dir && pwd`
--echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
--echo "configure:847: checking for working aclocal" >&5
-+echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-+echo "configure:846: checking for working aclocal-${am__api_version}" >&5
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf.  Sigh.
--if (aclocal --version) < /dev/null > /dev/null 2>&1; then
--   ACLOCAL=aclocal
-+if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-+   ACLOCAL=aclocal-${am__api_version}
-    echo "$ac_t""found" 1>&6
- else
--   ACLOCAL="$missing_dir/missing aclocal"
-+   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
-    echo "$ac_t""missing" 1>&6
- fi
- 
--echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
--echo "configure:860: checking for working autoconf" >&5
-+echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-+echo "configure:872: checking for working automake-${am__api_version}" >&5
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf.  Sigh.
--if (autoconf --version) < /dev/null > /dev/null 2>&1; then
--   AUTOCONF=autoconf
-+if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-+   AUTOMAKE=automake-${am__api_version}
-    echo "$ac_t""found" 1>&6
- else
--   AUTOCONF="$missing_dir/missing autoconf"
-+   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
-    echo "$ac_t""missing" 1>&6
- fi
- 
-@@ -1951,6 +1952,13 @@ fi
+@@ -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;;
++	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
-@@ -5696,7 +5704,7 @@ else
- fi
- 
-   SASL_MECHS="$SASL_MECHS libgssapiv2.la"
--  SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/gssapi.o"
-+#  SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/gssapi.o"
- 
-   cmu_save_LIBS="$LIBS"
-   LIBS="$LIBS $GSSAPIBASE_LIBS"
-@@ -5799,12 +5807,12 @@ EOF
-  fi
- 
- 
--if test "$gssapi" != "no"; then
--  cat >> confdefs.h <<\EOF
--#define STATIC_GSSAPIV2 1
--EOF
-+#if test "$gssapi" != "no"; then
-+#  cat >> confdefs.h <<\EOF
-+##define STATIC_GSSAPIV2 1
-+#EOF
- 
--fi
-+#fi
- 
- # Check whether --enable-anon or --disable-anon was given.
- if test "${enable_anon+set}" = set; then
diff --git a/security/cyrus-sasl2/patches/patch-aj b/security/cyrus-sasl2/patches/patch-aj
deleted file mode 100644
index 7aa1f2292d1..00000000000
--- a/security/cyrus-sasl2/patches/patch-aj
+++ /dev/null
@@ -1,76 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2003/02/27 13:18:07 seb Exp $
-
---- lib/Makefile.in.orig	Mon Feb  3 18:50:31 2003
-+++ lib/Makefile.in
-@@ -1,6 +1,6 @@
--# Makefile.in generated automatically by automake 1.4 from Makefile.am
-+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
- 
--# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -137,6 +137,7 @@ JAVAROOT = @JAVAROOT@
- JAVA_INCLUDES = @JAVA_INCLUDES@
- KRB_INC_FLAGS = @KRB_INC_FLAGS@
- KRB_LIB_FLAGS = @KRB_LIB_FLAGS@
-+LIBOBJS = @LIBOBJS@
- LIBSSL_INC_DIR = @LIBSSL_INC_DIR@
- LIBSSL_INC_FLAGS = @LIBSSL_INC_FLAGS@
- LIBSSL_LIB_DIR = @LIBSSL_LIB_DIR@
-@@ -152,6 +153,7 @@ LIB_SOCKET = @LIB_SOCKET@
- LN_S = @LN_S@
- LTGETADDRINFOOBJS = @LTGETADDRINFOOBJS@
- LTGETNAMEINFOOBJS = @LTGETNAMEINFOOBJS@
-+LTLIBOBJS = @LTLIBOBJS@
- LTSNPRINTFOBJS = @LTSNPRINTFOBJS@
- MAKEINFO = @MAKEINFO@
- NM = @NM@
-@@ -197,10 +199,7 @@ noinst_LIBRARIES = @SASL_STATIC_LIBS@
- libsasl2_a_SOURCES = 
- 
- common_headers = saslint.h
--common_sources = auxprop.c canonusr.c checkpw.c client.c common.c config.c external.c md5.c saslutil.c server.c seterror.c dlopen.c
--
--LTLIBOBJS = @LTLIBOBJS@ plugin_common.lo
--LIBOBJS = @LIBOBJS@ plugin_common.o
-+common_sources = auxprop.c canonusr.c checkpw.c client.c common.c config.c external.c md5.c saslutil.c server.c seterror.c dlopen.c plugin_common.c
- 
- lib_LTLIBRARIES = libsasl2.la
- 
-@@ -227,7 +226,7 @@ LTLIBRARIES =  $(lib_LTLIBRARIES)
- 
- libsasl2_la_OBJECTS =  auxprop.lo canonusr.lo checkpw.lo client.lo \
- common.lo config.lo external.lo md5.lo saslutil.lo server.lo \
--seterror.lo dlopen.lo
-+seterror.lo dlopen.lo plugin_common.lo
- CFLAGS = @CFLAGS@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@@ -239,7 +238,7 @@ getsubopt.c snprintf.c
- 
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
- 
--TAR = gtar
-+TAR = tar
- GZIP_ENV = --best
- SOURCES = $(libsasl2_a_SOURCES) $(libsasl2_la_SOURCES)
- OBJECTS = $(libsasl2_a_OBJECTS) $(libsasl2_la_OBJECTS)
-@@ -456,13 +455,9 @@ distclean-generic clean-generic maintain
- mostlyclean distclean maintainer-clean
- 
- 
--plugin_common.lo: plugin_common.o
--	rm -f plugin_common.lo
--	ln -s $(top_builddir)/plugins/plugin_common.lo plugin_common.lo
--
--plugin_common.o:
--	rm -f plugin_common.o
--	ln -s $(top_builddir)/plugins/plugin_common.o plugin_common.o
-+plugin_common.c:
-+	rm -f plugin_common.c
-+	ln -s $(top_builddir)/plugins/plugin_common.c plugin_common.c
- @MACOSX_TRUE@install-exec-hook:
- @MACOSX_TRUE@	$(mkinstalldirs) $(framedir)/Versions/A
- @MACOSX_TRUE@	ln -fs $(libdir)/libsasl2.dylib $(framedir)/Versions/A/SASL2
diff --git a/security/cyrus-sasl2/patches/patch-ak b/security/cyrus-sasl2/patches/patch-ak
new file mode 100644
index 00000000000..17e9ff8c047
--- /dev/null
+++ b/security/cyrus-sasl2/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.3 2004/02/14 03:16:59 jlam Exp $
+
+--- Makefile.am.orig	Tue Oct 14 13:36:34 2003
++++ Makefile.am
+@@ -68,7 +68,7 @@ else 
+ INSTALLOSX = 
+ endif
+ 
+-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
+ 
+ dist-hook:
diff --git a/security/cyrus-sasl2/patches/patch-al b/security/cyrus-sasl2/patches/patch-al
index 1988f112f10..07c87f6347c 100644
--- a/security/cyrus-sasl2/patches/patch-al
+++ b/security/cyrus-sasl2/patches/patch-al
@@ -1,10 +1,10 @@
-$NetBSD: patch-al,v 1.1 2004/01/09 19:37:48 jlam Exp $
+$NetBSD: patch-al,v 1.2 2004/02/14 03:16:59 jlam Exp $
 
---- Makefile.in.orig	Tue Jul 15 11:42:28 2003
+--- Makefile.in.orig	Mon Dec  1 08:35:06 2003
 +++ Makefile.in
-@@ -199,7 +199,7 @@ plugindir = @plugindir@
- @MACOSX_TRUE@INSTALLOSX = install-exec-local-osx
+@@ -235,7 +235,7 @@ target_vendor = @target_vendor@
  @MACOSX_FALSE@INSTALLOSX = 
+ @MACOSX_TRUE@INSTALLOSX = install-exec-local-osx
  
 -SUBDIRS = include sasldb plugins lib utils doc man $(PWC) $(SAM) $(JAV) $(SAD)
 +SUBDIRS = include sasldb plugins lib utils doc man $(PWC) $(SAM) $(JAV)
diff --git a/security/cyrus-sasl2/patches/patch-ao b/security/cyrus-sasl2/patches/patch-ao
index c86510bb166..7037c9778fd 100644
--- a/security/cyrus-sasl2/patches/patch-ao
+++ b/security/cyrus-sasl2/patches/patch-ao
@@ -1,15 +1,14 @@
-$NetBSD: patch-ao,v 1.1 2004/01/09 20:29:47 jlam Exp $
+$NetBSD: patch-ao,v 1.2 2004/02/14 03:16:59 jlam Exp $
 
---- include/Makefile.in.orig	Fri Jan  9 15:20:07 2004
+--- include/Makefile.in.orig	Mon Dec  1 08:35:06 2003
 +++ include/Makefile.in
-@@ -453,10 +453,6 @@ distclean-generic clean-generic maintain
- mostlyclean distclean maintainer-clean
+@@ -558,9 +558,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:
diff --git a/security/cyrus-sasl2/patches/patch-as b/security/cyrus-sasl2/patches/patch-as
index b4b96264065..c2e6cbe3c79 100644
--- a/security/cyrus-sasl2/patches/patch-as
+++ b/security/cyrus-sasl2/patches/patch-as
@@ -1,16 +1,16 @@
-$NetBSD: patch-as,v 1.1 2003/08/16 09:06:42 recht Exp $
+$NetBSD: patch-as,v 1.2 2004/02/14 03:16:59 jlam Exp $
 
---- plugins/digestmd5.c.orig	2003-08-14 13:15:30.000000000 +0200
-+++ plugins/digestmd5.c	2003-08-14 13:41:39.000000000 +0200
-@@ -59,6 +59,7 @@
+--- plugins/digestmd5.c.orig	Tue Nov 11 08:26:07 2003
++++ plugins/digestmd5.c
+@@ -60,6 +60,7 @@
  /* DES support */
  #ifdef WITH_DES
  # ifdef WITH_SSL_DES
 +#  include <openssl/opensslv.h>
  #  include <openssl/des.h>
- # else /* system DES library */
- #  include <des.h>
-@@ -655,9 +656,15 @@
+ #  include <openssl/opensslv.h>
+ #  if (OPENSSL_VERSION_NUMBER >= 0x0090700f) && \
+@@ -733,9 +734,15 @@ static void get_pair(char **in, char **n
  
  #ifdef WITH_DES
  struct des_context_s {
@@ -26,7 +26,7 @@ $NetBSD: patch-as,v 1.1 2003/08/16 09:06:42 recht Exp $
  };
  
  typedef struct des_context_s des_context_t;
-@@ -692,6 +699,15 @@
+@@ -770,6 +777,15 @@ static int dec_3des(context_t *text,
      des_context_t *c = (des_context_t *) text->cipher_dec_context;
      int padding, p;
      
@@ -42,7 +42,7 @@ $NetBSD: patch-as,v 1.1 2003/08/16 09:06:42 recht Exp $
      des_ede2_cbc_encrypt((void *) input,
  			 (void *) output,
  			 inputlen,
-@@ -699,7 +715,7 @@
+@@ -777,7 +793,7 @@ static int dec_3des(context_t *text,
  			 c->keysched2,
  			 &c->ivec,
  			 DES_DECRYPT);
@@ -51,7 +51,7 @@ $NetBSD: patch-as,v 1.1 2003/08/16 09:06:42 recht Exp $
      /* now chop off the padding */
      padding = output[inputlen - 11];
      if (padding < 1 || padding > 8) {
-@@ -743,6 +759,15 @@
+@@ -818,6 +834,15 @@ static int enc_3des(context_t *text,
      
      len=inputlen+paddinglen+10;
      
@@ -67,7 +67,7 @@ $NetBSD: patch-as,v 1.1 2003/08/16 09:06:42 recht Exp $
      des_ede2_cbc_encrypt((void *) output,
  			 (void *) output,
  			 len,
-@@ -750,7 +775,7 @@
+@@ -825,7 +850,7 @@ static int enc_3des(context_t *text,
  			 c->keysched2,
  			 &c->ivec,
  			 DES_ENCRYPT);
@@ -76,7 +76,7 @@ $NetBSD: patch-as,v 1.1 2003/08/16 09:06:42 recht Exp $
      *outputlen=len;
      
      return SASL_OK;
-@@ -769,12 +794,23 @@
+@@ -844,12 +869,23 @@ static int init_3des(context_t *text, 
  
      /* setup enc context */
      slidebits(keybuf, enckey);
@@ -100,7 +100,7 @@ $NetBSD: patch-as,v 1.1 2003/08/16 09:06:42 recht Exp $
      memcpy(c->ivec, ((char *) enckey) + 8, 8);
  
      text->cipher_enc_context = (cipher_context_t *) c;
-@@ -782,13 +818,23 @@
+@@ -857,13 +893,23 @@ static int init_3des(context_t *text, 
      /* setup dec context */
      c++;
      slidebits(keybuf, deckey);
@@ -126,7 +126,7 @@ $NetBSD: patch-as,v 1.1 2003/08/16 09:06:42 recht Exp $
      memcpy(c->ivec, ((char *) deckey) + 8, 8);
  
      text->cipher_dec_context = (cipher_context_t *) c;
-@@ -813,12 +859,21 @@
+@@ -888,12 +934,21 @@ static int dec_des(context_t *text, 
      des_context_t *c = (des_context_t *) text->cipher_dec_context;
      int p, padding = 0;
      
@@ -148,7 +148,7 @@ $NetBSD: patch-as,v 1.1 2003/08/16 09:06:42 recht Exp $
  
      /* Update the ivec (des_cbc_encrypt implementations tend to be broken in
         this way) */
-@@ -867,12 +922,21 @@
+@@ -939,12 +994,21 @@ static int enc_des(context_t *text,
      
      len = inputlen + paddinglen + 10;
      
@@ -170,7 +170,7 @@ $NetBSD: patch-as,v 1.1 2003/08/16 09:06:42 recht Exp $
      
      /* Update the ivec (des_cbc_encrypt implementations tend to be broken in
         this way) */
-@@ -896,7 +960,12 @@
+@@ -968,7 +1032,12 @@ static int init_des(context_t *text,
      
      /* setup enc context */
      slidebits(keybuf, enckey);
@@ -183,7 +183,7 @@ $NetBSD: patch-as,v 1.1 2003/08/16 09:06:42 recht Exp $
  
      memcpy(c->ivec, ((char *) enckey) + 8, 8);
      
-@@ -905,8 +974,11 @@
+@@ -977,8 +1046,11 @@ static int init_des(context_t *text,
      /* setup dec context */
      c++;
      slidebits(keybuf, deckey);