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

[Dave Reisner]

    Date: Wednesday, November 5, 2014 @ 14:12:46
  Author: dreisner
Revision: 225637

upgpkg: curl 7.39.0-1

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

---------------------------------------------------------------+
 0001-threaded-resolver-revert-Curl_expire_latest-switch.patch |   32 ----------
 PKGBUILD                                                      |   14 ----
 2 files changed, 3 insertions(+), 43 deletions(-)

Deleted: 0001-threaded-resolver-revert-Curl_expire_latest-switch.patch
===================================================================
--- 0001-threaded-resolver-revert-Curl_expire_latest-switch.patch	2014-11-05 03:45:15 UTC (rev 225636)
+++ 0001-threaded-resolver-revert-Curl_expire_latest-switch.patch	2014-11-05 13:12:46 UTC (rev 225637)
@@ -1,32 +0,0 @@
-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-11-05 03:45:15 UTC (rev 225636)
+++ PKGBUILD	2014-11-05 13:12:46 UTC (rev 225637)
@@ -6,8 +6,8 @@
 # Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
 
 pkgname=curl
-pkgver=7.38.0
-pkgrel=3
+pkgver=7.39.0
+pkgrel=1
 pkgdesc="An URL retrieval utility and library"
 arch=('i686' 'x86_64')
 url="http://curl.haxx.se"
@@ -16,20 +16,12 @@
 provides=('libcurl.so')
 options=('strip' 'debug')
 source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
-        0001-threaded-resolver-revert-Curl_expire_latest-switch.patch
         curlbuild.h)
-md5sums=('b6e3ea55bb718f2270489581efa50a8a'
+md5sums=('88c5650122873712296d4b1db3f12e6c'
          'SKIP'
-         '845110402d78209a957bb9b342d8bb9e'
          '751bd433ede935c8fae727377625a8ae')
 validpgpkeys=('914C533DF9B2ADA2204F586D78E11C6B279D5C91')  # Daniel Stenberg
 
-prepare() {
-  cd "$pkgname-$pkgver"
-
-  patch -Np1 <../0001-threaded-resolver-revert-Curl_expire_latest-switch.patch
-}
-
 build() {
   cd "$pkgname-$pkgver"