Update to 2.1.18.

5 files changed, 39 insertions, 43 deletions

diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index c2c5785..196a588 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	cyrus-sasl
-PORTVERSION=	2.1.17
-PORTREVISION=	1
+PORTVERSION=	2.1.18
+#PORTREVISION=	0
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/ \
 		ftp://ftp.westbend.net/pub/cyrus-mail/%SUBDIR%/ \
@@ -184,10 +184,10 @@ CYRUS_GROUP?=	cyrus
 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-02.txt draft-ietf-sasl-rfc2831bis-02.txt \
-	draft-ietf-sasl-saslprep-03.txt draft-murchison-sasl-login-00.txt \
+	draft-ietf-sasl-anon-02.txt draft-ietf-sasl-crammd5-01.txt \
+	draft-ietf-sasl-gssapi-00.txt draft-ietf-sasl-plain-03.txt \
+	draft-ietf-sasl-rfc2222bis-03.txt draft-ietf-sasl-rfc2831bis-02.txt \
+	draft-ietf-sasl-saslprep-04.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 \
@@ -230,10 +230,6 @@ pre-install:
 	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/utils/saslpasswd2.8 \
-		${MAN8PREFIX}/man/man8/saslpasswd2.8
-	${INSTALL_MAN} ${WRKSRC}/utils/sasldblistusers2.8 \
-		${MAN8PREFIX}/man/man8/sasldblistusers2.8
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${MKDIR} ${DOCSDIR}/html
diff --git a/security/cyrus-sasl2/distinfo b/security/cyrus-sasl2/distinfo
index 7aa5452..043a5eb 100644
--- a/security/cyrus-sasl2/distinfo
+++ b/security/cyrus-sasl2/distinfo
@@ -1,2 +1,2 @@
-MD5 (cyrus-sasl-2.1.17.tar.gz) = 4add6be2f194dc51aafc64193a1dd77b
-SIZE (cyrus-sasl-2.1.17.tar.gz) = 1499725
+MD5 (cyrus-sasl-2.1.18.tar.gz) = 1eafae95f0289c10f187d8b2bc4032cf
+SIZE (cyrus-sasl-2.1.18.tar.gz) = 1522578
diff --git a/security/cyrus-sasl2/files/patch-configure b/security/cyrus-sasl2/files/patch-configure
index 78dacf0..b432231 100644
--- a/security/cyrus-sasl2/files/patch-configure
+++ b/security/cyrus-sasl2/files/patch-configure
@@ -1,8 +1,8 @@
 Index: configure
 diff -u configure.orig configure
---- configure.orig	Tue Dec  2 01:35:06 2003
-+++ configure	Sat Jan 17 23:21:19 2004
-@@ -1575,6 +1575,7 @@
+--- configure.orig	Thu Mar 11 00:56:10 2004
++++ configure	Fri Mar 12 00:26:13 2004
+@@ -1576,6 +1576,7 @@
  fi
  echo "$as_me:$LINENO: result: yes" >&5
  echo "${ECHO_T}yes" >&6
@@ -10,16 +10,16 @@ diff -u configure.orig configure
  test "$program_prefix" != NONE &&
    program_transform_name="s,^,$program_prefix,;$program_transform_name"
  # Use a double $ so make ignores it.
-@@ -5132,7 +5133,7 @@
+@@ -5126,7 +5127,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
+-        for dbname in db-4.2 db4.2 db42 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.2 db4.2 db42 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
              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
-@@ -5156,11 +5157,11 @@
+@@ -5150,11 +5151,11 @@
  #endif
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
@@ -33,16 +33,16 @@ diff -u configure.orig configure
    ;
    return 0;
  }
-@@ -5935,7 +5936,7 @@
+@@ -5929,7 +5930,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
+-        for dbname in db-4.2 db4.2 db42 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.2 db4.2 db42 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
              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
