SF.net SVN: gar:[22911] csw/mgar/pkg/libcurl4/trunk

[dmichelsen at users.sourceforge.net]

Revision: 22911
          http://sourceforge.net/p/gar/code/22911
Author:   dmichelsen
Date:     2014-01-29 11:00:34 +0000 (Wed, 29 Jan 2014)
Log Message:
-----------
libcurl4/trunk: Update to 7.35.0

Modified Paths:
--------------
    csw/mgar/pkg/libcurl4/trunk/Makefile
    csw/mgar/pkg/libcurl4/trunk/checksums

Removed Paths:
-------------
    csw/mgar/pkg/libcurl4/trunk/files/0000-trynextip-logic-inversion-bug.patch

Modified: csw/mgar/pkg/libcurl4/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libcurl4/trunk/Makefile	2014-01-28 16:20:56 UTC (rev 22910)
+++ csw/mgar/pkg/libcurl4/trunk/Makefile	2014-01-29 11:00:34 UTC (rev 22911)
@@ -1,5 +1,5 @@
 NAME = curl
-VERSION = 7.34.0
+VERSION = 7.35.0
 GARTYPE = v2
 
 DESCRIPTION = Command line tool and library for client-side URL transfers
@@ -18,8 +18,6 @@
 
 VENDOR_URL = http://curl.haxx.se
 
-PATCHFILES += 0000-trynextip-logic-inversion-bug.patch
-
 # Because of OpenSSL 1.0 update
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 

Modified: csw/mgar/pkg/libcurl4/trunk/checksums
===================================================================
--- csw/mgar/pkg/libcurl4/trunk/checksums	2014-01-28 16:20:56 UTC (rev 22910)
+++ csw/mgar/pkg/libcurl4/trunk/checksums	2014-01-29 11:00:34 UTC (rev 22911)
@@ -1 +1 @@
-552371ae5e40bd7d9c92c62ac4b7be81  curl-7.34.0.tar.lzma
+ad7d63864414c61246450dc5e2248c7b  curl-7.35.0.tar.lzma

Deleted: csw/mgar/pkg/libcurl4/trunk/files/0000-trynextip-logic-inversion-bug.patch
===================================================================
--- csw/mgar/pkg/libcurl4/trunk/files/0000-trynextip-logic-inversion-bug.patch	2014-01-28 16:20:56 UTC (rev 22910)
+++ csw/mgar/pkg/libcurl4/trunk/files/0000-trynextip-logic-inversion-bug.patch	2014-01-29 11:00:34 UTC (rev 22911)
@@ -1,47 +0,0 @@
-From 4e1ece2e44f432c2614f2090155c0aaf2226ea80 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bj=C3=B6rn=20Stenberg?= <bjorn at haxx.se>
-Date: Sat, 28 Dec 2013 13:42:57 +0100
-Subject: [PATCH] connect: Try all addresses in first connection attempt
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes a bug when all addresses in the first family fail immediately, due
-to "Network unreachable" for example, curl would hang and never try the
-next address family.
-
-Iterate through all address families when to trying establish the first
-connection attempt.
-
-Bug: http://curl.haxx.se/bug/view.cgi?id=1315
-Reported-by: Michal Górny and Anthony G. Basile
----
- lib/connect.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/lib/connect.c b/lib/connect.c
-index 4b6ee00..588ac28 100644
---- a/lib/connect.c
-+++ b/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;
--- 
-1.8.5.1
-

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.