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

[Dave Reisner]

    Date: Monday, October 14, 2013 @ 16:55:23
  Author: dreisner
Revision: 196502

upgpkg: curl 7.33.0-1

- add debug pkg to build (not hosted in [core])

Modified:
  curl/trunk/PKGBUILD
Deleted:
  curl/trunk/0001-curl_multi_remove_handle-allow-multiple-removes.patch

------------------------------------------------------------+
 0001-curl_multi_remove_handle-allow-multiple-removes.patch |   29 -----------
 PKGBUILD                                                   |   16 +-----
 2 files changed, 4 insertions(+), 41 deletions(-)

Deleted: 0001-curl_multi_remove_handle-allow-multiple-removes.patch
===================================================================
--- 0001-curl_multi_remove_handle-allow-multiple-removes.patch	2013-10-14 14:05:34 UTC (rev 196501)
+++ 0001-curl_multi_remove_handle-allow-multiple-removes.patch	2013-10-14 14:55:23 UTC (rev 196502)
@@ -1,29 +0,0 @@
-From 84f3b3dd448399f9548468676e1bd1475dba8de5 Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel at haxx.se>
-Date: Thu, 29 Aug 2013 22:08:01 +0200
-Subject: [PATCH] curl_multi_remove_handle: allow multiple removes
-
-When removing an already removed handle, avoid that to ruin the
-internals and just return OK instead.
----
- lib/multi.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/lib/multi.c b/lib/multi.c
-index fb495e0..e723a3e 100644
---- a/lib/multi.c
-+++ b/lib/multi.c
-@@ -483,6 +483,10 @@ CURLMcode curl_multi_remove_handle(CURLM *multi_handle,
-   if(!GOOD_EASY_HANDLE(curl_handle))
-     return CURLM_BAD_EASY_HANDLE;
- 
-+  /* Prevent users from trying to remove same easy handle more than once */
-+  if(!data->multi)
-+    return CURLM_OK; /* it is already removed so let's say it is fine! */
-+
-   if(easy) {
-     bool premature = (data->mstate < CURLM_STATE_COMPLETED) ? TRUE : FALSE;
-     bool easy_owns_conn = (data->easy_conn &&
--- 
-1.8.4
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-10-14 14:05:34 UTC (rev 196501)
+++ PKGBUILD	2013-10-14 14:55:23 UTC (rev 196502)
@@ -6,8 +6,8 @@
 # Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
 
 pkgname=curl
-pkgver=7.32.0
-pkgrel=2
+pkgver=7.33.0
+pkgrel=1
 pkgdesc="An URL retrieval utility and library"
 arch=('i686' 'x86_64')
 url="http://curl.haxx.se"
@@ -14,21 +14,13 @@
 license=('MIT')
 depends=('ca-certificates' 'libssh2' 'openssl' 'zlib')
 provides=('libcurl.so')
-options=('!libtool')
+options=('!libtool' 'strip' 'debug')
 source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
-        0001-curl_multi_remove_handle-allow-multiple-removes.patch
         curlbuild.h)
-md5sums=('f77cf3cb59cf2bfe686b80338323fd40'
+md5sums=('c8a4eaac7ce7b0d1bf458d62ccd4ef93'
          'SKIP'
-         '589a2ccdf90e198fca398809e9d16128'
          '751bd433ede935c8fae727377625a8ae')
 
-prepare() {
-  cd "$pkgname-$pkgver"
-
-  patch -Np1 <"$srcdir"/0001-curl_multi_remove_handle-allow-multiple-removes.patch 
-}
-
 build() {
   cd "$pkgname-$pkgver"