[arch-commits] Commit in lib32-curl/repos/multilib-x86_64 (6 files)
Laurent Carlier
lcarlier at nymeria.archlinux.org
Fri Jan 24 07:52:07 UTC 2014
Date: Friday, January 24, 2014 @ 08:52:07
Author: lcarlier
Revision: 104648
archrelease: copy trunk to multilib-x86_64
Added:
lib32-curl/repos/multilib-x86_64/0001-connect-Try-all-addresses-in-first-connection-attemp.patch
(from rev 104647, lib32-curl/trunk/0001-connect-Try-all-addresses-in-first-connection-attemp.patch)
lib32-curl/repos/multilib-x86_64/PKGBUILD
(from rev 104647, lib32-curl/trunk/PKGBUILD)
lib32-curl/repos/multilib-x86_64/curlbuild.h
(from rev 104647, lib32-curl/trunk/curlbuild.h)
Deleted:
lib32-curl/repos/multilib-x86_64/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch
lib32-curl/repos/multilib-x86_64/PKGBUILD
lib32-curl/repos/multilib-x86_64/curlbuild.h
-----------------------------------------------------------------+
0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch | 39 --
0001-connect-Try-all-addresses-in-first-connection-attemp.patch | 47 +++
PKGBUILD | 136 +++++-----
curlbuild.h | 18 -
4 files changed, 125 insertions(+), 115 deletions(-)
Deleted: 0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch
===================================================================
--- 0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch 2014-01-24 07:51:51 UTC (rev 104647)
+++ 0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch 2014-01-24 07:52:07 UTC (rev 104648)
@@ -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
-
Copied: lib32-curl/repos/multilib-x86_64/0001-connect-Try-all-addresses-in-first-connection-attemp.patch (from rev 104647, lib32-curl/trunk/0001-connect-Try-all-addresses-in-first-connection-attemp.patch)
===================================================================
--- 0001-connect-Try-all-addresses-in-first-connection-attemp.patch (rev 0)
+++ 0001-connect-Try-all-addresses-in-first-connection-attemp.patch 2014-01-24 07:52:07 UTC (rev 104648)
@@ -0,0 +1,47 @@
+From 4e1ece2e44f432c2614f2090155c0aaf2226ea80 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bj=C3=B6rn=20Stenberg?= <bjorn at haxx.se>
+Date: Sat, 28 Dec 2013 13:42:57 +0100
+Subject: [PATCH] connect: Try all addresses in first connection attempt
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes a bug when all addresses in the first family fail immediately, due
+to "Network unreachable" for example, curl would hang and never try the
+next address family.
+
+Iterate through all address families when to trying establish the first
+connection attempt.
+
+Bug: http://curl.haxx.se/bug/view.cgi?id=1315
+Reported-by: Michal Górny and Anthony G. Basile
+---
+ lib/connect.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/lib/connect.c b/lib/connect.c
+index 4b6ee00..588ac28 100644
+--- a/lib/connect.c
++++ b/lib/connect.c
+@@ -1104,12 +1104,12 @@ CURLcode Curl_connecthost(struct connectdata *conn, /* context */
+ conn->tempaddr[0]->ai_next == NULL ? timeout_ms : timeout_ms / 2;
+
+ /* start connecting to first IP */
+- res = singleipconnect(conn, conn->tempaddr[0], &(conn->tempsock[0]));
+- while(res != CURLE_OK &&
+- conn->tempaddr[0] &&
+- conn->tempaddr[0]->ai_next &&
+- conn->tempsock[0] == CURL_SOCKET_BAD)
+- res = trynextip(conn, FIRSTSOCKET, 0);
++ while(conn->tempaddr[0]) {
++ res = singleipconnect(conn, conn->tempaddr[0], &(conn->tempsock[0]));
++ if(res == CURLE_OK)
++ break;
++ conn->tempaddr[0] = conn->tempaddr[0]->ai_next;
++ }
+
+ if(conn->tempsock[0] == CURL_SOCKET_BAD)
+ return res;
+--
+1.8.5.2
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2014-01-24 07:51:51 UTC (rev 104647)
+++ PKGBUILD 2014-01-24 07:52:07 UTC (rev 104648)
@@ -1,67 +0,0 @@
-# $Id$
-# Maintainer: Daniel Wallace <danielwallace at aur.archlinux.org>
-# Contributor: 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=lib32-curl
-_pkgname=curl
-pkgver=7.33.0
-pkgrel=1
-pkgdesc="An URL retrieval utility and library (32-bit)"
-arch=('x86_64')
-url="http://curl.haxx.se"
-license=('MIT')
-depends=('lib32-libssh2' "${_pkgname}")
-options=('!libtool')
-source=("http://curl.haxx.se/download/$_pkgname-$pkgver.tar.gz"{,.asc})
-md5sums=('c8a4eaac7ce7b0d1bf458d62ccd4ef93'
- 'SKIP')
-
-build() {
- cd "$_pkgname-$pkgver"
-
- export CC="gcc -m32"
- export CXX="g++ -m32"
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
- # workaround to avoid error during ./configure
-
- #CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
- #CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
-
- ./configure \
- --prefix=/usr \
- --mandir=/usr/share/man \
- --disable-dependency-tracking \
- --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 \
- --libdir=/usr/lib32
-
- make
-}
-
-package() {
- cd "$_pkgname-$pkgver"
-
- make DESTDIR="$pkgdir" install
-
- rm -rf "${pkgdir}"/usr/{share,bin}
-
- # license
- install -d "$pkgdir/usr/share/licenses"
- ln -s "$_pkgname" "$pkgdir/usr/share/licenses/$pkgname"
-
- # devel
- find "${pkgdir}/usr/include/curl" -type f -not -name curlbuild.h -delete
- mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/$_pkgname/curlbuild-32.h"
-}
Copied: lib32-curl/repos/multilib-x86_64/PKGBUILD (from rev 104647, lib32-curl/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2014-01-24 07:52:07 UTC (rev 104648)
@@ -0,0 +1,69 @@
+# $Id$
+# Maintainer: Daniel Wallace <danielwallace at aur.archlinux.org>
+# Contributor: 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=lib32-curl
+_pkgname=curl
+pkgver=7.34.0
+pkgrel=1
+pkgdesc="An URL retrieval utility and library (32-bit)"
+arch=('x86_64')
+url="http://curl.haxx.se"
+license=('MIT')
+depends=('lib32-libssh2' "${_pkgname}")
+source=("http://curl.haxx.se/download/$_pkgname-$pkgver.tar.gz"{,.asc}
+ 0001-connect-Try-all-addresses-in-first-connection-attemp.patch)
+md5sums=('d5b7edccbd1793e3549842e01331da20'
+ 'SKIP'
+ 'ee755b0e886207fc1e8154e426c46ca7')
+
+prepare() {
+ cd "$_pkgname-$pkgver"
+
+ patch -Np1 <"$srcdir"/0001-connect-Try-all-addresses-in-first-connection-attemp.patch
+}
+
+build() {
+ cd "$_pkgname-$pkgver"
+
+ export CC="gcc -m32"
+ export CXX="g++ -m32"
+ export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+ ./configure \
+ --prefix=/usr \
+ --mandir=/usr/share/man \
+ --disable-dependency-tracking \
+ --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 \
+ --libdir=/usr/lib32
+
+ make
+}
+
+package() {
+ cd "$_pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir" install
+
+ rm -rf "${pkgdir}"/usr/{share,bin}
+
+ # license
+ install -d "$pkgdir/usr/share/licenses"
+ ln -s "$_pkgname" "$pkgdir/usr/share/licenses/$pkgname"
+
+ # devel
+ find "${pkgdir}/usr/include/curl" -type f -not -name curlbuild.h -delete
+ mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/$_pkgname/curlbuild-32.h"
+}
Deleted: curlbuild.h
===================================================================
--- curlbuild.h 2014-01-24 07:51:51 UTC (rev 104647)
+++ curlbuild.h 2014-01-24 07:52:07 UTC (rev 104648)
@@ -1,9 +0,0 @@
-#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: lib32-curl/repos/multilib-x86_64/curlbuild.h (from rev 104647, lib32-curl/trunk/curlbuild.h)
===================================================================
--- curlbuild.h (rev 0)
+++ curlbuild.h 2014-01-24 07:52:07 UTC (rev 104648)
@@ -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