rev 10892 - trunk/packages/qt4-x11/debian/patches

Modestas Vainius modax-guest at alioth.debian.org
Sun Jun 8 10:18:10 UTC 2008


Author: modax-guest
Date: 2008-06-08 10:18:10 +0000 (Sun, 08 Jun 2008)
New Revision: 10892

Added:
   trunk/packages/qt4-x11/debian/patches/73_from4.4.1_no_AAAA_when_ipv6_disabled.diff
Log:
IPv6 fix from 4.4.1 (try2)

Added: trunk/packages/qt4-x11/debian/patches/73_from4.4.1_no_AAAA_when_ipv6_disabled.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/73_from4.4.1_no_AAAA_when_ipv6_disabled.diff	                        (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/73_from4.4.1_no_AAAA_when_ipv6_disabled.diff	2008-06-08 10:18:10 UTC (rev 10892)
@@ -0,0 +1,30 @@
+--- a/src/network/kernel/qhostinfo_unix.cpp	2008-04-28 16:11:19.000000000 +0300
++++ b/src/network/kernel/qhostinfo_unix.cpp	2008-06-08 02:35:23.000000000 +0300
+@@ -167,8 +167,19 @@
+     struct addrinfo hints;
+     memset(&hints, 0, sizeof(hints));
+     hints.ai_family = PF_UNSPEC;
++# ifdef AI_ADDRCONFIG
++    hints.ai_flags = AI_ADDRCONFIG;
++# endif
+ 
+     int result = getaddrinfo(hostName.toLatin1().constData(), 0, &hints, &res);
++# ifdef AI_ADDRCONFIG
++    if (result == EAI_BADFLAGS) {
++        // if the lookup failed with AI_ADDRCONFIG set, try again without it
++        hints.ai_flags = 0;
++        result = getaddrinfo(hostName.toLatin1().constData(), 0, &hints, &res);
++    }
++# endif
++
+     if (result == 0) {
+         addrinfo *node = res;
+         QList<QHostAddress> addresses;
+@@ -200,7 +211,6 @@
+         freeaddrinfo(res);
+     } else if (result == EAI_NONAME
+                || result ==  EAI_FAIL
+-               || result ==  EAI_FAIL
+ #ifdef EAI_NODATA
+ 	       // EAI_NODATA is deprecated in RFC 3493
+ 	       || result == EAI_NODATA




More information about the pkg-kde-commits mailing list