6 files changed, 83 insertions, 67 deletions

diff --git a/security/cyrus-sasl2-saslauthd/Makefile b/security/cyrus-sasl2-saslauthd/Makefile
index 7acafe56fa35..eb61356621b9 100644
--- a/security/cyrus-sasl2-saslauthd/Makefile
+++ b/security/cyrus-sasl2-saslauthd/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	saslauthd
-PORTVERSION=	2.1.15
-PORTREVISION=	3
+PORTVERSION=	2.1.17
+#PORTREVISION=	0
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/ \
 		ftp://ftp.westbend.net/pub/cyrus-mail/%SUBDIR%/ \
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index edc6e3924399..bdf248d6b769 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cyrus-sasl
-PORTVERSION=	2.1.15
+PORTVERSION=	2.1.17
 #PORTREVISION=	0
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/ \
@@ -81,9 +81,9 @@ WANT_MYSQL_VER=	323
 .endif
 .if defined(WITH_MYSQL)
 USE_MYSQL=	YES
-CONFIGURE_ARGS+=--with-mysql=${PREFIX}
+CONFIGURE_ARGS+=--enable-sql --with-mysql=${PREFIX}
 .else
-MYSQL=	"@comment "
+SQL=	"@comment "
 .endif
 
 .if defined(WITH_DEV_URANDOM)
@@ -161,11 +161,11 @@ DOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README
 DOC2=	ONEWS TODO draft-burdis-cat-srp-sasl-08.txt \
 	draft-ietf-cat-sasl-gssapi-05.txt draft-ietf-sasl-anon-02.txt \
 	draft-ietf-sasl-crammd5-00.txt draft-ietf-sasl-plain-02.txt \
-	draft-ietf-sasl-rfc2222bis-01.txt draft-ietf-sasl-rfc2831bis-02.txt \
-	draft-ietf-sasl-saslprep-03.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 \
+	draft-ietf-sasl-rfc2222bis-02.txt draft-ietf-sasl-rfc2831bis-02.txt \
+	draft-ietf-sasl-saslprep-03.txt draft-murchison-sasl-login-00.txt \
+	draft-newman-sasl-c-api-01.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 testing.txt
 
 HTDOCS=	advanced appconvert gssapi index install macosx mechanisms \
@@ -178,7 +178,7 @@ PLIST_SUB=	PREFIX=${PREFIX} \
 		NTLM=${NTLM} \
 		GSSAPI=${GSSAPI} \
 		EBONES=${EBONES} \
-		MYSQL=${MYSQL} \
+		SQL=${SQL} \
 		DOCSDIR=${DOCSDIR:S/^${PREFIX}\///}
 
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
diff --git a/security/cyrus-sasl2/distinfo b/security/cyrus-sasl2/distinfo
index 0233809d387f..0086b4c5adab 100644
--- a/security/cyrus-sasl2/distinfo
+++ b/security/cyrus-sasl2/distinfo
@@ -1 +1 @@
-MD5 (cyrus-sasl-2.1.15.tar.gz) = 82c7f82a777b7bc10cc1ef68fb8e2a37
+MD5 (cyrus-sasl-2.1.17.tar.gz) = 4add6be2f194dc51aafc64193a1dd77b
diff --git a/security/cyrus-sasl2/files/patch-configure b/security/cyrus-sasl2/files/patch-configure
index 5274e76a4e0e..7f65813ed65f 100644
--- a/security/cyrus-sasl2/files/patch-configure
+++ b/security/cyrus-sasl2/files/patch-configure
@@ -1,49 +1,57 @@
 Index: configure
 diff -u configure.orig configure
---- configure.orig	Sat Jun 28 06:21:13 2003
-+++ configure	Tue Jul  1 01:09:52 2003
-@@ -2654,7 +2654,7 @@
+--- configure.orig	Tue Dec  2 01:35:06 2003
++++ configure	Tue Dec  2 12:15:15 2003
+@@ -1575,6 +1575,7 @@
+ fi
+ echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
++program_prefix=NONE
+ test "$program_prefix" != NONE &&
+   program_transform_name="s,^,$program_prefix,;$program_transform_name"
+ # Use a double $ so make ignores it.
+@@ -5132,7 +5133,7 @@
  	    BDB_LIBADD=""
  	fi
  
 -        for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
 +        for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
            do
-             echo $ac_n "checking for db_create in -l$dbname""... $ac_c" 1>&6
- echo "configure:2661: checking for db_create in -l$dbname" >&5
-@@ -3045,7 +3045,7 @@
+             as_ac_Lib=`echo "ac_cv_lib_$dbname''_db_create" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for db_create in -l$dbname" >&5
+@@ -5935,7 +5936,7 @@
  	    BDB_LIBADD=""
  	fi
  
 -        for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
 +        for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
            do
-             echo $ac_n "checking for db_create in -l$dbname""... $ac_c" 1>&6
- echo "configure:3052: checking for db_create in -l$dbname" >&5
-@@ -3791,6 +3791,8 @@
+             as_ac_Lib=`echo "ac_cv_lib_$dbname''_db_create" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for db_create in -l$dbname" >&5
+@@ -7187,6 +7188,8 @@
    SASLAUTHD_TRUE='#'
    SASLAUTHD_FALSE=
  fi
 +SASLAUTHD_TRUE='#'
 +SASLAUTHD_FALSE=
- echo $ac_n "checking if I should include saslauthd""... $ac_c" 1>&6
- echo "configure:3796: checking if I should include saslauthd" >&5
- echo "$ac_t""$with_saslauthd" 1>&6
-@@ -5487,7 +5489,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
+ 
+ echo "$as_me:$LINENO: checking if I should include saslauthd" >&5
+ echo $ECHO_N "checking if I should include saslauthd... $ECHO_C" >&6
+@@ -10136,7 +10139,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   ac_save_LIBS="$LIBS"
--LIBS="-lgssapi $GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} -lcom_err $LIBS"
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lgssapi $GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS"
 +LIBS="$GSSAPIBASE_LIBS `krb5-config --libs gssapi` $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 5493 "configure"
- #include "confdefs.h"
-@@ -5568,7 +5570,7 @@
-      GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
-      GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h.  */
+@@ -10485,7 +10488,7 @@
+     GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
+     GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a"
    elif test "$gss_impl" = "heimdal"; then
--     GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} -lcom_err"
-+     GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS `krb5-config --libs gssapi`"
-      GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
-   elif test "$gss_impl" = "seam"; then
-      GSSAPIBASE_LIBS=-lgss
+-    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err"
++    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS `krb5-config --libs gssapi`"
+     GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
+   elif test "$gss_impl" = "cybersafe03"; then
+ # Version of CyberSafe with two libraries
diff --git a/security/cyrus-sasl2/files/patch-saslauthd::configure b/security/cyrus-sasl2/files/patch-saslauthd::configure
index a9c749830474..71f5afce9731 100644
--- a/security/cyrus-sasl2/files/patch-saslauthd::configure
+++ b/security/cyrus-sasl2/files/patch-saslauthd::configure
@@ -1,40 +1,48 @@
 Index: saslauthd/configure
 diff -u saslauthd/configure.orig saslauthd/configure
