diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-04-23 14:54:51 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-04-23 14:54:51 +0200 |
commit | d44ffc533826532f1d874d7cba55a204598927c1 (patch) | |
tree | 9acf39ae3e702db29a9086e825870ed6311aa733 /pkgs/tools/networking/curl | |
parent | cddad771c5c02ad0c226290ca3ad8475c258428f (diff) | |
download | nixlib-d44ffc533826532f1d874d7cba55a204598927c1.tar nixlib-d44ffc533826532f1d874d7cba55a204598927c1.tar.gz nixlib-d44ffc533826532f1d874d7cba55a204598927c1.tar.bz2 nixlib-d44ffc533826532f1d874d7cba55a204598927c1.tar.lz nixlib-d44ffc533826532f1d874d7cba55a204598927c1.tar.xz nixlib-d44ffc533826532f1d874d7cba55a204598927c1.tar.zst nixlib-d44ffc533826532f1d874d7cba55a204598927c1.zip |
curl: Update to 7.30.0
CVE-2013-1944
Diffstat (limited to 'pkgs/tools/networking/curl')
-rw-r--r-- | pkgs/tools/networking/curl/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/networking/curl/fix-curl-multi-cleanup.patch | 32 |
2 files changed, 2 insertions, 36 deletions
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 0f44c67e01cd..eb93c9ef4f66 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -10,11 +10,11 @@ assert sslSupport -> openssl != null; assert scpSupport -> libssh2 != null; stdenv.mkDerivation rec { - name = "curl-7.29.0"; + name = "curl-7.30.0"; src = fetchurl { url = "http://curl.haxx.se/download/${name}.tar.bz2"; - sha256 = "0bw3sclhjqb2zwgcp6njjpaca62rwlj2mrw2r9wic47sqsxfhy4x"; + sha256 = "04dgm9aqvplsx43n8xin5rkr8mwmc6mdd1gcp80jda5yhw1l273b"; }; # Zlib and OpenSSL must be propagated because `libcurl.la' contains @@ -55,8 +55,6 @@ stdenv.mkDerivation rec { inherit sslSupport openssl; }; - patches = [ ./fix-curl-multi-cleanup.patch ]; - preConfigure = '' sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure ''; diff --git a/pkgs/tools/networking/curl/fix-curl-multi-cleanup.patch b/pkgs/tools/networking/curl/fix-curl-multi-cleanup.patch deleted file mode 100644 index f6e42040cb8e..000000000000 --- a/pkgs/tools/networking/curl/fix-curl-multi-cleanup.patch +++ /dev/null @@ -1,32 +0,0 @@ -commit 249c981407b8c52edf2b0833a78cd3d3d8bd2823 -Author: Shea Levy <shea@shealevy.com> -Date: Sun Feb 10 13:27:10 2013 -0500 - - curl_multi_cleanup: Don't try to cleanup the closure_handle if it is NULL. - - Without this, curl_multi_cleanup(curl_multi_init()) segfaults. - - Signed-off-by: Shea Levy <shea@shealevy.com> - -diff --git a/lib/multi.c b/lib/multi.c -index fa0afb9..5b9d0bb 100644 ---- a/lib/multi.c -+++ b/lib/multi.c -@@ -1773,11 +1773,13 @@ CURLMcode curl_multi_cleanup(CURLM *multi_handle) - /* Close all the connections in the connection cache */ - close_all_connections(multi); - -- multi->closure_handle->dns.hostcache = multi->hostcache; -- Curl_hostcache_clean(multi->closure_handle); -+ if (multi->closure_handle) { -+ multi->closure_handle->dns.hostcache = multi->hostcache; -+ Curl_hostcache_clean(multi->closure_handle); - -- Curl_close(multi->closure_handle); -- multi->closure_handle = NULL; -+ Curl_close(multi->closure_handle); -+ multi->closure_handle = NULL; -+ } - - Curl_hash_destroy(multi->sockhash); - multi->sockhash = NULL; |