6 files changed, 114 insertions, 31 deletions

diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index 03481795a022..21718a4dafb7 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cyrus-sasl
-PORTVERSION=	2.1.12
+PORTVERSION=	2.1.13
 #PORTREVISION=	0
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
@@ -49,6 +49,7 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
 		--mandir=${MANPREFIX}/man \
 		--enable-static \
 		--enable-login \
+		--enable-ntlm \
 		--with-saslauthd \
 		--enable-auth-sasldb \
 		--with-rc4=openssl
@@ -104,10 +105,10 @@ CYRUS_GROUP?=	cyrus
 DOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README
 
 DOC2=	ONEWS TODO draft-burdis-cat-srp-sasl-06.txt \
-	draft-ietf-cat-sasl-gssapi-05.txt draft-melnikov-rfc2831bis-02.txt \
+	draft-ietf-cat-sasl-gssapi-05.txt draft-ietf-sasl-anon-00.txt \
+	draft-ietf-sasl-plain-00.txt draft-ietf-sasl-rfc2831bis-00.txt \
 	draft-myers-saslrev-02.txt draft-nerenberg-sasl-crammd5-03.txt \
-	draft-newman-sasl-c-api-00.txt draft-sasl-login.txt \
-	draft-zeilenga-sasl-anon-01.txt draft-zeilenga-sasl-plain-01.txt \
+	draft-newman-sasl-c-api-01.txt draft-sasl-login.txt \
 	rfc1321.txt rfc1939.txt rfc2104.txt rfc2195.txt rfc2222.txt \
 	rfc2243.txt rfc2245.txt rfc2289.txt rfc2444.txt rfc2595.txt \
 	rfc2831.txt rfc2945.txt rfc3174.txt server-plugin-flow.fig \
diff --git a/security/cyrus-sasl2/distinfo b/security/cyrus-sasl2/distinfo
index c27ed37d1f88..9f3654626543 100644
--- a/security/cyrus-sasl2/distinfo
+++ b/security/cyrus-sasl2/distinfo
@@ -1 +1 @@
-MD5 (cyrus-sasl-2.1.12.tar.gz) = 42cdb218959eb46c3ea70728c9da4385
+MD5 (cyrus-sasl-2.1.13.tar.gz) = 1114d59d970791932e96de8557472672
diff --git a/security/cyrus-sasl2/files/patch-config::ltmain.sh b/security/cyrus-sasl2/files/patch-config::ltmain.sh
index 4f45833e4554..ae5ba843aee9 100644
--- a/security/cyrus-sasl2/files/patch-config::ltmain.sh
+++ b/security/cyrus-sasl2/files/patch-config::ltmain.sh
@@ -1,7 +1,32 @@
-Index: config/ltmain.sh
-diff -u config/ltmain.sh.orig config/ltmain.sh
 --- config/ltmain.sh.orig	Tue Sep  3 23:59:40 2002
 +++ config/ltmain.sh	Sat Oct 12 08:03:59 2002
+@@ -1894,7 +1894,7 @@
+ 	  if test $? -eq 0 ; then
+ 	    ldd_output=`ldd conftest`
+ 	    for i in $deplibs; do
+-	      name="`expr $i : '-l\(.*\)'`"
++	      name="`expr X$i : 'X-l\(.*\)'`"
+ 	      # If $name is empty we are operating on a -L argument.
+ 	      if test "$name" != "" ; then
+ 		libname=`eval \\$echo \"$libname_spec\"`
+@@ -1919,7 +1919,7 @@
+ 	    # Error occured in the first compile.  Let's try to salvage the situation:
+ 	    # Compile a seperate program for each library.
+ 	    for i in $deplibs; do
+-	      name="`expr $i : '-l\(.*\)'`"
++	      name="`expr X$i : 'X-l\(.*\)'`"
+ 	     # If $name is empty we are operating on a -L argument.
+ 	      if test "$name" != "" ; then
+ 		$rm conftest
+@@ -1959,7 +1959,7 @@
+ 	  set dummy $deplibs_check_method
+ 	  file_magic_regex="`expr \"$deplibs_check_method\" : \"$2 \(.*\)\"`"
+ 	  for a_deplib in $deplibs; do
+-	    name="`expr $a_deplib : '-l\(.*\)'`"
++	    name="`expr X$a_deplib : 'X-l\(.*\)'`"
+ 	    # If $name is empty we are operating on a -L argument.
+ 	    if test "$name" != "" ; then
+ 	      libname=`eval \\$echo \"$libname_spec\"`
 @@ -3391,8 +3391,8 @@
  	# Install the pseudo-library for information purposes.
  	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
