Date: Tuesday, January 3, 2017 @ 14:06:11 Author: alucryd Revision: 204790
upgpkg: libcurl-gnutls 7.52.1-1 Added: libcurl-gnutls/trunk/0001-vtls-s-SSLEAY-OPENSSL.patch Modified: libcurl-gnutls/trunk/PKGBUILD ----------------------------------+ 0001-vtls-s-SSLEAY-OPENSSL.patch | 39 +++++++++++++++++++++++++++++++++++++ PKGBUILD | 18 ++++++++++++----- 2 files changed, 52 insertions(+), 5 deletions(-) Added: 0001-vtls-s-SSLEAY-OPENSSL.patch =================================================================== --- 0001-vtls-s-SSLEAY-OPENSSL.patch (rev 0) +++ 0001-vtls-s-SSLEAY-OPENSSL.patch 2017-01-03 14:06:11 UTC (rev 204790) @@ -0,0 +1,39 @@ +From a7b38c9dc98481e4a5fc37e51a8690337c674dfb Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg <[email protected]> +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 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-01-03 13:49:30 UTC (rev 204789) +++ PKGBUILD 2017-01-03 14:06:11 UTC (rev 204790) @@ -3,20 +3,28 @@ # Contributor: Lizao (Larry) Li <[email protected]> pkgname=libcurl-gnutls -pkgver=7.51.0 +pkgver=7.52.1 pkgrel=1 pkgdesc='An URL retrieval library' arch=('i686' 'x86_64') url='https://curl.haxx.se' license=('MIT') -depends=('curl' 'glibc' 'gnutls' 'nettle' 'zlib' +depends=('curl' 'glibc' 'gnutls' 'libpsl' 'nettle' 'zlib' 'libssh2.so') options=('strip') -source=("https://curl.haxx.se/download/curl-${pkgver}.tar.gz"{,.asc}) +source=("https://curl.haxx.se/download/curl-${pkgver}.tar.gz"{,.asc} + '0001-vtls-s-SSLEAY-OPENSSL.patch') validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg -sha256sums=('65b5216a6fbfa72f547eb7706ca5902d7400db9868269017a8888aa91d87977c' - 'SKIP') +sha256sums=('a8984e8b20880b621f61a62d95ff3c0763a3152093a9f9ce4287cfd614add6ae' + 'SKIP' + 'a850c761e5fd1c312328a0168c9ce2eefbf9a96f960c5db9e6e4812693379b49') +prepare() { + cd curl-${pkgver} + + patch -Np1 -i ../0001-vtls-s-SSLEAY-OPENSSL.patch +} + build() { cd curl-${pkgver}
