[arch-commits] Commit in curl/repos (8 files)
Dave Reisner
dreisner at nymeria.archlinux.org
Fri Aug 30 02:01:21 UTC 2013
Date: Friday, August 30, 2013 @ 04:01:21
Author: dreisner
Revision: 193741
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
curl/repos/testing-i686/
curl/repos/testing-i686/0001-curl_multi_remove_handle-allow-multiple-removes.patch
(from rev 193740, curl/trunk/0001-curl_multi_remove_handle-allow-multiple-removes.patch)
curl/repos/testing-i686/PKGBUILD
(from rev 193740, curl/trunk/PKGBUILD)
curl/repos/testing-i686/curlbuild.h
(from rev 193740, curl/trunk/curlbuild.h)
curl/repos/testing-x86_64/
curl/repos/testing-x86_64/0001-curl_multi_remove_handle-allow-multiple-removes.patch
(from rev 193740, curl/trunk/0001-curl_multi_remove_handle-allow-multiple-removes.patch)
curl/repos/testing-x86_64/PKGBUILD
(from rev 193740, curl/trunk/PKGBUILD)
curl/repos/testing-x86_64/curlbuild.h
(from rev 193740, curl/trunk/curlbuild.h)
---------------------------------------------------------------------------+
testing-i686/0001-curl_multi_remove_handle-allow-multiple-removes.patch | 29 ++++
testing-i686/PKGBUILD | 71 ++++++++++
testing-i686/curlbuild.h | 9 +
testing-x86_64/0001-curl_multi_remove_handle-allow-multiple-removes.patch | 29 ++++
testing-x86_64/PKGBUILD | 71 ++++++++++
testing-x86_64/curlbuild.h | 9 +
6 files changed, 218 insertions(+)
Copied: curl/repos/testing-i686/0001-curl_multi_remove_handle-allow-multiple-removes.patch (from rev 193740, curl/trunk/0001-curl_multi_remove_handle-allow-multiple-removes.patch)
===================================================================
--- testing-i686/0001-curl_multi_remove_handle-allow-multiple-removes.patch (rev 0)
+++ testing-i686/0001-curl_multi_remove_handle-allow-multiple-removes.patch 2013-08-30 02:01:21 UTC (rev 193741)
@@ -0,0 +1,29 @@
+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
+
Copied: curl/repos/testing-i686/PKGBUILD (from rev 193740, curl/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2013-08-30 02:01:21 UTC (rev 193741)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+# Contributor: Angel Velasquez <angvp at archlinux.org>
+# Contributor: Eric Belanger <eric at archlinux.org>
+# Contributor: Lucien Immink <l.immink at student.fnt.hvu.nl>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+
+pkgname=curl
+pkgver=7.32.0
+pkgrel=2
+pkgdesc="An URL retrieval utility and library"
+arch=('i686' 'x86_64')
+url="http://curl.haxx.se"
+license=('MIT')
+depends=('ca-certificates' 'libssh2' 'openssl' 'zlib')
+provides=('libcurl.so')
+options=('!libtool')
+source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
+ 0001-curl_multi_remove_handle-allow-multiple-removes.patch
+ curlbuild.h)
+md5sums=('f77cf3cb59cf2bfe686b80338323fd40'
+ 'SKIP'
+ '589a2ccdf90e198fca398809e9d16128'
+ '751bd433ede935c8fae727377625a8ae')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+
+ patch -Np1 <"$srcdir"/0001-curl_multi_remove_handle-allow-multiple-removes.patch
+}
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ ./configure \
+ --prefix=/usr \
+ --mandir=/usr/share/man \
+ --disable-ldap \
+ --disable-ldaps \
+ --enable-ipv6 \
+ --enable-manual \
+ --enable-versioned-symbols \
+ --enable-threaded-resolver \
+ --without-libidn \
+ --with-random=/dev/urandom \
+ --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
+
+ make
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+
+ 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"
+
+ # devel
+ mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild"
+ install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h"
+}
Copied: curl/repos/testing-i686/curlbuild.h (from rev 193740, curl/trunk/curlbuild.h)
===================================================================
--- testing-i686/curlbuild.h (rev 0)
+++ testing-i686/curlbuild.h 2013-08-30 02:01:21 UTC (rev 193741)
@@ -0,0 +1,9 @@
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include "curlbuild-32.h"
+#elif __WORDSIZE == 64
+#include "curlbuild-64.h"
+#else
+#error "Unknown word size"
+#endif
Copied: curl/repos/testing-x86_64/0001-curl_multi_remove_handle-allow-multiple-removes.patch (from rev 193740, curl/trunk/0001-curl_multi_remove_handle-allow-multiple-removes.patch)
===================================================================
--- testing-x86_64/0001-curl_multi_remove_handle-allow-multiple-removes.patch (rev 0)
+++ testing-x86_64/0001-curl_multi_remove_handle-allow-multiple-removes.patch 2013-08-30 02:01:21 UTC (rev 193741)
@@ -0,0 +1,29 @@
+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
+
Copied: curl/repos/testing-x86_64/PKGBUILD (from rev 193740, curl/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2013-08-30 02:01:21 UTC (rev 193741)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+# Contributor: Angel Velasquez <angvp at archlinux.org>
+# Contributor: Eric Belanger <eric at archlinux.org>
+# Contributor: Lucien Immink <l.immink at student.fnt.hvu.nl>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+
+pkgname=curl
+pkgver=7.32.0
+pkgrel=2
+pkgdesc="An URL retrieval utility and library"
+arch=('i686' 'x86_64')
+url="http://curl.haxx.se"
+license=('MIT')
+depends=('ca-certificates' 'libssh2' 'openssl' 'zlib')
+provides=('libcurl.so')
+options=('!libtool')
+source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
+ 0001-curl_multi_remove_handle-allow-multiple-removes.patch
+ curlbuild.h)
+md5sums=('f77cf3cb59cf2bfe686b80338323fd40'
+ 'SKIP'
+ '589a2ccdf90e198fca398809e9d16128'
+ '751bd433ede935c8fae727377625a8ae')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+
+ patch -Np1 <"$srcdir"/0001-curl_multi_remove_handle-allow-multiple-removes.patch
+}
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ ./configure \
+ --prefix=/usr \
+ --mandir=/usr/share/man \
+ --disable-ldap \
+ --disable-ldaps \
+ --enable-ipv6 \
+ --enable-manual \
+ --enable-versioned-symbols \
+ --enable-threaded-resolver \
+ --without-libidn \
+ --with-random=/dev/urandom \
+ --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
+
+ make
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+
+ 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"
+
+ # devel
+ mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild"
+ install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h"
+}
Copied: curl/repos/testing-x86_64/curlbuild.h (from rev 193740, curl/trunk/curlbuild.h)
===================================================================
--- testing-x86_64/curlbuild.h (rev 0)
+++ testing-x86_64/curlbuild.h 2013-08-30 02:01:21 UTC (rev 193741)
@@ -0,0 +1,9 @@
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include "curlbuild-32.h"
+#elif __WORDSIZE == 64
+#include "curlbuild-64.h"
+#else
+#error "Unknown word size"
+#endif
More information about the arch-commits
mailing list