diff --git a/security/cyrus-sasl2/files/patch-saslauthd::Makefile.in b/security/cyrus-sasl2/files/patch-saslauthd::Makefile.in
deleted file mode 100644
index 06bc2973ab0c..000000000000
--- a/security/cyrus-sasl2/files/patch-saslauthd::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: saslauthd/Makefile.in
-diff -u saslauthd/Makefile.in.orig saslauthd/Makefile.in
---- saslauthd/Makefile.in.orig	Sat Aug 10 01:13:07 2002
-+++ saslauthd/Makefile.in	Sat Aug 10 03:58:24 2002
-@@ -105,7 +105,7 @@
- 
- EXTRA_DIST = saslauthd.8 saslauthd.mdoc config include 		  getnameinfo.c getaddrinfo.c saslauthd-unix.c 		  saslauthd-doors.c LDAP_SASLAUTHD
- 
--INCLUDES = -I$(top_srcdir)/include
-+INCLUDES = -I../include
- DEFS = @DEFS@ -DSASLAUTHD_CONF_FILE_DEFAULT=\"@sysconfdir@/saslauthd.conf\" -I. -I$(srcdir) -I..
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
diff --git a/security/cyrus-sasl2/pkg-plist b/security/cyrus-sasl2/pkg-plist
index 21adbbaff4be..23478f4ee9f4 100644
--- a/security/cyrus-sasl2/pkg-plist
+++ b/security/cyrus-sasl2/pkg-plist
@@ -31,6 +31,9 @@ lib/sasl2/liblogin.so.2
 %%MYSQL%%lib/sasl2/libmysql.a
 %%MYSQL%%lib/sasl2/libmysql.so
 %%MYSQL%%lib/sasl2/libmysql.so.2
+lib/sasl2/libntlm.a
+lib/sasl2/libntlm.so
+lib/sasl2/libntlm.so.2
 %%OTP%%lib/sasl2/libotp.a
 %%OTP%%lib/sasl2/libotp.so
 %%OTP%%lib/sasl2/libotp.so.2
@@ -55,13 +58,13 @@ sbin/saslpasswd2
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/draft-burdis-cat-srp-sasl-06.txt
 %%PORTDOCS%%%%DOCSDIR%%/draft-ietf-cat-sasl-gssapi-05.txt
-%%PORTDOCS%%%%DOCSDIR%%/draft-melnikov-rfc2831bis-02.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-anon-00.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-plain-00.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-rfc2831bis-00.txt
 %%PORTDOCS%%%%DOCSDIR%%/draft-myers-saslrev-02.txt
 %%PORTDOCS%%%%DOCSDIR%%/draft-nerenberg-sasl-crammd5-03.txt
-%%PORTDOCS%%%%DOCSDIR%%/draft-newman-sasl-c-api-00.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-newman-sasl-c-api-01.txt
 %%PORTDOCS%%%%DOCSDIR%%/draft-sasl-login.txt