-@@ -5959,11 +5960,11 @@
+@@ -5953,11 +5954,11 @@
  #endif
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
@@ -56,7 +56,7 @@ diff -u configure.orig configure
    ;
    return 0;
  }
-@@ -7187,6 +7188,8 @@
+@@ -7181,6 +7182,8 @@
    SASLAUTHD_TRUE='#'
    SASLAUTHD_FALSE=
  fi
@@ -65,7 +65,7 @@ diff -u configure.orig configure
  
  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 @@
+@@ -10167,7 +10170,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -74,7 +74,7 @@ diff -u configure.orig configure
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  /* confdefs.h.  */
-@@ -10485,7 +10488,7 @@
+@@ -10516,7 +10519,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
diff --git a/security/cyrus-sasl2/files/patch-saslauthd::configure b/security/cyrus-sasl2/files/patch-saslauthd::configure
index 30f51c8..b741832 100644
--- a/security/cyrus-sasl2/files/patch-saslauthd::configure
+++ b/security/cyrus-sasl2/files/patch-saslauthd::configure
@@ -1,7 +1,7 @@
 Index: saslauthd/configure
 diff -u saslauthd/configure.orig saslauthd/configure
---- saslauthd/configure.orig	Tue Dec  2 01:35:11 2003
-+++ saslauthd/configure	Sat Jan 17 23:23:56 2004
+--- saslauthd/configure.orig	Thu Mar 11 00:56:16 2004
++++ saslauthd/configure	Fri Mar 12 00:28:40 2004
 @@ -1523,6 +1523,7 @@
  fi
  echo "$as_me:$LINENO: result: yes" >&5
@@ -10,7 +10,7 @@ diff -u saslauthd/configure.orig saslauthd/configure
  test "$program_prefix" != NONE &&
    program_transform_name="s,^,$program_prefix,;$program_transform_name"
  # Use a double $ so make ignores it.
-@@ -6376,7 +6377,7 @@
+@@ -6385,7 +6386,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -19,7 +19,7 @@ diff -u saslauthd/configure.orig saslauthd/configure
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  /* confdefs.h.  */
-@@ -6725,7 +6726,7 @@
+@@ -6734,7 +6735,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
@@ -28,16 +28,16 @@ diff -u saslauthd/configure.orig saslauthd/configure
      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 @@
+@@ -7493,7 +7494,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
+-        for dbname in db-4.2 db4.2 db42 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.2 db4.2 db42 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
              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
-@@ -7508,11 +7509,11 @@
+@@ -7517,11 +7518,11 @@
  #endif
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
@@ -51,16 +51,16 @@ diff -u saslauthd/configure.orig saslauthd/configure
    ;
    return 0;
  }
-@@ -8287,7 +8288,7 @@
+@@ -8296,7 +8297,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
+-        for dbname in db-4.2 db4.2 db42 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.2 db4.2 db42 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
              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
-@@ -8311,11 +8312,11 @@
+@@ -8320,11 +8321,11 @@
  #endif
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
diff --git a/security/cyrus-sasl2/pkg-plist b/security/cyrus-sasl2/pkg-plist
index d14f985..62cc41c 100644
--- a/security/cyrus-sasl2/pkg-plist
+++ b/security/cyrus-sasl2/pkg-plist
@@ -54,13 +54,13 @@ sbin/saslpasswd2
 %%PORTDOCS%%%%DOCSDIR%%/Sendmail.README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/draft-burdis-cat-srp-sasl-08.txt
-%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-cat-sasl-gssapi-05.txt
 %%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-02.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-crammd5-01.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-gssapi-00.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-plain-03.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-rfc2222bis-03.txt
 %%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-rfc2831bis-02.txt
-%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-saslprep-03.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-saslprep-04.txt
 %%PORTDOCS%%%%DOCSDIR%%/draft-murchison-sasl-login-00.txt
 %%PORTDOCS%%%%DOCSDIR%%/draft-newman-sasl-c-api-01.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc1321.txt