commit 78b12eed38f73e729c97447f67a56f04226d1c97 Author: Fredrik Rinnestam <fredrik@crux.nu> Date: Wed Feb 22 21:28:44 2017 +0100 curl: updated to 7.53.0 diff --git a/curl/.footprint b/curl/.footprint index 3d859d2..ad88a5a 100644 --- a/curl/.footprint +++ b/curl/.footprint @@ -93,6 +93,7 @@ drwxr-xr-x root/root usr/share/man/man3/ -rw-r--r-- root/root usr/share/man/man3/CURLMOPT_SOCKETFUNCTION.3.gz -rw-r--r-- root/root usr/share/man/man3/CURLMOPT_TIMERDATA.3.gz -rw-r--r-- root/root usr/share/man/man3/CURLMOPT_TIMERFUNCTION.3.gz +-rw-r--r-- root/root usr/share/man/man3/CURLOPT_ABSTRACT_UNIX_SOCKET.3.gz -rw-r--r-- root/root usr/share/man/man3/CURLOPT_ACCEPTTIMEOUT_MS.3.gz -rw-r--r-- root/root usr/share/man/man3/CURLOPT_ACCEPT_ENCODING.3.gz -rw-r--r-- root/root usr/share/man/man3/CURLOPT_ADDRESS_SCOPE.3.gz diff --git a/curl/.md5sum b/curl/.md5sum index 0ee13bf..1ba3d2b 100644 --- a/curl/.md5sum +++ b/curl/.md5sum @@ -1,2 +1 @@ -e71496f422359ccb7783fe495569541a 0002-vtls-s-SSLEAY-OPENSSL.patch -ddbd157359bc8a9174e11b151254b264 curl-7.52.1.tar.lzma +2047fe370f07a9640f9b87151a8c8205 curl-7.53.0.tar.lzma diff --git a/curl/.signature b/curl/.signature index e4458ed..68a5194 100644 --- a/curl/.signature +++ b/curl/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqvx/97rRYai6wf9HBq4bvx3nUuollLl7Oomkh6z7+QO5fn5tLT6uZom2STitAB/1T5wakW6N0QUb/EFYehRG8g0= -SHA256 (Pkgfile) = f056c86595b226c1abf6dd5f887b1a9a93fcf5602e902b34e830792218bf5847 -SHA256 (.footprint) = 218a4dde5089c4ae7f858d499b3428cecb34c7302e5b5aefabf096943463bb62 -SHA256 (curl-7.52.1.tar.lzma) = 44286d4b825936e2430fc44ad730ce899afb736a5d328cbb8b5d42462f3f2365 -SHA256 (0002-vtls-s-SSLEAY-OPENSSL.patch) = a329c611b4708125594732d8c814b4434d61cd433845b1bf18e8655b40eb195b +RWRJc1FUaeVeqgCrShSbnchVAAk9VWHoS/Yi8NlNDkyckf0G/zQMqYmguK0niW19ePMlQiXqio7PaGOItFY1+1ne2Hi3FW5u3wg= +SHA256 (Pkgfile) = cbf47e0e9ef10f643db91138fe250ba4a38167429f9ccbb1799a276d5704b1f8 +SHA256 (.footprint) = 27e1c96105b75e6281b815a5eb14522f7c18a539597fd62949d33e7e49962a66 +SHA256 (curl-7.53.0.tar.lzma) = 38bf7820a72ae476a7637d55ec1e794cb3bb78b111521a0c2300ade77b1811cc diff --git a/curl/0002-vtls-s-SSLEAY-OPENSSL.patch b/curl/0002-vtls-s-SSLEAY-OPENSSL.patch deleted file mode 100644 index 386dfe1..0000000 --- a/curl/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/Pkgfile b/curl/Pkgfile index 0813ba1..cdebab0 100644 --- a/curl/Pkgfile +++ b/curl/Pkgfile @@ -4,13 +4,12 @@ # Depends on: openssl, zlib name=curl -version=7.52.1 -release=2 -source=(http://curl.haxx.se/download/$name-$version.tar.lzma 0002-vtls-s-SSLEAY-OPENSSL.patch) +version=7.53.0 +release=1 +source=(http://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 \ --enable-ipv6 \ --without-libidn \