-%%PORTDOCS%%%%DOCSDIR%%/draft-zeilenga-sasl-anon-01.txt
-%%PORTDOCS%%%%DOCSDIR%%/draft-zeilenga-sasl-plain-01.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc1321.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc1939.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc2104.txt
diff --git a/security/cyrus-sasl2/scripts/configure.sasl b/security/cyrus-sasl2/scripts/configure.sasl
index 0ced2b0a6a71..de595adfc6bb 100644
--- a/security/cyrus-sasl2/scripts/configure.sasl
+++ b/security/cyrus-sasl2/scripts/configure.sasl
@@ -8,7 +8,11 @@ fi
 tempfile=`mktemp -t checklist`
 
 if [ "${BATCH}" ]; then
-	if [ "${WITH_DB3}" ]; then
+	if [ "${WITH_DB41}" ]; then
+		OPTIONS="\"DB41\""
+	elif [ "${WITH_DB4}" ]; then
+		OPTIONS="\"DB4\""
+	elif [ "${WITH_DB3}" ]; then
 		OPTIONS="\"DB3\""
 	else
 		OPTIONS="\"NDBM\""
@@ -16,7 +20,9 @@ if [ "${BATCH}" ]; then
 	if [ "${WITH_MYSQL}" ]; then
 		OPTIONS="${OPTIONS} \"MySQL\""
 	fi
-	if [ "${WITH_LDAP}" ]; then
+	if [ "${WITH_LDAP21}" ]; then
+		OPTIONS="${OPTIONS} \"OpenLDAP21\""
+	elif [ "${WITH_LDAP}" ]; then
 		OPTIONS="${OPTIONS} \"OpenLDAP\""
 	fi
 	if [ "${OPTIONS}" != "x" ]; then
@@ -24,10 +30,24 @@ if [ "${BATCH}" ]; then
 		set ${OPTIONS}
 	fi
 else
-	if [ "${WITH_DB3}" -o -f ${PREFIX}/lib/libdb3.so ] ; then
+	if [ "${WITH_DB41}" -o -f ${PREFIX}/lib/libdb41.so ] ; then
+		SET_DB41="ON"
+		SET_DB4="OFF"
+		SET_DB3="OFF"
+		SET_NDBM="OFF"
+	elif [ "${WITH_DB4}" -o -f ${PREFIX}/lib/libdb4.so ] ; then
+		SET_DB41="OFF"
+		SET_DB4="ON"
+		SET_DB3="OFF"
+		SET_NDBM="OFF"
+	elif [ "${WITH_DB3}" -o -f ${PREFIX}/lib/libdb3.so ] ; then
+		SET_DB41="OFF"
+		SET_DB4="OFF"
 		SET_DB3="ON"
 		SET_NDBM="OFF"
 	else
+		SET_DB41="OFF"
+		SET_DB4="OFF"
 		SET_DB3="OFF"
 		SET_NDBM="ON"
 	fi
@@ -36,9 +56,15 @@ else
 	else
 		SET_MYSQL="OFF"
 	fi
-	if [ "${WITH_LDAP}" -o -f ${PREFIX}/lib/libldap.so.2 -a -f ${PREFIX}/lib/liblber.so.2 ] ; then
+	if [ "${WITH_LDAP}" -o -f ${PREFIX}/lib/libldap.so.2 -a -f ${PREFIX}/lib/liblber.so.2 \
+		-a -f ${PREFIX}/bin/ldapwhoami ] ; then
+		SET_LDAP21="ON"
+		SET_LDAP="OFF"
+	elif [ "${WITH_LDAP}" -o -f ${PREFIX}/lib/libldap.so.2 -a -f ${PREFIX}/lib/liblber.so.2 ] ; then
+		SET_LDAP21="OFF"
 		SET_LDAP="ON"
 	else
+		SET_LDAP21="OFF"
 		SET_LDAP="OFF"
 	fi
 
