Update to 2.1.10.

This version corrects a number of DIGEST-MD5 interoperability
issues, as well as corrects some potential buffer overflows.
It is recommended that all sites using a 2.x release upgrade
to 2.1.10.

Approved by:	portmgr

4 files changed, 19 insertions, 23 deletions

diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index fe70f63155a5..d51d7a83df27 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	cyrus-sasl
-PORTVERSION=	2.1.9
-PORTREVISION=	1
+PORTVERSION=	2.1.10
+#PORTREVISION=	0
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.westbend.net/pub/cyrus-mail/ \
@@ -92,16 +92,19 @@ CONFIGURE_ENV+=	LOCALBASE=${LOCALBASE} \
 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-myers-saslrev-02.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 testing.txt
+	draft-ietf-cat-sasl-gssapi-05.txt draft-melnikov-rfc2831bis-02.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 \
+	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
 
 SASLAUTHD_DOCS=	AUTHORS COPYING ChangeLog INSTALL LDAP_SASLAUTHD NEWS README
 
-HTDOCS=	advanced appconvert gssapi index install macosx options \
-	plugprog programming readme sysadmin upgrading
+HTDOCS=	advanced appconvert gssapi index install macosx mechanisms \
+	options plugprog programming readme sysadmin upgrading
 
 PLIST_SUB=	PREFIX=${PREFIX} \
 		OTP=${OTP} \
diff --git a/security/cyrus-sasl2/distinfo b/security/cyrus-sasl2/distinfo
index e16d45ed9c35..ade5d1d46b7c 100644
--- a/security/cyrus-sasl2/distinfo
+++ b/security/cyrus-sasl2/distinfo
@@ -1 +1 @@
-MD5 (cyrus-sasl-2.1.9.tar.gz) = 19ac851b291a6631b8f8c2a2bebb7843
+MD5 (cyrus-sasl-2.1.10.tar.gz) = 3ac2a696c091a76ce6c7db27e5d859d4
diff --git a/security/cyrus-sasl2/files/patch-lib::Makefile.in b/security/cyrus-sasl2/files/patch-lib::Makefile.in
deleted file mode 100644
index b4641ac7b033..000000000000
--- a/security/cyrus-sasl2/files/patch-lib::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: lib/Makefile.in
-diff -u lib/Makefile.in.orig lib/Makefile.in
---- lib/Makefile.in.orig	Sat Oct 12 06:19:39 2002
-+++ lib/Makefile.in	Tue Oct 15 02:28:11 2002
-@@ -436,7 +436,7 @@
- mostlyclean distclean maintainer-clean
- 
- 
--plugin_common.lo: plugin_common.o
-+plugin_common.lo:
- 	ln -s $(top_builddir)/plugins/plugin_common.lo plugin_common.lo
- 
- plugin_common.o:
diff --git a/security/cyrus-sasl2/pkg-plist b/security/cyrus-sasl2/pkg-plist
index 906371c1c309..cdb3e1708cf0 100644
--- a/security/cyrus-sasl2/pkg-plist
+++ b/security/cyrus-sasl2/pkg-plist
@@ -51,8 +51,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-myers-saslrev-02.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-nerenberg-sasl-crammd5-03.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-newman-sasl-c-api-00.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
@@ -74,6 +79,7 @@ sbin/saslpasswd2
 %%PORTDOCS%%%%DOCSDIR%%/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/html/install.html
 %%PORTDOCS%%%%DOCSDIR%%/html/macosx.html
+%%PORTDOCS%%%%DOCSDIR%%/html/mechanisms.html
 %%PORTDOCS%%%%DOCSDIR%%/html/options.html
 %%PORTDOCS%%%%DOCSDIR%%/html/plugprog.html
 %%PORTDOCS%%%%DOCSDIR%%/html/programming.html