Initial import of cyrus-sasl 2.1.9.

This is the latest release of cyrus-sasl.  It is needed for the 2.1.x
versions of cyrus-imapd.

SASL is a method for adding authentication support to connection-based
protocols.  To use SASL, a protocol includes a command for identifying and
authenticating a user to a server and for optionally negotiating protection
of subsequent protocol interactions.  If its use is negotiated, a security
layer is inserted between the protocol and the connection.

21 files changed, 811 insertions, 0 deletions

diff --git a/security/cyrus-sasl2/DEINSTALL b/security/cyrus-sasl2/DEINSTALL
new file mode 100644
index 00000000000..c1ef5feb2ac
--- /dev/null
+++ b/security/cyrus-sasl2/DEINSTALL
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# $NetBSD: DEINSTALL,v 1.1.1.1 2002/10/27 15:08:59 chris Exp $
+
+SASLDB=@PKG_SYSCONFDIR@/sasldb.db
+SASLSOCKETDIR=@SASLSOCKETDIR@
+
+case ${STAGE} in
+POST-DEINSTALL)
+	${RM} -f /usr/lib/sasl2
+	${RM} -rf ${SASLSOCKETDIR}
+	if [ -e ${SASLDB} ]
+	then
+		${CAT} << EOF
+===========================================================================
+You may want to remove the SASL password data file:
+
+	${SASLDB}
+===========================================================================
+EOF
+	fi
+	;;
+esac
diff --git a/security/cyrus-sasl2/DESCR b/security/cyrus-sasl2/DESCR
new file mode 100644
index 00000000000..5a3474499b8
--- /dev/null
+++ b/security/cyrus-sasl2/DESCR
@@ -0,0 +1,14 @@
+SASL is a method for adding authentication support to connection-based
+protocols.  To use SASL, a protocol includes a command for identifying and
+authenticating a user to a server and for optionally negotiating protection
+of subsequent protocol interactions.  If its use is negotiated, a security
+layer is inserted between the protocol and the connection.
+
+This is the Cyrus SASL API implentation. It can be used on the client or
+server side to provide authentication. See RFC 2222 for more information.
+
+There's a mailing list for Cyrus SASL.  Subscribe by sending a message
+to majordomo@lists.andrew.cmu.edu with the body "subscribe cyrus-sasl".
+The mailing list is available via anonymous IMAP at
+imap://cyrus.andrew.cmu.edu/archive.cyrus-sasl or via the web at
+http://asg.web.cmu.edu/archive/mailbox.php3?mailbox=archive.cyrus-sasl.
diff --git a/security/cyrus-sasl2/INSTALL b/security/cyrus-sasl2/INSTALL
new file mode 100644
index 00000000000..77d710d3885
--- /dev/null
+++ b/security/cyrus-sasl2/INSTALL
@@ -0,0 +1,12 @@
+# $NetBSD: INSTALL,v 1.1.1.1 2002/10/27 15:08:59 chris Exp $
+
+case ${STAGE} in
+POST-INSTALL)
+	#
+	# Create the default search location for SASL authentication
+	# mechanism libraries.
+	#
+	${RM} -f /usr/lib/sasl2
+	${LN} -s ${PKG_PREFIX}/lib/sasl2 /usr/lib/sasl2
+	;;
+esac
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
new file mode 100644
index 00000000000..15d670fafb6
--- /dev/null
+++ b/security/cyrus-sasl2/Makefile
@@ -0,0 +1,94 @@
+# $NetBSD: Makefile,v 1.1.1.1 2002/10/27 15:09:00 chris Exp $
+
+DISTNAME=		cyrus-sasl-2.1.9
+SVR4_PKGNAME=		csasl
+CATEGORIES=		security
+MASTER_SITES=		ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
+			ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/
+
+MAINTAINER=		chris@netbsd.org
+HOMEPAGE=		http://asg.web.cmu.edu/sasl/
+COMMENT=		Simple Authentication and Security Layer
+
+USE_BUILDLINK2=		YES
+AUTOMAKE_REQD=		1.4
+GNU_CONFIGURE=		YES
+USE_GMAKE=		YES
+USE_LIBTOOL=		YES
+LTCONFIG_OVERRIDE=	${WRKSRC}/config/ltconfig
+
+.include "../../mk/bsd.prefs.mk"
+
+# CYRUS_USER		username of the Cyrus administrator
+# CYRUS_GROUP		group of the Cyrus administrator
+#
+CYRUS_USER?=		cyrus
+CYRUS_GROUP?=		mail
+FILES_SUBST+=		CYRUS_USER=${CYRUS_USER}
+
+HTMLDIR=		${PREFIX}/share/doc/html/cyrus-sasl
+SASLSOCKETDIR=		/var/run/sasl
+FILES_SUBST+=		SASLSOCKETDIR=${SASLSOCKETDIR}
+PLIST_SUBST+=		SASLSOCKETDIR=${SASLSOCKETDIR}
+
+BUILD_DEFS+=		CYRUS_USER CYRUS_GROUP
+
+PLIST_SRC=		${.CURDIR}/PLIST.common
+
+CONFIGURE_ARGS+=	--with-saslauthd=${SASLSOCKETDIR}
+CONFIGURE_ARGS+=	--with-dblib=ndbm
+CONFIGURE_ARGS+=	--with-dbpath=${PKG_SYSCONFDIR}/sasldb
+CONFIGURE_ARGS+=	--with-plugindir=${PREFIX}/lib/sasl2
+CONFIGURE_ARGS+=	--with-rc4=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_DIR}
+
+# Authentication mechanisms
+CONFIGURE_ARGS+=	--enable-anon		# ANONYMOUS
+CONFIGURE_ARGS+=	--enable-cram		# CRAM-MD5
+CONFIGURE_ARGS+=	--enable-digest		# DIGEST-MD5
+CONFIGURE_ARGS+=	--disable-login		# --- no LOGIN
+CONFIGURE_ARGS+=	--enable-plain		# PLAIN
+CONFIGURE_ARGS+=	--disable-scram		# --- no SCRAM-MD5
+CONFIGURE_ARGS+=	--disable-sia		# --- no SIA
+CONFIGURE_ARGS+=	--disable-srp		# --- no SRP
+CONFIGURE_ARGS+=	--disable-krb4		# --- no KERBEROS_V4
+CONFIGURE_ARGS+=	--enable-otp		# OTP
+
+.if defined(SASL_USE_GSSAPI) && ${SASL_USE_GSSAPI} == "YES"
+CONFIGURE_ARGS+=	--enable-gssapi=/usr	# GSSAPI
+PLIST_SRC+=		${.CURDIR}/PLIST.krb5
+.else
+CONFIGURE_ARGS+=	--disable-gssapi	# --- no GSSAPI
+.endif
+
+PLIST_SRC+=		${.CURDIR}/PLIST.plugins
+
+.if defined(USE_PAM)
+.  include "../../security/PAM/buildlink.mk"
+BUILD_DEFS+=		USE_PAM
+CONFIGURE_ARGS+=	--with-pam=${BUILDLINK_DIR}
+.else
+CONFIGURE_ARGS+=	--without-pam
+.endif
+
+PKG_GROUPS=		${CYRUS_GROUP}
+PKG_USERS=		${CYRUS_USER}:${CYRUS_GROUP}::::${SH}
+RCD_SCRIPTS=		saslauthd
+OWN_DIRS=		${PREFIX}/lib/sasl2
+
+post-extract:
+	${CP} ${FILESDIR}/sasl-config.in ${WRKSRC}/plugins
+
+pre-configure:
+	cd ${WRKSRC} && ${AUTOHEADER}
+	cd ${WRKSRC} && ${AUTOMAKE} --gnu
+	cd ${WRKSRC} && ${AUTOCONF}
+
+post-install:
+	${INSTALL_DATA_DIR} ${HTMLDIR}
+	cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html *.txt ${HTMLDIR}
+
+.include "../../security/openssl/buildlink2.mk"
+.include "../../mk/automake.mk"
+.include "../../mk/bsd.pkg.install.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/security/cyrus-sasl2/PLIST.common b/security/cyrus-sasl2/PLIST.common
new file mode 100644
index 00000000000..16b0b0740ad
--- /dev/null
+++ b/security/cyrus-sasl2/PLIST.common
@@ -0,0 +1,93 @@
+@comment $NetBSD: PLIST.common,v 1.1.1.1 2002/10/27 15:09:00 chris Exp $
+bin/sasl-config
+etc/rc.d/saslauthd
+include/sasl/hmac-md5.h
+include/sasl/md5.h
+include/sasl/md5global.h
+include/sasl/prop.h
+include/sasl/sasl.h
+include/sasl/saslplug.h
+include/sasl/saslutil.h
+lib/libsasl2.a
+lib/libsasl2.la
+lib/libsasl2.so
+lib/libsasl2.so.2
+lib/libsasl2.so.2.9
+man/cat8/saslauthd.8
+man/man3/sasl.3
+man/man3/sasl_authorize_t.3
+man/man3/sasl_auxprop.3
+man/man3/sasl_auxprop_getctx.3
+man/man3/sasl_auxprop_request.3
+man/man3/sasl_callbacks.3
+man/man3/sasl_canon_user_t.3
+man/man3/sasl_chalprompt_t.3
+man/man3/sasl_checkapop.3
+man/man3/sasl_checkpass.3
+man/man3/sasl_client_init.3
+man/man3/sasl_client_new.3
+man/man3/sasl_client_start.3
+man/man3/sasl_client_step.3
+man/man3/sasl_decode.3
+man/man3/sasl_dispose.3
+man/man3/sasl_done.3
+man/man3/sasl_encode.3
+man/man3/sasl_encodev.3
+man/man3/sasl_errdetail.3
+man/man3/sasl_errors.3
+man/man3/sasl_errstring.3
+man/man3/sasl_getopt_t.3
+man/man3/sasl_getpath_t.3
+man/man3/sasl_getprop.3
+man/man3/sasl_getrealm_t.3
+man/man3/sasl_getsecret_t.3
+man/man3/sasl_getsimple_t.3
+man/man3/sasl_global_listmech.3
+man/man3/sasl_idle.3
+man/man3/sasl_listmech.3
+man/man3/sasl_log_t.3
+man/man3/sasl_server_init.3
+man/man3/sasl_server_new.3
+man/man3/sasl_server_start.3
+man/man3/sasl_server_step.3
+man/man3/sasl_server_userdb_checkpass_t.3
+man/man3/sasl_server_userdb_setpass_t.3
+man/man3/sasl_setpass.3
+man/man3/sasl_setprop.3
+man/man3/sasl_user_exists.3
+man/man3/sasl_verifyfile_t.3
+sbin/saslauthd
+sbin/sasldblistusers2
+sbin/saslpasswd2
+share/doc/html/cyrus-sasl/advanced.html
+share/doc/html/cyrus-sasl/appconvert.html
+share/doc/html/cyrus-sasl/draft-burdis-cat-srp-sasl-06.txt
+share/doc/html/cyrus-sasl/draft-ietf-cat-sasl-gssapi-05.txt
+share/doc/html/cyrus-sasl/draft-myers-saslrev-02.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
+share/doc/html/cyrus-sasl/macosx.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/sysadmin.html
+share/doc/html/cyrus-sasl/testing.txt
+share/doc/html/cyrus-sasl/upgrading.html
+@dirrm share/doc/html/cyrus-sasl
+@unexec ${RM} -rf ${SASLSOCKETDIR}
diff --git a/security/cyrus-sasl2/PLIST.krb5 b/security/cyrus-sasl2/PLIST.krb5
new file mode 100644
index 00000000000..48d612b6813
--- /dev/null
+++ b/security/cyrus-sasl2/PLIST.krb5
@@ -0,0 +1,6 @@
+@comment $NetBSD: PLIST.krb5,v 1.1.1.1 2002/10/27 15:08:59 chris Exp $
+lib/sasl2/libgssapiv2.a
+lib/sasl2/libgssapiv2.la
+lib/sasl2/libgssapiv2.so
+lib/sasl2/libgssapiv2.so.1
+lib/sasl2/libgssapiv2.so.1.18
diff --git a/security/cyrus-sasl2/PLIST.plugins b/security/cyrus-sasl2/PLIST.plugins
new file mode 100644
index 00000000000..00310a3376d
--- /dev/null
+++ b/security/cyrus-sasl2/PLIST.plugins
@@ -0,0 +1,31 @@
+@comment $NetBSD: PLIST.plugins,v 1.1.1.1 2002/10/27 15:08:59 chris Exp $
+lib/sasl2/libanonymous.a
+lib/sasl2/libanonymous.la
+lib/sasl2/libanonymous.so
+lib/sasl2/libanonymous.so.2
+lib/sasl2/libanonymous.so.2.9
+lib/sasl2/libcrammd5.a
+lib/sasl2/libcrammd5.la
+lib/sasl2/libcrammd5.so
+lib/sasl2/libcrammd5.so.2
+lib/sasl2/libcrammd5.so.2.9
+lib/sasl2/libdigestmd5.a
+lib/sasl2/libdigestmd5.la
+lib/sasl2/libdigestmd5.so
+lib/sasl2/libdigestmd5.so.2
+lib/sasl2/libdigestmd5.so.2.9
+lib/sasl2/libotp.a
+lib/sasl2/libotp.la
+lib/sasl2/libotp.so
+lib/sasl2/libotp.so.2
+lib/sasl2/libotp.so.2.9
+lib/sasl2/libplain.a
+lib/sasl2/libplain.la
+lib/sasl2/libplain.so
+lib/sasl2/libplain.so.2
+lib/sasl2/libplain.so.2.9
+lib/sasl2/libsasldb.a
+lib/sasl2/libsasldb.la
+lib/sasl2/libsasldb.so
+lib/sasl2/libsasldb.so.2
+lib/sasl2/libsasldb.so.2.9
diff --git a/security/cyrus-sasl2/README.html b/security/cyrus-sasl2/README.html
new file mode 100644
index 00000000000..1ca91463133
--- /dev/null
+++ b/security/cyrus-sasl2/README.html
@@ -0,0 +1,117 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!-- $NetBSD: README.html,v 1.1.1.1 2002/10/27 15:09:00 chris Exp $ -->
+<html>
+<head>
+<title>The NetBSD Packages Collection: security/cyrus-sasl</title>
+</head> 
+<body bgcolor="#ffffff">
+
+<a href="http://www.mckusick.com/beastie/mainpage/copyright.html">
+<img align="right" src="../../templates/pkg-daemon.gif" alt="Daemon Power"
+	width="147" height="121" border="0">
+</a>
+<h1>The NetBSD Packages Collection: <i>security/cyrus-sasl</i></h1>
+
+<p>Brief description of the package:<br>
+<I>
+Simple Authentication and Security Layer
+</I>
+</p>
+
+<p>Please read the file "<a href="DESCR">DESCR</a>" for a
+longer description, or browse the package's
+<A HREF="http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/security/cyrus-sasl/">history</A>.
+</p>
+
+<p>This package has a home page at <a HREF="http://asg.web.cmu.edu/sasl/">http://asg.web.cmu.edu/sasl/</a>.</p>
+
+
+
+<p>The package is located in the 
+"<A HREF=".">security/cyrus-sasl</A>"
+directory.
+The current source version of the package is
+"cyrus-sasl-1.5.27nb1".
+For a summary on how to use the package collection, go to the
+<a href="../../README.html">top of the packages tree</a>.
+</p>
+
+<p>Problem reports, updates or suggestions for this package should be
+reported with
+<a href="http://www.netbsd.org/Misc/send-pr.html">send-pr.</a></p>
+
+<P>
+The following security vulnerabilities are known for security/cyrus-sasl
+at Aug 15 03:23
+:
+<UL>
+<STRONG><LI>cyrus-sasl&lt;1.5.27 has a remote-code-execution exploit (see <a href="http://www.securityfocus.com/bid/3498">http://www.securityfocus.com/bid/3498</a> for more details)</STRONG>
+</UL>
+If you have a vulnerable package installed on any machine, you are
+advised to remove the package
+immediately, using the standard package tools.
+The <a href="../../security/audit-packages/README.html">audit-packages</a>
+package locates any installed package which has been mentioned in security
+advisories as being vulnerable.
+</P>
+
+
+<p>
+This package requires the following package(s) to build:
+<a href="../../devel/autoconf/README.html">autoconf-2.13</A>
+<a href="../../devel/automake/README.html">automake-1.4.5nb1</A>
+<a href="../../devel/gmake/README.html">gmake-3.79.1</A>
+<a href="../../devel/libtool-base/README.html">libtool-base-1.4.20010614nb9</A>
+<a href="../../devel/m4/README.html">m4-1.4</A>
+<a href="../../lang/perl5/README.html">perl-5.6.1nb7</A>
+<a href="../../security/openssl/README.html">openssl-0.9.6g</A>
+.
+</p>
+<p>
+This package requires the following package(s) to run:
+openssl>=0.9.6e
+.
+</p>
+
+<p>
+Select one of the links below to <FONT COLOR="red">download</FONT> the
+package in precompiled binary form for installation with pkg_add(1).
+Available machine architectures and package versions: 
+<TABLE>
+<TR><TD>amigappc:<TD><a href="ftp://ftp.netbsd.org/pub/NetBSD/packages/1.5/amigappc/All/cyrus-sasl-1.5.27.tgz">cyrus-sasl-1.5.27</a> <TD>(NetBSD 1.5)
+<TR><TD>amigappc:<TD><a href="ftp://ftp.netbsd.org/pub/NetBSD/packages/1.6/amigappc/All/cyrus-sasl-1.5.27.tgz">cyrus-sasl-1.5.27</a> <TD>(NetBSD 1.6)
+<TR><TD>arc:<TD><a href="ftp://ftp.netbsd.org/pub/NetBSD/packages/1.5/arc/All/cyrus-sasl-1.5.27.tgz">cyrus-sasl-1.5.27</a> <TD>(NetBSD 1.5)
+<TR><TD>arm32:<TD><a href="ftp://ftp.netbsd.org/pub/NetBSD/packages/1.5/arm32/All/cyrus-sasl-1.5.27.tgz">cyrus-sasl-1.5.27</a> <TD>(NetBSD 1.5)
+<TR><TD>bebox:<TD><a href="ftp://ftp.netbsd.org/pub/NetBSD/packages/1.5/bebox/All/cyrus-sasl-1.5.27.tgz">cyrus-sasl-1.5.27</a> <TD>(NetBSD 1.5)
+<TR><TD>bebox:<TD><a href="ftp://ftp.netbsd.org/pub/NetBSD/packages/1.6/bebox/All/cyrus-sasl-1.5.27.tgz">cyrus-sasl-1.5.27</a> <TD>(NetBSD 1.6)
+<TR><TD>cobalt:<TD><a href="ftp://ftp.netbsd.org/pub/NetBSD/packages/1.5/cobalt/All/cyrus-sasl-1.5.27.tgz">cyrus-sasl-1.5.27</a> <TD>(NetBSD 1.5)
+<TR><TD>hpcmips:<TD><a href="ftp://ftp.netbsd.org/pub/NetBSD/packages/1.5/hpcmips/All/cyrus-sasl-1.5.27.tgz">cyrus-sasl-1.5.27</a> <TD>(NetBSD 1.5)
+<TR><TD>i386:<TD><a href="ftp://ftp.netbsd.org/pub/NetBSD/packages/1.5/i386/All/cyrus-sasl-1.5.27.tgz">cyrus-sasl-1.5.27</a> <TD>(NetBSD 1.5)
+<TR><TD>i386:<TD><a href="ftp://ftp.netbsd.org/pub/NetBSD/packages/1.6/i386/All/cyrus-sasl-1.5.27.tgz">cyrus-sasl-1.5.27</a> <TD>(NetBSD 1.6)
+<TR><TD>macppc:<TD><a href="ftp://ftp.netbsd.org/pub/NetBSD/packages/1.5/macppc/All/cyrus-sasl-1.5.27.tgz">cyrus-sasl-1.5.27</a> <TD>(NetBSD 1.5)
+<TR><TD>macppc:<TD><a href="ftp://ftp.netbsd.org/pub/NetBSD/packages/1.6/macppc/All/cyrus-sasl-1.5.27.tgz">cyrus-sasl-1.5.27</a> <TD>(NetBSD 1.6)
+<TR><TD>pmax:<TD><a href="ftp://ftp.netbsd.org/pub/NetBSD/packages/1.5/pmax/All/cyrus-sasl-1.5.27.tgz">cyrus-sasl-1.5.27</a> <TD>(NetBSD 1.5)
+<TR><TD>powerpc:<TD><a href="ftp://ftp.netbsd.org/pub/NetBSD/packages/1.5/powerpc/All/cyrus-sasl-1.5.27.tgz">cyrus-sasl-1.5.27</a> <TD>(NetBSD 1.5)
+<TR><TD>powerpc:<TD><a href="ftp://ftp.netbsd.org/pub/NetBSD/packages/1.6/powerpc/All/cyrus-sasl-1.5.27.tgz">cyrus-sasl-1.5.27</a> <TD>(NetBSD 1.6)
+<TR><TD>prep:<TD><a href="ftp://ftp.netbsd.org/pub/NetBSD/packages/1.5/prep/All/cyrus-sasl-1.5.27.tgz">cyrus-sasl-1.5.27</a> <TD>(NetBSD 1.5)
+<TR><TD>prep:<TD><a href="ftp://ftp.netbsd.org/pub/NetBSD/packages/1.6/prep/All/cyrus-sasl-1.5.27.tgz">cyrus-sasl-1.5.27</a> <TD>(NetBSD 1.6)
+<TR><TD>sparc:<TD><a href="ftp://ftp.netbsd.org/pub/NetBSD/packages/1.5.3/sparc/All/cyrus-sasl-1.5.27.tgz">cyrus-sasl-1.5.27</a> <TD>(NetBSD 1.5.3)
+</TABLE>
+
+<p>
+The NetBSD packages collection is designed to permit
+            easy <a href="../../README">installation from source</a> -
+            particularly useful if the latest binary package is
+            not available for your chosen platform.
+</p>
+
+<hr noshade>
+[
+<a href="../README.html"> Go up one level</a>
+|
+<a href="../../README.html"> Go to top of packages tree</a>
+|
+<a href="../../README-all.html"> List all packages</a>
+]
+</body>
+</html>
diff --git a/security/cyrus-sasl2/buildlink.mk b/security/cyrus-sasl2/buildlink.mk
new file mode 100644
index 00000000000..4a80caef9ab
--- /dev/null
+++ b/security/cyrus-sasl2/buildlink.mk
@@ -0,0 +1,55 @@
+# $NetBSD: buildlink.mk,v 1.1.1.1 2002/10/27 15:08:59 chris Exp $
+#
+# This Makefile fragment is included by packages that use cyrus-sasl.
+#
+# To use this Makefile fragment, simply:
+#
+# (1) Optionally define BUILDLINK_DEPENDS.cyrus-sasl to the dependency pattern
+#     for the version of cyrus-sasl desired.
+# (2) Include this Makefile fragment in the package Makefile,
+# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
+#     search path, and
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
+#     path.
+
+.if !defined(CYRUS_SASL_BUILDLINK_MK)
+CYRUS_SASL_BUILDLINK_MK=	# defined
+
+.include "../../mk/bsd.buildlink.mk"
+
+BUILDLINK_DEPENDS.cyrus-sasl?=	cyrus-sasl>=2.1.7
+DEPENDS+=	${BUILDLINK_DEPENDS.cyrus-sasl}:../../security/cyrus-sasl
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.cyrus-sasl=cyrus-sasl
+BUILDLINK_PREFIX.cyrus-sasl_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.cyrus-sasl=		include/sasl/hmac-md5.h
+BUILDLINK_FILES.cyrus-sasl+=		include/sasl/prop.h
+BUILDLINK_FILES.cyrus-sasl+=		include/sasl/sasl.h
+BUILDLINK_FILES.cyrus-sasl+=		include/sasl/saslplug.h
+BUILDLINK_FILES.cyrus-sasl+=		include/sasl/saslutil.h
+BUILDLINK_FILES.cyrus-sasl+=		lib/libsasl2.*
+
+.if defined(USE_PAM)
+.include "../../security/PAM/buildlink.mk"
+.endif
+
+BUILDLINK_TARGETS.cyrus-sasl=		cyrus-sasl-buildlink
+BUILDLINK_TARGETS.cyrus-sasl+=		cyrus-sasl-buildlink-config-wrapper
+BUILDLINK_TARGETS+=			${BUILDLINK_TARGETS.cyrus-sasl}
+
+BUILDLINK_CONFIG.cyrus-sasl=		${BUILDLINK_PREFIX.cyrus-sasl}/bin/sasl-config
+BUILDLINK_CONFIG_WRAPPER.cyrus-sasl=	${BUILDLINK_DIR}/bin/sasl-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.cyrus-sasl}|${BUILDLINK_CONFIG.cyrus-sasl}|g"
+
+.if defined(USE_CONFIG_WRAPPER)
+SASL_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.cyrus-sasl}
+CONFIGURE_ENV+=		SASL_CONFIG="${SASL_CONFIG}"
+MAKE_ENV+=		SASL_CONFIG="${SASL_CONFIG}"
+.endif
+
+pre-configure: ${BUILDLINK_TARGETS.cyrus-sasl}
+cyrus-sasl-buildlink: _BUILDLINK_USE
+cyrus-sasl-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
+
+.endif	# CYRUS_SASL_BUILDLINK_MK
diff --git a/security/cyrus-sasl2/buildlink2.mk b/security/cyrus-sasl2/buildlink2.mk
new file mode 100644
index 00000000000..477ec8e4e59
--- /dev/null
+++ b/security/cyrus-sasl2/buildlink2.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink2.mk,v 1.1.1.1 2002/10/27 15:09:00 chris Exp $
+
+.if !defined(CYRUS_SASL_BUILDLINK2_MK)
+CYRUS_SASL_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=			cyrus-sasl
+BUILDLINK_DEPENDS.cyrus-sasl?=		cyrus-sasl>=2.1.9
+BUILDLINK_PKGSRCDIR.cyrus-sasl?=	../../security/cyrus-sasl2
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.cyrus-sasl=cyrus-sasl
+BUILDLINK_PREFIX.cyrus-sasl_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.cyrus-sasl=	include/sasl/*
+BUILDLINK_FILES.cyrus-sasl+=	lib/libsasl2.*
+
+.if defined(USE_PAM)
+.  include "../../security/PAM/buildlink2.mk"
+.endif
+
+BUILDLINK_TARGETS+=	cyrus-sasl-buildlink
+
+cyrus-sasl-buildlink: _BUILDLINK_USE
+
+.endif	# CYRUS_SASL_BUILDLINK2_MK
diff --git a/security/cyrus-sasl2/distinfo b/security/cyrus-sasl2/distinfo
new file mode 100644
index 00000000000..a6613b9a3a2
--- /dev/null
+++ b/security/cyrus-sasl2/distinfo
@@ -0,0 +1,12 @@
+$NetBSD: distinfo,v 1.1.1.1 2002/10/27 15:08:59 chris Exp $
+
+SHA1 (cyrus-sasl-2.1.9.tar.gz) = 6e920454702796c8e6c8482b74ee19f8280bc80b
+Size (cyrus-sasl-2.1.9.tar.gz) = 1274451 bytes
+SHA1 (patch-aa) = 20199f558a1a1147440a40334ea1132bf9b966fd
+SHA1 (patch-ab) = f60a2df79744832495cb93e97ca5dfd7b1167415
+SHA1 (patch-ac) = 828b3129769ee3224af31dd44fe8c9d6205c4bfa
+SHA1 (patch-ad) = 1811fd87ccee6de8a151e8e684344e6f3a7a8830
+SHA1 (patch-ae) = cfd176eea2e1dba320be14a7d9bf2a4426ba39ad
+SHA1 (patch-af) = 3af5330d1b3e242345ce9a7483ce6c73ed55d629
+SHA1 (patch-ag) = 43f1e4417d872d189716f7831f50b3c55d5cd7e3
+SHA1 (patch-ah) = 9f9121b63e28f9b07dfd9da4f7a786ff15097b58
diff --git a/security/cyrus-sasl2/files/sasl-config.in b/security/cyrus-sasl2/files/sasl-config.in
new file mode 100644
index 00000000000..2af91c1339a
--- /dev/null
+++ b/security/cyrus-sasl2/files/sasl-config.in
@@ -0,0 +1,102 @@
+#!/bin/sh
+#
+# $NetBSD: sasl-config.in,v 1.1.1.1 2002/10/27 15:09:00 chris Exp $
+
+sasl_libs="%%sasl_config_LIBS%%"
+sasl_cflags="%%sasl_config_CFLAGS%%"
+
+prefix=%%prefix%%
+exec_prefix=${prefix}
+exec_prefix_set=no
+
+usage()
+{
+	cat <<EOF
+Usage: sasl-config [OPTIONS]
+Options:
+	[--prefix[=DIR]]
+	[--exec-prefix[=DIR]]
+	[--version]
+	[--libs]
+	[--cflags]
+EOF
+	exit $1
+}
+
+if test $# -eq 0; then
+	usage 1 1>&2
+fi
+
+while test $# -gt 0; do
+  case "$1" in
+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+  *) optarg= ;;
+  esac
+
+  case $1 in
+    --prefix=*)
+      prefix=$optarg
+      if test $exec_prefix_set = no ; then
+        exec_prefix=$optarg
+      fi
+      ;;
+    --prefix)
+      echo_prefix=yes
+      ;;
+    --exec-prefix=*)
+      exec_prefix=$optarg
+      exec_prefix_set=yes
+      ;;
+    --exec-prefix)
+      echo_exec_prefix=yes
+      ;;
+    --version)
+      echo %%VERSION%%
+      ;;
+    --cflags)
+      echo_cflags=yes
+      ;;
+    --libs)
+      echo_libs=yes
+      ;;
+    *)
+      usage 1 1>&2
+      ;;
+  esac
+  shift
+done
+
+if test "$echo_prefix" = "yes"; then
+	echo $prefix
+fi
+
+if test "$echo_exec_prefix" = "yes"; then
+	echo $exec_prefix
+fi
+
+if test "$echo_cflags" = "yes"; then
+      if test ${prefix}/include != /usr/include ; then
+        includes=-I${prefix}/include
+        for i in $sasl_cflags ; do
+          if test $i = -I${prefix}/include ; then
+            includes=""
+          fi
+        done
+      fi
+      echo $includes $sasl_cflags
+fi
+
+if test "$echo_libs" = "yes"; then
+      libdirs="-L${exec_prefix}/lib -Wl,-R${exec_prefix}/lib"
+      for i in $sasl_libs ; do
+        if test $i != -L${exec_prefix}/lib -a $i != -Wl,-R${exec_prefix}/lib ; then
+          if test -z "$my_sasl_libs" ; then
+            my_sasl_libs="$i"
+          else
+            my_sasl_libs="$my_sasl_libs $i"
+          fi
+        fi
+      done
+
+      echo $libdirs $my_sasl_libs
+fi
diff --git a/security/cyrus-sasl2/files/saslauthd.sh b/security/cyrus-sasl2/files/saslauthd.sh
new file mode 100644
index 00000000000..84a31a47826
--- /dev/null
+++ b/security/cyrus-sasl2/files/saslauthd.sh
@@ -0,0 +1,45 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: saslauthd.sh,v 1.1.1.1 2002/10/27 15:09:00 chris Exp $
+#
+# The saslauthd daemon allows cleartext UNIX password authentication via
+# several authentication mechanisms with Cyrus SASL.
+#
+# PROVIDE: saslauthd
+# REQUIRE: DAEMON
+
+if [ -f /etc/rc.subr ]
+then
+	. /etc/rc.subr
+fi
+
+name="saslauthd"
+rcvar="${name}"
+command="@PREFIX@/sbin/saslauthd"
+command_args="& sleep 2"
+start_precmd="saslauthd_precmd"
+
+# Default to authenticating against local password database.
+if [ -z "${saslauthd_flags}" ]
+then
+	saslauthd_flags="-a getpwent"
+fi
+
+saslauthd_precmd()
+{
+        if [ ! -d @SASLSOCKETDIR@ ]
+        then
+                @MKDIR@ @SASLSOCKETDIR@
+                @CHMOD@ 0700 @SASLSOCKETDIR@
+                @CHOWN@ @CYRUS_USER@ @SASLSOCKETDIR@
+        fi
+}
+
+if [ -f /etc/rc.subr ]
+then
+	load_rc_config $name
+	run_rc_command "$1"
+else
+	@ECHO@ -n " ${name}"
+	${command} ${saslauthd_flags} ${command_args}
+fi
diff --git a/security/cyrus-sasl2/patches/patch-aa b/security/cyrus-sasl2/patches/patch-aa
new file mode 100644
index 00000000000..087fd4d1117
--- /dev/null
+++ b/security/cyrus-sasl2/patches/patch-aa
@@ -0,0 +1,34 @@
+$NetBSD: patch-aa,v 1.1.1.1 2002/10/27 15:09:00 chris Exp $
+
+--- configure.in.orig	Fri Oct 11 21:56:29 2002
++++ configure.in	Sun Oct 27 14:06:01 2002
+@@ -86,13 +86,13 @@
+   dnl xxx we should add -W at some point (but that might scare people)
+   CFLAGS="-Wall ${CFLAGS}"
+   GCC_VERSION=`gcc -v 2>&1 | sed -n -e '/version/s/.*version \([[0-9]]\)\..*/\1/p'`
+-  if test "$GCC_VERSION" != "3"; then
+-    CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
+-  fi
+-else
+-  CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
+ fi 
+-CMU_ADD_LIBPATH("/usr/local/lib")
++
++AC_PATH_PROG(SED, sed, no)
++if test "$SED" = "no"; then
++  AC_ERROR([sed is required to build sasl-config])
++fi
++AC_SUBST(SED)
+ 
+ AM_DISABLE_STATIC
+ 
+@@ -832,6 +832,9 @@
+ LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.o/.lo/g'`
+ AC_SUBST(LIBOBJS)
+ AC_SUBST(LTLIBOBJS)
++
++dnl Check for /dev/urandom
++AC_CHECK_FILE(/dev/urandom, AC_DEFINE_UNQUOTED(SASL_DEV_RANDOM, "/dev/urandom"))
+ 
+ AC_C_CONST
+ AC_C_INLINE
diff --git a/security/cyrus-sasl2/patches/patch-ab b/security/cyrus-sasl2/patches/patch-ab
new file mode 100644
index 00000000000..b5c04f5a45d
--- /dev/null
+++ b/security/cyrus-sasl2/patches/patch-ab
@@ -0,0 +1,35 @@
+$NetBSD: patch-ab,v 1.1.1.1 2002/10/27 15:09:00 chris Exp $
+
+--- plugins/Makefile.am.orig	Sun Oct 27 14:07:27 2002
++++ plugins/Makefile.am	Sun Oct 27 14:09:58 2002
+@@ -79,6 +79,10 @@
+ 	libgssapiv2.la libdigestmd5.la liblogin.la libsrp.la libotp.la \
+ 	libntlm.la libsasldb.la libmysql.la
+ 
++bin_SCRIPTS = sasl-config
++sasl_config_CFLAGS = $(CPPFLAGS)
++sasl_config_LIBS = $(libplain_la_LIBADD) $(libkerberos4_la_LIBADD) $(libgssapiv2_la_LIBADD) $(libdigestmd5_la_LIBADD) $(liblogin_la_LIBADD) $(libsrp_la_LIBADD) $(libopt_la_LIBADD) $(libsasldb_la_LIBADD) $(libmysql_ls_LIBADD)
++
+ libplain_la_SOURCES = plain.c plain_init.c $(common_sources)
+ libplain_la_LDFLAGS = -version-info $(plain_version)
+ libplain_la_DEPENDENCIES = $(COMPAT_OBJS)
+@@ -133,7 +137,7 @@
+ libsasldb_la_SOURCES = sasldb.c sasldb_init.c $(common_sources)
+ libsasldb_la_LDFLAGS = -version-info $(sasldb_version)
+ libsasldb_la_DEPENDENCIES = $(COMPAT_OBJS)
+-libsasldb_la_LIBADD = ../sasldb/libsasldb.la $(SASL_DB_LIB) $(COMPAT_OBJS)
++libsasldb_la_LIBADD = $(SASL_DB_LIB) $(COMPAT_OBJS)
+ 
+ # Auxprop Plugins
+ libmysql_la_SOURCES = mysql.c mysql_init.c $(common_sources)
+@@ -160,4 +164,9 @@
+ 	cd ../lib; $(MAKE) $(COMPAT_OBJS)
+ 	for file in $(COMPAT_OBJS); do ln -s ../lib/$$file .; done
+ 
+-
++sasl-config: sasl-config.in
++	$(SED)  -e "s,%%sasl_config_LIBS%%,$(sasl_config_LIBS),g" \
++		-e "s,%%sasl_config_CFLAGS%%,$(sasl_config_CFLAGS),g" \
++		-e "s,%%prefix%%,$(prefix),g" \
++		-e "s,%%VERSION%%,$(VERSION),g" \
++		< sasl-config.in > sasl-config
diff --git a/security/cyrus-sasl2/patches/patch-ac b/security/cyrus-sasl2/patches/patch-ac
new file mode 100644
index 00000000000..633112324b1
--- /dev/null
+++ b/security/cyrus-sasl2/patches/patch-ac
@@ -0,0 +1,25 @@
+$NetBSD: patch-ac,v 1.1.1.1 2002/10/27 15:09:00 chris Exp $
+
+--- acconfig.h.orig	Sun Oct 27 14:12:42 2002
++++ acconfig.h	Sun Oct 27 14:12:46 2002
+@@ -202,6 +202,9 @@
+ /* do we use doors for IPC? */
+ #undef USE_DOORS
+ 
++/* location of the random number generator */
++#undef SASL_DEV_RANDOM
++
+ @BOTTOM@
+ 
+ /* Create a struct iovec if we need one */
+@@ -217,7 +220,9 @@
+ #endif
+ 
+ /* location of the random number generator */
+-#ifndef DEV_RANDOM
++#ifdef SASL_DEV_RANDOM
++#define DEV_RANDOM SASL_DEV_RANDOM
++#else
+ #define DEV_RANDOM "/dev/random"
+ #endif
+ 
diff --git a/security/cyrus-sasl2/patches/patch-ad b/security/cyrus-sasl2/patches/patch-ad
new file mode 100644
index 00000000000..8c2ce98030d
--- /dev/null
+++ b/security/cyrus-sasl2/patches/patch-ad
@@ -0,0 +1,15 @@
+$NetBSD: patch-ad,v 1.1.1.1 2002/10/27 15:09:00 chris Exp $
+
+--- include/hmac-md5.h.orig	Sun Oct 27 14:14:03 2002
++++ include/hmac-md5.h	Sun Oct 27 14:14:14 2002
+@@ -15,8 +15,8 @@
+  *  values stored in network byte order (Big Endian)
+  */
+ typedef struct HMAC_MD5_STATE_s {
+-    UINT4 istate[4];
+-    UINT4 ostate[4];
++    uint32_t istate[4];
++    uint32_t ostate[4];
+ } HMAC_MD5_STATE;
+ 
+ /* One step hmac computation
diff --git a/security/cyrus-sasl2/patches/patch-ae b/security/cyrus-sasl2/patches/patch-ae
new file mode 100644
index 00000000000..1814fdf1042
--- /dev/null
+++ b/security/cyrus-sasl2/patches/patch-ae
@@ -0,0 +1,16 @@
+$NetBSD: patch-ae,v 1.1.1.1 2002/10/27 15:09:00 chris Exp $
+
+--- sample/server.c.orig	Sun Oct 27 14:15:37 2002
++++ sample/server.c	Sun Oct 27 14:15:40 2002
+@@ -117,9 +117,9 @@
+ 	}
+ #if defined(IPV6_V6ONLY) && !(defined(__FreeBSD__) && __FreeBSD__ < 3)
+ 	if (r->ai_family == AF_INET6) {
+-	    if (setsockopt(*sock, IPPROTO_IPV6, IPV6_BINDV6ONLY,
++	    if (setsockopt(*sock, IPPROTO_IPV6, IPV6_V6ONLY,
+ 			   (void *) &on, sizeof(on)) < 0) {
+-		perror("setsockopt (IPV6_BINDV6ONLY)");
++		perror("setsockopt (IPV6_V6ONLY)");
+ 		close(*sock);
+ 		continue;
+ 	    }
diff --git a/security/cyrus-sasl2/patches/patch-af b/security/cyrus-sasl2/patches/patch-af
new file mode 100644
index 00000000000..af63df68ef2
--- /dev/null
+++ b/security/cyrus-sasl2/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1.1.1 2002/10/27 15:09:00 chris Exp $
+
+--- plugins/cram.c.orig	Sun Oct 27 14:17:33 2002
++++ plugins/cram.c	Sun Oct 27 14:17:47 2002
+@@ -235,7 +235,7 @@
+     HMAC_MD5_STATE md5state;
+     int clear_md5state = 0;
+     char *digest_str = NULL;
+-    UINT4 digest[4];
++    uint32_t digest[4];
+     
+     /* extract userid; everything before last space */
+     pos = clientinlen-1;
diff --git a/security/cyrus-sasl2/patches/patch-ag b/security/cyrus-sasl2/patches/patch-ag
new file mode 100644
index 00000000000..8d39028e755
--- /dev/null
+++ b/security/cyrus-sasl2/patches/patch-ag
@@ -0,0 +1,16 @@
+$NetBSD: patch-ag,v 1.1.1.1 2002/10/27 15:09:00 chris Exp $
+
+--- plugins/gssapi.c.orig	Sun Oct 27 14:18:03 2002
++++ plugins/gssapi.c	Sun Oct 27 14:18:25 2002
+@@ -51,6 +51,11 @@
+ #include <gssapi/gssapi.h>
+ #endif
+ 
++/* Heimdal has this, but MIT Kerberos doesn't */
++#ifndef GSS_C_NO_NAME
++#define GSS_C_NO_NAME  ((gss_name_t) 0)
++#endif
++
+ #ifdef WIN32
+ #  include <winsock.h>
+ 
diff --git a/security/cyrus-sasl2/patches/patch-ah b/security/cyrus-sasl2/patches/patch-ah
new file mode 100644
index 00000000000..1dbe0d48e89
--- /dev/null
+++ b/security/cyrus-sasl2/patches/patch-ah
@@ -0,0 +1,30 @@
+$NetBSD: patch-ah,v 1.1.1.1 2002/10/27 15:09:00 chris Exp $
+
+--- lib/Makefile.am.orig	Fri Oct 11 22:19:04 2002
++++ lib/Makefile.am	Sun Oct 27 14:32:57 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,11 +60,8 @@
+ libsasl2_la_DEPENDENCIES = $(LTLIBOBJS)
+ libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET)
+ 
+-plugin_common.lo: plugin_common.o
+-	ln -s $(top_builddir)/plugins/plugin_common.lo plugin_common.lo
+-
+-plugin_common.o:
+-	ln -s $(top_builddir)/plugins/plugin_common.o plugin_common.o
++plugin_common.c:
++	ln -s $(top_builddir)/plugins/plugin_common.c plugin_common.c
+ 
+ if MACOSX
+ framedir = /Library/Frameworks/SASL2.framework