From b44bed5568c7980276f4faaec5367d65aeb0a5e1 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 10 Aug 2017 02:04:02 +0200 Subject: [PATCH] curl: 7.54.1 -> 7.55.0 Fixes #28073. Fixes CVE-2017-1000101, CVE-2017-1000100, CVE-2017-1000099. --- pkgs/tools/networking/curl/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index daf5a19b01c..c9b70ee0e64 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -21,11 +21,11 @@ assert scpSupport -> libssh2 != null; assert c-aresSupport -> c-ares != null; stdenv.mkDerivation rec { - name = "curl-7.54.1"; + name = "curl-7.55.0"; src = fetchurl { url = "http://curl.haxx.se/download/${name}.tar.bz2"; - sha256 = "1815iz5a7qghipjcl7s97hk4jqh4f3kqc487xi20rvh1s3r4vz7x"; + sha256 = "1cg5h0klsx887qd4wpkk5bpkbw1bfc4q7adsrai71zhmdzn6j7dg"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; @@ -72,6 +72,10 @@ stdenv.mkDerivation rec { CXXCPP = "g++ -E"; postInstall = '' + pushd docs/libcurl + make install + popd + moveToOutput bin/curl-config "$dev" sed '/^dependency_libs/s|${libssh2.dev}|${libssh2.out}|' -i "$out"/lib/*.la '' + stdenv.lib.optionalString gnutlsSupport ''