Update cyrus-sasl2 to 2.1.26.

This bumps shlib version of libsasl2.

7 files changed, 18 insertions, 128 deletions

diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index 3322b6754eb0..4213655850d3 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for:	cyrus-sasl2
-# Date created:				Nov 1 1999
-# Whom:					hetzels@westbend.net
-#
 # $FreeBSD$
-#
 
 PORTNAME=	cyrus-sasl
-PORTVERSION=	2.1.25
-PORTREVISION=	2
+PORTVERSION=	2.1.26
+#PORTREVISION=	0
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-sasl/
 
@@ -48,6 +43,7 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
 		--with-configdir=${PREFIX}/lib/sasl2:${PREFIX}/etc/sasl2 \
 		--with-plugindir=${PREFIX}/lib/sasl2 \
 		--with-dbpath=${PREFIX}/etc/sasldb2 \
+		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
 		--includedir=${PREFIX}/include \
 		--enable-static \
 		--enable-auth-sasldb \
diff --git a/security/cyrus-sasl2/distinfo b/security/cyrus-sasl2/distinfo
index a5e3a13cd747..c6406751ecd3 100644
--- a/security/cyrus-sasl2/distinfo
+++ b/security/cyrus-sasl2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cyrus-sasl-2.1.25.tar.gz) = 418c16e6240a4f9b637cbe3d62937b9675627bad27c622191d47de8686fe24fe
-SIZE (cyrus-sasl-2.1.25.tar.gz) = 5209240
+SHA256 (cyrus-sasl-2.1.26.tar.gz) = 8fbc5136512b59bb793657f36fadda6359cae3b08f01fd16b3d406f1345b7bc3
+SIZE (cyrus-sasl-2.1.26.tar.gz) = 5220231
diff --git a/security/cyrus-sasl2/files/patch-lib-saslutil.c b/security/cyrus-sasl2/files/patch-lib-saslutil.c
deleted file mode 100644
index 1f611747136c..000000000000
--- a/security/cyrus-sasl2/files/patch-lib-saslutil.c
+++ /dev/null
@@ -1,59 +0,0 @@
---- lib/saslutil.c.orig	2011-10-21 13:59:59.354462366 +0200
-+++ lib/saslutil.c	2011-10-21 14:10:55.849675881 +0200
-@@ -555,32 +555,44 @@
- 		  NULL,		/* don't care abour service/port */
- 		  &hints,
- 		  &result) != 0) {
--	/* errno on Unix, WSASetLastError on Windows are already done by the function */
--	return (-1);
-+        if (abort_if_no_fqdn) {
-+	    /* errno on Unix, WSASetLastError on Windows are already done by the function */
-+	    return (-1);
-+	} else {
-+	    goto LOWERCASE;
-+	}
-     }
- 
--    if (abort_if_no_fqdn && (result == NULL || result->ai_canonname == NULL)) {
-+    if (result == NULL || result->ai_canonname == NULL) {
- 	freeaddrinfo (result);
-+        if (abort_if_no_fqdn) {
- #ifdef WIN32
--	WSASetLastError (WSANO_DATA);
-+	    WSASetLastError (WSANO_DATA);
- #elif defined(ENODATA)
--	errno = ENODATA;
-+	    errno = ENODATA;
- #elif defined(EADDRNOTAVAIL)
--	errno = EADDRNOTAVAIL;
-+	    errno = EADDRNOTAVAIL;
- #endif
--	return (-1);
-+	    return (-1);
-+	} else {
-+	    goto LOWERCASE;
-+	}
-     }
- 
--    if (abort_if_no_fqdn && strchr (result->ai_canonname, '.') == NULL) {
-+    if (strchr (result->ai_canonname, '.') == NULL) {
- 	freeaddrinfo (result);
-+        if (abort_if_no_fqdn) {
- #ifdef WIN32
--	WSASetLastError (WSANO_DATA);
-+	    WSASetLastError (WSANO_DATA);
- #elif defined(ENODATA)
--	errno = ENODATA;
-+	    errno = ENODATA;
- #elif defined(EADDRNOTAVAIL)
--	errno = EADDRNOTAVAIL;
-+	    errno = EADDRNOTAVAIL;
- #endif
--	return (-1);
-+	    return (-1);
-+	} else {
-+	    goto LOWERCASE;
-+	}
-     }
- 
- 
diff --git a/security/cyrus-sasl2/files/patch-plugins::gssapi.c b/security/cyrus-sasl2/files/patch-plugins::gssapi.c
deleted file mode 100644
index b718945a0c24..000000000000
--- a/security/cyrus-sasl2/files/patch-plugins::gssapi.c
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: plugins/gssapi.c
-diff -u -p plugins/gssapi.c.orig plugins/gssapi.c
---- plugins/gssapi.c.orig	2011-05-12 04:25:55.000000000 +0900
-+++ plugins/gssapi.c	2011-10-08 00:31:28.401398246 +0900
-@@ -370,7 +370,7 @@ sasl_gss_encode(void *context, const str
-     }
-     
-     if (output_token->value && output) {
--	unsigned char * p = (unsigned char *) text->encode_buf;
-+	unsigned char * p;
- 	
- 	ret = _plug_buf_alloc(text->utils,
- 			      &(text->encode_buf),
-@@ -383,6 +383,8 @@ sasl_gss_encode(void *context, const str
- 	    GSS_UNLOCK_MUTEX(text->utils);
- 	    return ret;
- 	}
-+
-+	p = (unsigned char *) text->encode_buf;
- 	
- 	p[0] = (output_token->length>>24) & 0xFF;
- 	p[1] = (output_token->length>>16) & 0xFF;
diff --git a/security/cyrus-sasl2/files/patch-sasldb::db_berkeley.c b/security/cyrus-sasl2/files/patch-sasldb::db_berkeley.c
deleted file mode 100644
index d0baf975a6f5..000000000000
--- a/security/cyrus-sasl2/files/patch-sasldb::db_berkeley.c
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: sasldb/db_berkeley.c
-diff -u -p sasldb/db_berkeley.c.orig sasldb/db_berkeley.c
---- sasldb/db_berkeley.c.orig	2009-04-29 00:09:18.000000000 +0900
-+++ sasldb/db_berkeley.c	2010-05-27 14:25:14.458302060 +0900
-@@ -100,7 +100,7 @@ static int berkeleydb_open(const sasl_ut
-     ret = db_create(mbdb, NULL, 0);
-     if (ret == 0 && *mbdb != NULL)
-     {
--#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
-+#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR >= 5
- 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660);
- #else
- 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
diff --git a/security/cyrus-sasl2/files/patch-utils::dbconverter-2.c b/security/cyrus-sasl2/files/patch-utils::dbconverter-2.c
deleted file mode 100644
index f00988a95dff..000000000000
--- a/security/cyrus-sasl2/files/patch-utils::dbconverter-2.c
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: utils/dbconverter-2.c
-diff -u -p utils/dbconverter-2.c.orig utils/dbconverter-2.c
---- utils/dbconverter-2.c.orig	2003-02-14 04:56:17.000000000 +0900
-+++ utils/dbconverter-2.c	2010-05-27 14:28:26.249314464 +0900
-@@ -214,7 +214,7 @@ static int berkeleydb_open(const char *p
-     ret = db_create(mbdb, NULL, 0);
-     if (ret == 0 && *mbdb != NULL)
-     {
--#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
-+#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR >= 5
- 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664);
- #else
- 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);
diff --git a/security/cyrus-sasl2/pkg-plist b/security/cyrus-sasl2/pkg-plist
index b4fc2701c9ba..fe8142945b19 100644
--- a/security/cyrus-sasl2/pkg-plist
+++ b/security/cyrus-sasl2/pkg-plist
@@ -9,51 +9,52 @@ include/sasl/saslutil.h
 lib/libsasl2.a
 lib/libsasl2.la
 lib/libsasl2.so
-lib/libsasl2.so.2
+lib/libsasl2.so.3
 lib/sasl2/libanonymous.a
 lib/sasl2/libanonymous.la
 lib/sasl2/libanonymous.so
-lib/sasl2/libanonymous.so.2
+lib/sasl2/libanonymous.so.3
 %%CRAM%%lib/sasl2/libcrammd5.a
 %%CRAM%%lib/sasl2/libcrammd5.la
 %%CRAM%%lib/sasl2/libcrammd5.so
-%%CRAM%%lib/sasl2/libcrammd5.so.2
+%%CRAM%%lib/sasl2/libcrammd5.so.3
 %%DIGEST%%lib/sasl2/libdigestmd5.a
 %%DIGEST%%lib/sasl2/libdigestmd5.la
 %%DIGEST%%lib/sasl2/libdigestmd5.so
-%%DIGEST%%lib/sasl2/libdigestmd5.so.2
+%%DIGEST%%lib/sasl2/libdigestmd5.so.3
 %%GSSAPI%%lib/sasl2/libgssapiv2.a
 %%GSSAPI%%lib/sasl2/libgssapiv2.la
 %%GSSAPI%%lib/sasl2/libgssapiv2.so
-%%GSSAPI%%lib/sasl2/libgssapiv2.so.2
+%%GSSAPI%%lib/sasl2/libgssapiv2.so.3
 %%LOGIN%%lib/sasl2/liblogin.a
 %%LOGIN%%lib/sasl2/liblogin.la
 %%LOGIN%%lib/sasl2/liblogin.so
-%%LOGIN%%lib/sasl2/liblogin.so.2
+%%LOGIN%%lib/sasl2/liblogin.so.3
 %%SCRAM%%lib/sasl2/libscram.a
 %%SCRAM%%lib/sasl2/libscram.la
 %%SCRAM%%lib/sasl2/libscram.so
-%%SCRAM%%lib/sasl2/libscram.so.2
+%%SCRAM%%lib/sasl2/libscram.so.3
 %%SQL%%lib/sasl2/libsql.a
 %%SQL%%lib/sasl2/libsql.la
 %%SQL%%lib/sasl2/libsql.so
-%%SQL%%lib/sasl2/libsql.so.2
+%%SQL%%lib/sasl2/libsql.so.3
 %%NTLM%%lib/sasl2/libntlm.a
 %%NTLM%%lib/sasl2/libntlm.la
 %%NTLM%%lib/sasl2/libntlm.so
-%%NTLM%%lib/sasl2/libntlm.so.2
+%%NTLM%%lib/sasl2/libntlm.so.3
 %%OTP%%lib/sasl2/libotp.a
 %%OTP%%lib/sasl2/libotp.la
 %%OTP%%lib/sasl2/libotp.so
-%%OTP%%lib/sasl2/libotp.so.2
+%%OTP%%lib/sasl2/libotp.so.3
 %%PLAIN%%lib/sasl2/libplain.a
 %%PLAIN%%lib/sasl2/libplain.la
 %%PLAIN%%lib/sasl2/libplain.so
-%%PLAIN%%lib/sasl2/libplain.so.2
+%%PLAIN%%lib/sasl2/libplain.so.3
 lib/sasl2/libsasldb.a
 lib/sasl2/libsasldb.la
 lib/sasl2/libsasldb.so
-lib/sasl2/libsasldb.so.2
+lib/sasl2/libsasldb.so.3
+libdata/pkgconfig/libsasl2.pc
 sbin/pluginviewer
 sbin/sasldblistusers2
 sbin/saslpasswd2