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.

8 files changed, 184 insertions, 0 deletions

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