packages: cyrus-sasl/cyrus-sasl.spec, cyrus-sasl/cyrus-sasl-get_fqhostname....

[baggins]

Author: baggins                      Date: Fri Oct 21 12:13:13 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix completely broken logic in get_fqhostname

---- Files affected:
packages/cyrus-sasl:
   cyrus-sasl.spec (1.213 -> 1.214) , cyrus-sasl-get_fqhostname.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/cyrus-sasl/cyrus-sasl.spec
diff -u packages/cyrus-sasl/cyrus-sasl.spec:1.213 packages/cyrus-sasl/cyrus-sasl.spec:1.214
--- packages/cyrus-sasl/cyrus-sasl.spec:1.213	Thu Oct 20 17:58:31 2011
+++ packages/cyrus-sasl/cyrus-sasl.spec	Fri Oct 21 14:13:08 2011
@@ -26,7 +26,7 @@
 Summary(uk.UTF-8):	Бібліотека Cyrus SASL
 Name:		cyrus-sasl
 Version:	2.1.25
-Release:	4.5
+Release:	4.9
 License:	distributable
 Group:		Libraries
 Source0:	ftp://ftp.cyrusimap.org/cyrus-sasl/%{name}-%{version}.tar.gz
@@ -57,6 +57,7 @@
 Patch18:	0033-fix_segfault_in_GSSAPI.patch
 Patch19:	0034-fix_dovecot_authentication.patch
 Patch20:	%{name}-auxprop.patch
+Patch21:	%{name}-get_fqhostname.patch
 URL:		http://asg.web.cmu.edu/sasl/
 BuildRequires:	autoconf >= 2.54
 BuildRequires:	automake >= 1:1.7
@@ -491,6 +492,7 @@
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 
 cd doc
 echo "cyrus-sasl complies with the following RFCs:" > rfc-compliance
@@ -758,6 +760,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.214  2011/10/21 12:13:08  baggins
+- fix completely broken logic in get_fqhostname
+
 Revision 1.213  2011/10/20 15:58:31  baggins
 - attempt to fix auxprop facepalm failure
 

================================================================
Index: packages/cyrus-sasl/cyrus-sasl-get_fqhostname.patch
diff -u /dev/null packages/cyrus-sasl/cyrus-sasl-get_fqhostname.patch:1.1
--- /dev/null	Fri Oct 21 14:13:13 2011
+++ packages/cyrus-sasl/cyrus-sasl-get_fqhostname.patch	Fri Oct 21 14:13:08 2011
@@ -0,0 +1,59 @@
+--- cyrus-sasl-2.1.25/lib/saslutil.c.orig	2011-10-21 13:59:59.354462366 +0200
++++ cyrus-sasl-2.1.25/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;
++	}
+     }
+ 
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cyrus-sasl/cyrus-sasl.spec?r1=1.213&r2=1.214&f=u