[96678] trunk/dports/security/cyrus-sasl2

[dports at macports.org]

Revision: 96678
          https://trac.macports.org/changeset/96678
Author:   dports at macports.org
Date:     2012-08-16 23:43:29 -0700 (Thu, 16 Aug 2012)
Log Message:
-----------
cyrus-sasl2: fix bug when no FQDN available (#35098)

Modified Paths:
--------------
    trunk/dports/security/cyrus-sasl2/Portfile

Added Paths:
-----------
    trunk/dports/security/cyrus-sasl2/files/patch-lib_saslutil.c.diff

Modified: trunk/dports/security/cyrus-sasl2/Portfile
===================================================================
--- trunk/dports/security/cyrus-sasl2/Portfile	2012-08-17 05:15:32 UTC (rev 96677)
+++ trunk/dports/security/cyrus-sasl2/Portfile	2012-08-17 06:43:29 UTC (rev 96678)
@@ -6,7 +6,7 @@
 
 name                    cyrus-sasl2
 version                 2.1.25
-revision                1
+revision                2
 categories              security net
 platforms               darwin
 # license is BSD plus a fourth (almost redundant) acknowledgement clause
@@ -41,6 +41,10 @@
                         patch-saslauthd_config_ltconfig \
                         patch-utils_Makefile.in.diff
 
+# fix bug when no FQDN available (#35098); should be fixed in next
+# upstream release
+patchfiles-append       patch-lib_saslutil.c.diff
+
 configure.args          --mandir=${prefix}/share/man \
                         --with-openssl=${prefix} \
                         --with-dbpath=${prefix}/etc/sasldb2 \

Added: trunk/dports/security/cyrus-sasl2/files/patch-lib_saslutil.c.diff
===================================================================
--- trunk/dports/security/cyrus-sasl2/files/patch-lib_saslutil.c.diff	                        (rev 0)
+++ trunk/dports/security/cyrus-sasl2/files/patch-lib_saslutil.c.diff	2012-08-17 06:43:29 UTC (rev 96678)
@@ -0,0 +1,15 @@
+--- lib/saslutil.c.orig	2011-10-22 17:06:12.000000000 -0700
++++ lib/saslutil.c	2011-10-22 17:15:00.000000000 -0700
+@@ -556,7 +556,11 @@
+ 		  &hints,
+ 		  &result) != 0) {
+ 	/* errno on Unix, WSASetLastError on Windows are already done by the function */
+-	return (-1);
++	if (abort_if_no_fqdn) {
++	    return (-1);
++	} else {
++	    goto LOWERCASE;
++	}
+     }
+ 
+     if (abort_if_no_fqdn && (result == NULL || result->ai_canonname == NULL)) {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120816/e75f552f/attachment.html>