[arch-commits] Commit in lib32-curl/repos (4 files)

2017-03-22 Thread Jelle van der Waa 
Date: Wednesday, March 22, 2017 @ 11:30:36
  Author: jelle
Revision: 218385

archrelease: copy trunk to multilib-staging-x86_64

Added:
  lib32-curl/repos/multilib-staging-x86_64/
  lib32-curl/repos/multilib-staging-x86_64/0001-vtls-s-SSLEAY-OPENSSL.patch
(from rev 218384, lib32-curl/trunk/0001-vtls-s-SSLEAY-OPENSSL.patch)
  lib32-curl/repos/multilib-staging-x86_64/PKGBUILD
(from rev 218384, lib32-curl/trunk/PKGBUILD)
  lib32-curl/repos/multilib-staging-x86_64/curlbuild.h
(from rev 218384, lib32-curl/trunk/curlbuild.h)

--+
 0001-vtls-s-SSLEAY-OPENSSL.patch |   39 ++
 PKGBUILD |   63 +
 curlbuild.h  |9 +
 3 files changed, 111 insertions(+)

Copied: 
lib32-curl/repos/multilib-staging-x86_64/0001-vtls-s-SSLEAY-OPENSSL.patch (from 
rev 218384, lib32-curl/trunk/0001-vtls-s-SSLEAY-OPENSSL.patch)
===
--- multilib-staging-x86_64/0001-vtls-s-SSLEAY-OPENSSL.patch
(rev 0)
+++ multilib-staging-x86_64/0001-vtls-s-SSLEAY-OPENSSL.patch2017-03-22 
11:30:36 UTC (rev 218385)
@@ -0,0 +1,39 @@
+From a7b38c9dc98481e4a5fc37e51a8690337c674dfb Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg 
+Date: Mon, 26 Dec 2016 00:06:33 +0100
+Subject: vtls: s/SSLEAY/OPENSSL
+
+Fixed an old leftover use of the USE_SSLEAY define which would make a
+socket get removed from the applications sockets to monitor when the
+multi_socket API was used, leading to timeouts.
+
+Bug: #1174
+---
+ lib/vtls/vtls.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
+index b808e1c..707f24b 100644
+--- a/lib/vtls/vtls.c
 b/lib/vtls/vtls.c
+@@ -484,7 +484,7 @@ void Curl_ssl_close_all(struct Curl_easy *data)
+   curlssl_close_all(data);
+ }
+ 
+-#if defined(USE_SSLEAY) || defined(USE_GNUTLS) || defined(USE_SCHANNEL) || \
++#if defined(USE_OPENSSL) || defined(USE_GNUTLS) || defined(USE_SCHANNEL) || \
+ defined(USE_DARWINSSL) || defined(USE_NSS)
+ /* This function is for OpenSSL, GnuTLS, darwinssl, and schannel only. */
+ int Curl_ssl_getsock(struct connectdata *conn, curl_socket_t *socks,
+@@ -518,7 +518,7 @@ int Curl_ssl_getsock(struct connectdata *conn,
+   (void)numsocks;
+   return GETSOCK_BLANK;
+ }
+-/* USE_SSLEAY || USE_GNUTLS || USE_SCHANNEL || USE_DARWINSSL || USE_NSS */
++/* USE_OPENSSL || USE_GNUTLS || USE_SCHANNEL || USE_DARWINSSL || USE_NSS */
+ #endif
+ 
+ void Curl_ssl_close(struct connectdata *conn, int sockindex)
+-- 
+cgit v1.1
+

Copied: lib32-curl/repos/multilib-staging-x86_64/PKGBUILD (from rev 218384, 
lib32-curl/trunk/PKGBUILD)
===
--- multilib-staging-x86_64/PKGBUILD(rev 0)
+++ multilib-staging-x86_64/PKGBUILD2017-03-22 11:30:36 UTC (rev 218385)
@@ -0,0 +1,63 @@
+# $Id$
+# Maintainer: Daniel Wallace 
+# Contributor: Dave Reisner 
+# Contributor: Angel Velasquez 
+# Contributor: Eric Belanger 
+# Contributor: Lucien Immink 
+# Contributor: Daniel J Griffiths 
+
+pkgname=lib32-curl
+_pkgname=curl
+pkgver=7.53.1
+pkgrel=1
+pkgdesc="An URL retrieval utility and library (32-bit)"
+arch=('x86_64')
+url="https://curl.haxx.se;
+license=('MIT')
+depends=('lib32-libssh2' 'lib32-krb5' 'lib32-libpsl' 'lib32-zlib' 
"${_pkgname}")
+source=("https://curl.haxx.se/download/$_pkgname-$pkgver.tar.gz"{,.asc})
+sha512sums=('f4bd2bcbf0eca312be549d2552e453b9634bbe8f74a981c1d663c42efc79cc44b419d9f37da8f6fe2f315487e55a41078cbfcd0d82af4ec84885464b56b6d217'
+'SKIP')
+validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2'   # Daniel Stenberg
+  '914C533DF9B2ADA2204F586D78E11C6B279D5C91')  # Daniel Stenberg 
(old key)
+
+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 \
+  --with-gssapi \
+  --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"

[arch-commits] Commit in lib32-curl/repos (4 files)

2013-02-13 Thread Daniel Wallace 
Date: Thursday, February 14, 2013 @ 00:19:36
  Author: dwallace
Revision: 84219

archrelease: copy trunk to multilib-x86_64

Added:
  lib32-curl/repos/multilib-x86_64/
  
lib32-curl/repos/multilib-x86_64/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch
(from rev 84218, 
lib32-curl/trunk/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch)
  lib32-curl/repos/multilib-x86_64/PKGBUILD
(from rev 84218, lib32-curl/trunk/PKGBUILD)
  lib32-curl/repos/multilib-x86_64/curlbuild.h
(from rev 84218, lib32-curl/trunk/curlbuild.h)

-+
 0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch |   39 
 PKGBUILD|   81 
++
 curlbuild.h |9 +
 3 files changed, 129 insertions(+)

Copied: 
lib32-curl/repos/multilib-x86_64/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch
 (from rev 84218, 
lib32-curl/trunk/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch)
===
--- 
multilib-x86_64/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch 
(rev 0)
+++ 
multilib-x86_64/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch 
2013-02-13 23:19:36 UTC (rev 84219)
@@ -0,0 +1,39 @@
+From da3fc1ee91de656a30f3a12de394bcba55119872 Mon Sep 17 00:00:00 2001
+From: Linus Nielsen Feltzing li...@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/PKGBUILD (from rev 84218, 
lib32-curl/trunk/PKGBUILD)
===
--- multilib-x86_64/PKGBUILD(rev 0)
+++ multilib-x86_64/PKGBUILD2013-02-13 23:19:36 UTC (rev 84219)
@@ -0,0 +1,81 @@
+# $Id$
+# Contributor: Dave Reisner dreis...@archlinux.org
+# Contributor: Angel Velasquez an...@archlinux.org
+# Contributor: Eric Belanger e...@archlinux.org
+# Contributor: Lucien Immink l.imm...@student.fnt.hvu.nl
+# Contributor: Daniel J Griffiths ghost1...@archlinux.us
+
+pkgname=lib32-curl
+_pkgname=curl
+pkgver=7.29.0
+pkgrel=2
+pkgdesc=An URL retrieval utility and library
+arch=('i686' 'x86_64')
+url=http://curl.haxx.se;
+license=('MIT')
+
+depends=('lib32-libssh2' 'ca-certificates')
+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'
+ '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
+
+  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
+
+  patch -Np1 
$srcdir/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch
+
+  ./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 \
+