---- saslauthd/configure.orig	Sat Jun 28 06:21:15 2003
-+++ saslauthd/configure	Tue Jul  1 01:26:30 2003
-@@ -2990,7 +2990,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
+--- saslauthd/configure.orig	Tue Dec  2 01:35:11 2003
++++ saslauthd/configure	Tue Dec  2 14:02:53 2003
+@@ -1523,6 +1523,7 @@
+ fi
+ echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
++program_prefix=NONE
+ test "$program_prefix" != NONE &&
+   program_transform_name="s,^,$program_prefix,;$program_transform_name"
+ # Use a double $ so make ignores it.
+@@ -6376,7 +6377,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   ac_save_LIBS="$LIBS"
--LIBS="-lgssapi $GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} -lcom_err $LIBS"
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lgssapi $GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS"
 +LIBS="$GSSAPIBASE_LIBS `krb5-config --libs gssapi` $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 2996 "configure"
- #include "confdefs.h"
-@@ -3071,7 +3071,7 @@
-      GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
-      GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h.  */
+@@ -6725,7 +6726,7 @@
+     GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
+     GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a"
    elif test "$gss_impl" = "heimdal"; then
--     GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} -lcom_err"
-+     GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS `krb5-config --libs gssapi`"
-      GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
-   elif test "$gss_impl" = "seam"; then
-      GSSAPIBASE_LIBS=-lgss
-@@ -3486,7 +3486,7 @@
+-    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err"
++    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS `krb5-config --libs gssapi`"
+     GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
+   elif test "$gss_impl" = "cybersafe03"; then
+ # Version of CyberSafe with two libraries
+@@ -7484,7 +7485,7 @@
  	    BDB_LIBADD=""
  	fi
  
 -        for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
 +        for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
            do
-             echo $ac_n "checking for db_create in -l$dbname""... $ac_c" 1>&6
- echo "configure:3493: checking for db_create in -l$dbname" >&5
-@@ -3877,7 +3877,7 @@
+             as_ac_Lib=`echo "ac_cv_lib_$dbname''_db_create" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for db_create in -l$dbname" >&5
+@@ -8287,7 +8288,7 @@
  	    BDB_LIBADD=""
  	fi
  
 -        for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
 +        for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
            do
-             echo $ac_n "checking for db_create in -l$dbname""... $ac_c" 1>&6
- echo "configure:3884: checking for db_create in -l$dbname" >&5
+             as_ac_Lib=`echo "ac_cv_lib_$dbname''_db_create" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for db_create in -l$dbname" >&5
diff --git a/security/cyrus-sasl2/pkg-plist b/security/cyrus-sasl2/pkg-plist
index 53fe5f086a3c..72a5a367dacf 100644
--- a/security/cyrus-sasl2/pkg-plist
+++ b/security/cyrus-sasl2/pkg-plist
@@ -27,9 +27,9 @@ lib/sasl2/libanonymous.so.2
 lib/sasl2/liblogin.a
 lib/sasl2/liblogin.so
 lib/sasl2/liblogin.so.2
-%%MYSQL%%lib/sasl2/libmysql.a
-%%MYSQL%%lib/sasl2/libmysql.so
-%%MYSQL%%lib/sasl2/libmysql.so.2
+%%SQL%%lib/sasl2/libsql.a
+%%SQL%%lib/sasl2/libsql.so
+%%SQL%%lib/sasl2/libsql.so.2
 %%NTLM%%lib/sasl2/libntlm.a
 %%NTLM%%lib/sasl2/libntlm.so
 %%NTLM%%lib/sasl2/libntlm.so.2
@@ -58,11 +58,11 @@ sbin/saslpasswd2
 %%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-anon-02.txt
 %%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-crammd5-00.txt
 %%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-plain-02.txt
-%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-rfc2222bis-01.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-rfc2222bis-02.txt
 %%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-rfc2831bis-02.txt
 %%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-saslprep-03.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-murchison-sasl-login-00.txt
 %%PORTDOCS%%%%DOCSDIR%%/draft-newman-sasl-c-api-01.txt
-%%PORTDOCS%%%%DOCSDIR%%/draft-sasl-login.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc1321.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc1939.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc2104.txt