@@ -47,8 +73,11 @@ else
 Please select desired options:" -1 -1 16 \
 NDBM		"ndbm DB" ${SET_NDBM} \
 DB3		"Berkeley DB, revision 3" ${SET_DB3} \
+DB4		"Berkeley DB, revision 4" ${SET_DB4} \
+DB41		"Berkeley DB, revision 4.1" ${SET_DB41} \
 MySQL		"MySQL password Authentication" ${SET_MYSQL} \
-OpenLDAP	"OpenLDAP 2.x password Authentication w/TLS" ${SET_LDAP} \
+OpenLDAP	"OpenLDAP 2.0 password Authentication w/TLS" ${SET_LDAP} \
+OpenLDAP21	"OpenLDAP 2.1 password Authentication w/TLS" ${SET_LDAP21} \
 SASLAUTHD       "Use saslauthd for password Authentication" ON \
 2> $tempfile
 
@@ -81,7 +110,7 @@ while [ "$1" ]; do
 	case $1 in
 		\"NDBM\")
 			if [ "${DBLIB}" ]; then
-				echo "ndbm and db3 are mutually exclusive." > /dev/stderr
+				echo "ndbm, db3, db4 and db41 are mutually exclusive." > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
 				exit 1
 			fi
@@ -89,9 +118,31 @@ while [ "$1" ]; do
 			echo "SASLDB_NAME=	sasldb2.db"
 			DBLIB=1
 			;;
+		\"DB41\")
+			if [ "${DBLIB}" ]; then
+				echo "ndbm, db3, db4 and db41 are mutually exclusive." > /dev/stderr
+				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
+				exit 1
+			fi
+			echo "LIB_DEPENDS+=	db41.1:\${PORTSDIR}/databases/db41"
+			echo "CONFIGURE_ARGS+=	--with-dblib=berkeley --with-bdb-incdir=${PREFIX}/include/db41  --with-bdb-libdir=${PREFIX}/lib"
+			echo "SASLDB_NAME=	sasldb2"
+			DBLIB=1
+			;;
+		\"DB4\")
+			if [ "${DBLIB}" ]; then
+				echo "ndbm, db3, db4 and db41 are mutually exclusive." > /dev/stderr
+				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
+				exit 1
+			fi
+			echo "LIB_DEPENDS+=	db4.0:\${PORTSDIR}/databases/db4"
+			echo "CONFIGURE_ARGS+=	--with-dblib=berkeley --with-bdb-incdir=${PREFIX}/include/db4  --with-bdb-libdir=${PREFIX}/lib"
+			echo "SASLDB_NAME=	sasldb2"
+			DBLIB=1
+			;;
 		\"DB3\")
 			if [ "${DBLIB}" ]; then
-				echo "ndbm and db3 are mutually exclusive." > /dev/stderr
+				echo "ndbm, db3, db4 and db41 are mutually exclusive." > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
 				exit 1
 			fi
@@ -106,7 +157,23 @@ while [ "$1" ]; do
 			echo "PLIST_SUB+=	MYSQL=\"\""
 			DEFMYSQL=1
 			;;
+		\"OpenLDAP21\")
+			if [ "${OPENLDAP}" ]; then
+				echo "OpenLDAP 2.0 and 2.1 are mutually exclusive." > /dev/stderr
+				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
+				exit 1
+			fi
+			echo "LIB_DEPENDS+=	ldap.2:\${PORTSDIR}/net/openldap21"
+			echo "LIB_DEPENDS+=	lber.2:\${PORTSDIR}/net/openldap21"
+			echo "CONFIGURE_ARGS+=	--with-ldap=\${PREFIX}"
+			OPENLDAP=1
+			;;
 		\"OpenLDAP\")
+			if [ "${OPENLDAP}" ]; then
+				echo "OpenLDAP 2.0 and 2.1 are mutually exclusive." > /dev/stderr
+				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
+				exit 1
+			fi
 			echo "LIB_DEPENDS+=	ldap.2:\${PORTSDIR}/net/openldap20"
 			echo "LIB_DEPENDS+=	lber.2:\${PORTSDIR}/net/openldap20"
 			echo "CONFIGURE_ARGS+=	--with-ldap=\${PREFIX}"