Revision: 116664 https://trac.macports.org/changeset/116664 Author: ryandesign@macports.org Date: 2014-02-01 16:11:39 -0800 (Sat, 01 Feb 2014) Log Message: ----------- curl: update to 7.35.0 Modified Paths: -------------- trunk/dports/net/curl/Portfile Removed Paths: ------------- trunk/dports/net/curl/files/patch-lib-connect.c.diff Modified: trunk/dports/net/curl/Portfile =================================================================== --- trunk/dports/net/curl/Portfile 2014-02-01 23:50:35 UTC (rev 116663) +++ trunk/dports/net/curl/Portfile 2014-02-02 00:11:39 UTC (rev 116664) @@ -4,7 +4,7 @@ PortSystem 1.0 name curl -version 7.34.0 +version 7.35.0 categories net www platforms darwin freebsd maintainers ryandesign @@ -25,13 +25,13 @@ use_bzip2 yes checksums ${distfiles} \ - rmd160 5fe3d7319ab140c9e6bc9c50643c7bed46392fcd \ - sha256 10beade56b48311499e444783df3413405b22f20a147ed4a1d8a8125f1cc829b + rmd160 12844fdfa59538b4daa7d68a57e9d7d680473bf3 \ + sha256 d774d1701454f1b7d331c2075fc4f6dd972bddc2d171f43645ef3647c7fc0d83 if {${name} eq ${subport}} { PortGroup muniversal 1.0 - revision 1 + revision 0 depends_build port:pkgconfig @@ -39,7 +39,6 @@ port:zlib patchfiles patch-curl.h.diff - patchfiles-append patch-lib-connect.c.diff configure.args --enable-ipv6 \ --without-gnutls \ Deleted: trunk/dports/net/curl/files/patch-lib-connect.c.diff =================================================================== --- trunk/dports/net/curl/files/patch-lib-connect.c.diff 2014-02-01 23:50:35 UTC (rev 116663) +++ trunk/dports/net/curl/files/patch-lib-connect.c.diff 2014-02-02 00:11:39 UTC (rev 116664) @@ -1,23 +0,0 @@ -https://github.com/bagder/curl/commit/4e1ece2e44f432c2614f2090155c0aaf2226ea... -https://sourceforge.net/p/curl/bugs/1315/ ---- lib/connect.c.orig -+++ lib/connect.c -@@ -1104,12 +1104,12 @@ CURLcode Curl_connecthost(struct connectdata *conn, /* context */ - conn->tempaddr[0]->ai_next == NULL ? timeout_ms : timeout_ms / 2; - - /* start connecting to first IP */ -- res = singleipconnect(conn, conn->tempaddr[0], &(conn->tempsock[0])); -- while(res != CURLE_OK && -- conn->tempaddr[0] && -- conn->tempaddr[0]->ai_next && -- conn->tempsock[0] == CURL_SOCKET_BAD) -- res = trynextip(conn, FIRSTSOCKET, 0); -+ while(conn->tempaddr[0]) { -+ res = singleipconnect(conn, conn->tempaddr[0], &(conn->tempsock[0])); -+ if(res == CURLE_OK) -+ break; -+ conn->tempaddr[0] = conn->tempaddr[0]->ai_next; -+ } - - if(conn->tempsock[0] == CURL_SOCKET_BAD) - return res;