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

[Dave Reisner]

    Date: Friday, April 12, 2013 @ 14:52:13
  Author: dreisner
Revision: 182658

upgpkg: curl 7.30.0-1

Modified:
  curl/trunk/PKGBUILD
Deleted:
  curl/trunk/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch

-----------------------------------------------------------------+
 0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch |   39 ----------
 PKGBUILD                                                        |   30 +++----
 2 files changed, 13 insertions(+), 56 deletions(-)

Deleted: 0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch
===================================================================
--- 0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch	2013-04-12 07:45:16 UTC (rev 182657)
+++ 0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch	2013-04-12 12:52:13 UTC (rev 182658)
@@ -1,39 +0,0 @@
-From da3fc1ee91de656a30f3a12de394bcba55119872 Mon Sep 17 00:00:00 2001
-From: Linus Nielsen Feltzing <linus at haxx.se>
-Date: Sun, 10 Feb 2013 22:57:58 +0100
-Subject: [PATCH] Fix NULL pointer reference when closing an unused multi
- handle.
-
----
- lib/multi.c                |  8 +++++---
- tests/data/Makefile.am     |  1 +
- tests/data/test1508        | 31 +++++++++++++++++++++++++++++
- tests/libtest/Makefile.inc |  6 +++++-
- tests/libtest/lib1508.c    | 49 ++++++++++++++++++++++++++++++++++++++++++++++
- 5 files changed, 91 insertions(+), 4 deletions(-)
- create mode 100644 tests/data/test1508
- create mode 100644 tests/libtest/lib1508.c
-
-diff --git a/lib/multi.c b/lib/multi.c
-index fa0afb9..706df23 100644
---- a/lib/multi.c
-+++ b/lib/multi.c
-@@ -1773,10 +1773,12 @@ CURLMcode curl_multi_cleanup(CURLM *multi_handle)
-     /* Close all the connections in the connection cache */
-     close_all_connections(multi);
- 
--    multi->closure_handle->dns.hostcache = multi->hostcache;
--    Curl_hostcache_clean(multi->closure_handle);
-+    if(multi->closure_handle) {
-+      multi->closure_handle->dns.hostcache = multi->hostcache;
-+      Curl_hostcache_clean(multi->closure_handle);
- 
--    Curl_close(multi->closure_handle);
-+      Curl_close(multi->closure_handle);
-+    }
-     multi->closure_handle = NULL;
- 
-     Curl_hash_destroy(multi->sockhash);
--- 
-1.8.1.3
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-04-12 07:45:16 UTC (rev 182657)
+++ PKGBUILD	2013-04-12 12:52:13 UTC (rev 182658)
@@ -6,8 +6,8 @@
 # Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
 
 pkgname=curl
-pkgver=7.29.0
-pkgrel=2
+pkgver=7.30.0
+pkgrel=1
 pkgdesc="An URL retrieval utility and library"
 arch=('i686' 'x86_64')
 url="http://curl.haxx.se"
@@ -15,27 +15,14 @@
 depends=('ca-certificates' 'libssh2' 'openssl' 'zlib')
 options=('!libtool')
 source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
-        0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch
         curlbuild.h)
-md5sums=('4f57d3b4a3963038bd5e04dbff385390'
-         '6283fbb36933cf8720acc34c43169f1d'
-         '5bfd1899e8b19cfdd78774f6337f8b47'
+md5sums=('60bb6ff558415b73ba2f00163fd307c5'
+         'SKIP'
          '751bd433ede935c8fae727377625a8ae')
 
-ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d')
-case $ptrsize in
-  8) _curlbuild=curlbuild-64.h ;;
-  4) _curlbuild=curlbuild-32.h ;;
-  *) error "unknown pointer size for architecture: %s bytes" "$ptrsize"
-    exit 1
-    ;;
-esac
-
 build() {
   cd "$pkgname-$pkgver"
 
-  patch -Np1 <"$srcdir/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch"
-
   ./configure \
       --prefix=/usr \
       --mandir=/usr/share/man \
@@ -58,6 +45,15 @@
 
   make DESTDIR="$pkgdir" install
 
+  local ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d')
+  case $ptrsize in
+    8) _curlbuild=curlbuild-64.h ;;
+    4) _curlbuild=curlbuild-32.h ;;
+    *) error "unknown pointer size for architecture: %s bytes" "$ptrsize"
+      exit 1
+      ;;
+  esac
+
   # license
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"