Update cyrus-sasl2 to 2.1.26.

This bumps shlib version of libsasl2.

4 files changed, 0 insertions, 107 deletions

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);