[arch-commits] Commit in lib32-libcurl-gnutls/repos (3 files)

[Maxime Gauduin]

    Date: Sunday, April 2, 2017 @ 20:55:35
  Author: alucryd
Revision: 220336

archrelease: copy trunk to multilib-testing-x86_64

Added:
  lib32-libcurl-gnutls/repos/multilib-testing-x86_64/
  lib32-libcurl-gnutls/repos/multilib-testing-x86_64/0001-vtls-s-SSLEAY-OPENSSL.patch
    (from rev 220335, lib32-libcurl-gnutls/trunk/0001-vtls-s-SSLEAY-OPENSSL.patch)
  lib32-libcurl-gnutls/repos/multilib-testing-x86_64/PKGBUILD
    (from rev 220335, lib32-libcurl-gnutls/trunk/PKGBUILD)

----------------------------------+
 0001-vtls-s-SSLEAY-OPENSSL.patch |   39 +++++++++++++++++++++++
 PKGBUILD                         |   61 +++++++++++++++++++++++++++++++++++++
 2 files changed, 100 insertions(+)

Copied: lib32-libcurl-gnutls/repos/multilib-testing-x86_64/0001-vtls-s-SSLEAY-OPENSSL.patch (from rev 220335, lib32-libcurl-gnutls/trunk/0001-vtls-s-SSLEAY-OPENSSL.patch)
===================================================================
--- multilib-testing-x86_64/0001-vtls-s-SSLEAY-OPENSSL.patch	                        (rev 0)
+++ multilib-testing-x86_64/0001-vtls-s-SSLEAY-OPENSSL.patch	2017-04-02 20:55:35 UTC (rev 220336)
@@ -0,0 +1,39 @@
+From a7b38c9dc98481e4a5fc37e51a8690337c674dfb Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel at haxx.se>
+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-libcurl-gnutls/repos/multilib-testing-x86_64/PKGBUILD (from rev 220335, lib32-libcurl-gnutls/trunk/PKGBUILD)
===================================================================
--- multilib-testing-x86_64/PKGBUILD	                        (rev 0)
+++ multilib-testing-x86_64/PKGBUILD	2017-04-02 20:55:35 UTC (rev 220336)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Lizao (Larry) Li <lzlarryli at gmail.com>
+
+pkgname=lib32-libcurl-gnutls
+pkgver=7.53.1
+pkgrel=1
+pkgdesc='An URL retrieval library'
+arch=('x86_64')
+url='https://curl.haxx.se'
+license=('MIT')
+depends=('lib32-curl' 'lib32-glibc' 'lib32-gnutls' 'lib32-libpsl'
+         'lib32-libssh2' 'lib32-nettle' 'lib32-zlib' 'libcurl-gnutls')
+makedepends=('gcc-multilib')
+options=('strip')
+source=("https://curl.haxx.se/download/curl-${pkgver}.tar.gz"{,.asc})
+validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg
+sha256sums=('64f9b7ec82372edb8eaeded0a9cfa62334d8f98abc65487da01188259392911d'
+            'SKIP')
+
+build() {
+  cd curl-${pkgver}
+
+  export CC='gcc -m32'
+  export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
+
+  ./configure \
+    --prefix='/usr' \
+    --libdir='/usr/lib32' \
+    --disable-ldap \
+    --disable-ldaps \
+    --disable-manual \
+    --disable-versioned-symbols \
+    --enable-ipv6 \
+    --enable-threaded-resolver \
+    --without-gssapi \
+    --without-libidn \
+    --without-ssl \
+    --with-gnutls='/usr' \
+    --with-random='/dev/urandom' \
+    --with-ca-bundle='/etc/ssl/certs/ca-certificates.crt'
+
+  make -C lib
+}
+
+package() {
+  cd curl-${pkgver}
+
+  make -C lib DESTDIR="${pkgdir}" install
+
+  mv "${pkgdir}"/usr/lib32/libcurl{,-gnutls}.so.4.4.0
+  rm "${pkgdir}"/usr/lib32/libcurl.{a,so}*
+  for version in 3 4 4.0.0 4.1.0 4.2.0 4.3.0; do
+    ln -s libcurl-gnutls.so.4.4.0 "${pkgdir}"/usr/lib32/libcurl-gnutls.so.${version}
+  done
+
+  install -dm 755 "${pkgdir}"/usr/share/licenses
+  ln -s libcurl-gnutls "${pkgdir}"/usr/share/licenses/lib32-libcurl-gnutls
+}
+
+# vim: ts=2 sw=2 et: