commit 7b7ea6702f9f8b246bb0a4559a8ecd664ee06327 Author: Fredrik Rinnestam <fredrik@crux.nu> Date: Wed Jan 25 03:07:03 2017 +0100 curl: added patch for upstream bug #1174 diff --git a/curl/.md5sum b/curl/.md5sum index 5123918..0ee13bf 100644 --- a/curl/.md5sum +++ b/curl/.md5sum @@ -1 +1,2 @@ +e71496f422359ccb7783fe495569541a 0002-vtls-s-SSLEAY-OPENSSL.patch ddbd157359bc8a9174e11b151254b264 curl-7.52.1.tar.lzma diff --git a/curl/0002-vtls-s-SSLEAY-OPENSSL.patch b/curl/0002-vtls-s-SSLEAY-OPENSSL.patch new file mode 100644 index 0000000..386dfe1 --- /dev/null +++ b/curl/0002-vtls-s-SSLEAY-OPENSSL.patch @@ -0,0 +1,39 @@ +From a7b38c9dc98481e4a5fc37e51a8690337c674dfb Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg <daniel@haxx.se> +Date: Mon, 26 Dec 2016 00:06:33 +0100 +Subject: [PATCH 02/76] 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 b808e1c5f..707f24b02 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) +-- +2.11.0 + diff --git a/curl/Pkgfile b/curl/Pkgfile index bc8e204..43df000 100644 --- a/curl/Pkgfile +++ b/curl/Pkgfile @@ -6,10 +6,11 @@ name=curl version=7.52.1 release=1 -source=(http://curl.haxx.se/download/$name-$version.tar.lzma) +source=(http://curl.haxx.se/download/$name-$version.tar.lzma 0002-vtls-s-SSLEAY-OPENSSL.patch) build() { cd $name-$version + patch -p1 -i $SRC/0002-vtls-s-SSLEAY-OPENSSL.patch ./configure --prefix=/usr \ --enable-ipv6 \ --without-libidn \