diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-02-22 18:11:05 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-02-22 18:11:05 +0100 |
| commit | ebf782829aa1d374d52fc33a65496a87059931ae (patch) | |
| tree | 8b07978e68c22413cb1c8d21ed0f0354860f5de0 /pkgs/tools | |
| parent | 145d3ea81c776f1598a1904ec7734fd5f8f6be36 (diff) | |
| parent | b1c6a9bfcc79586bddb41e2b27f95e0299973d25 (diff) | |
Merge #23063: curl: 7.52.1 -> 7.53.0
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/networking/curl/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/networking/curl/issue-1174.patch | 34 |
2 files changed, 3 insertions, 37 deletions
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index de841be3f052..48f8edf7c44c 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -21,14 +21,14 @@ assert scpSupport -> libssh2 != null; assert c-aresSupport -> c-ares != null; stdenv.mkDerivation rec { - name = "curl-7.52.1"; + name = "curl-7.53.0"; src = fetchurl { url = "http://curl.haxx.se/download/${name}.tar.bz2"; - sha256 = "16rqhyzlpnivifin8n7l2fr9ihay9v2nw2drsniinb6bcykqaqfi"; + sha256 = "008833dd9w4l2277q9r0bsq1vqmm0fr7qqyzvqlw5d47xy5mld5j"; }; - patches = [ ./issue-1174.patch ]; + patches = [ ]; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; diff --git a/pkgs/tools/networking/curl/issue-1174.patch b/pkgs/tools/networking/curl/issue-1174.patch deleted file mode 100644 index eceeef8b001b..000000000000 --- a/pkgs/tools/networking/curl/issue-1174.patch +++ /dev/null @@ -1,34 +0,0 @@ -commit a7b38c9dc98481e4a5fc37e51a8690337c674dfb -Author: Daniel Stenberg <daniel@haxx.se> -Date: Mon Dec 26 00:06:33 2016 +0100 - - 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 - -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) |