commit 578f3b489043df5f0274e1c0a4cc5f7cf7612cd9 Author: Danny Rawlins <monster.romster@gmail.com> Date: Thu Mar 2 22:16:36 2017 +1100 curl-32: 7.52.1 -> 7.53.1 diff --git a/curl-32/.md5sum b/curl-32/.md5sum index 0ee13bf..cf5a6d1 100644 --- a/curl-32/.md5sum +++ b/curl-32/.md5sum @@ -1,2 +1 @@ -e71496f422359ccb7783fe495569541a 0002-vtls-s-SSLEAY-OPENSSL.patch -ddbd157359bc8a9174e11b151254b264 curl-7.52.1.tar.lzma +78fce113c34e7a7941080bcd0d21fecc curl-7.53.1.tar.lzma diff --git a/curl-32/.signature b/curl-32/.signature new file mode 100644 index 0000000..3e1a3a3 --- /dev/null +++ b/curl-32/.signature @@ -0,0 +1,5 @@ +untrusted comment: verify with /etc/ports/compat-32.pub +RWSwxGo/zH7eXR0n9x+c583pf5+GpnCTNzCpcPYEMz8Tt+jg6F9aHeNxkp/qEi9Jp60s+9EHHJE05sufa5baryfoE0WWytbR5wo= +SHA256 (Pkgfile) = 845fc3aa7c17e9433684cd01643d61d232f1a1076480d46e31394e96be405174 +SHA256 (.footprint) = 044adccfadc4a2837d066fe5ee3bc2877df94495bdc826b0f2ea69505634ccce +SHA256 (curl-7.53.1.tar.lzma) = 4b124ff5984f2b537790a8f50dbf3d44da89e57d0505ba567128535a2426f5e2 diff --git a/curl-32/0002-vtls-s-SSLEAY-OPENSSL.patch b/curl-32/0002-vtls-s-SSLEAY-OPENSSL.patch deleted file mode 100644 index 386dfe1..0000000 --- a/curl-32/0002-vtls-s-SSLEAY-OPENSSL.patch +++ /dev/null @@ -1,39 +0,0 @@ -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-32/Pkgfile b/curl-32/Pkgfile index 1c9cf25..5adf3a3 100644 --- a/curl-32/Pkgfile +++ b/curl-32/Pkgfile @@ -4,13 +4,13 @@ # Depends on: openssl-32 zlib-32 curl name=curl-32 -version=7.52.1 +version=7.53.1 release=1 -source=(https://curl.haxx.se/download/${name%-*}-$version.tar.lzma 0002-vtls-s-SSLEAY-OPENSSL.patch) +source=(https://curl.haxx.se/download/${name%-*}-$version.tar.lzma) build() { cd ${name%-*}-$version - patch -p1 -i $SRC/0002-vtls-s-SSLEAY-OPENSSL.patch + ./configure --prefix=/usr \ --libdir=/usr/lib32 \ --enable-ipv6 \