[arch-commits] Commit in curl/trunk (2 files)

[Dave Reisner]

    Date: Tuesday, September 23, 2014 @ 19:43:51
  Author: dreisner
Revision: 222873

upgpkg: curl 7.38.0-2

- backport fix for XBMC regression (FS#42001)

Added:
  curl/trunk/0001-threaded-resolver-revert-Curl_expire_latest-switch.patch
Modified:
  curl/trunk/PKGBUILD

---------------------------------------------------------------+
 0001-threaded-resolver-revert-Curl_expire_latest-switch.patch |   32 ++++++++++
 PKGBUILD                                                      |   10 ++-
 2 files changed, 41 insertions(+), 1 deletion(-)

Added: 0001-threaded-resolver-revert-Curl_expire_latest-switch.patch
===================================================================
--- 0001-threaded-resolver-revert-Curl_expire_latest-switch.patch	                        (rev 0)
+++ 0001-threaded-resolver-revert-Curl_expire_latest-switch.patch	2014-09-23 17:43:51 UTC (rev 222873)
@@ -0,0 +1,32 @@
+From d9762a7cdb35e70f8cb0bf1c2f8019e8391616e1 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel at haxx.se>
+Date: Tue, 23 Sep 2014 11:44:03 +0200
+Subject: [PATCH] threaded-resolver: revert Curl_expire_latest() switch
+
+The switch to using Curl_expire_latest() in commit cacdc27f52b was a
+mistake and was against the advice even mentioned in that commit. The
+comparison in asyn-thread.c:Curl_resolver_is_resolved() makes
+Curl_expire() the suitable function to use.
+
+Bug: http://curl.haxx.se/bug/view.cgi?id=1426
+Reported-By: graysky
+---
+ lib/asyn-thread.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/asyn-thread.c b/lib/asyn-thread.c
+index e4ad32b..6cdc9ad 100644
+--- a/lib/asyn-thread.c
++++ b/lib/asyn-thread.c
+@@ -541,7 +541,7 @@ CURLcode Curl_resolver_is_resolved(struct connectdata *conn,
+       td->poll_interval = 250;
+ 
+     td->interval_end = elapsed + td->poll_interval;
+-    Curl_expire_latest(conn->data, td->poll_interval);
++    Curl_expire(conn->data, td->poll_interval);
+   }
+ 
+   return CURLE_OK;
+-- 
+2.1.0
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-23 17:38:15 UTC (rev 222872)
+++ PKGBUILD	2014-09-23 17:43:51 UTC (rev 222873)
@@ -7,7 +7,7 @@
 
 pkgname=curl
 pkgver=7.38.0
-pkgrel=1
+pkgrel=2
 pkgdesc="An URL retrieval utility and library"
 arch=('i686' 'x86_64')
 url="http://curl.haxx.se"
@@ -16,10 +16,18 @@
 provides=('libcurl.so')
 options=('strip' 'debug')
 source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"
+        0001-threaded-resolver-revert-Curl_expire_latest-switch.patch
         curlbuild.h)
 md5sums=('b6e3ea55bb718f2270489581efa50a8a'
+         '845110402d78209a957bb9b342d8bb9e'
          '751bd433ede935c8fae727377625a8ae')
 
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  patch -Np1 <../0001-threaded-resolver-revert-Curl_expire_latest-switch.patch
+}
+
 build() {
   cd "$pkgname-$pkgver"