diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-08-10 02:04:02 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-08-10 16:22:56 +0200 |
| commit | b44bed5568c7980276f4faaec5367d65aeb0a5e1 (patch) | |
| tree | 52db25198d55d685125ae43c7653ee03299bafa0 /pkgs | |
| parent | c3e8d491ff3dc966c40a7f56485dd589bef71c30 (diff) | |
| download | nixlib-b44bed5568c7980276f4faaec5367d65aeb0a5e1.tar nixlib-b44bed5568c7980276f4faaec5367d65aeb0a5e1.tar.gz nixlib-b44bed5568c7980276f4faaec5367d65aeb0a5e1.tar.bz2 nixlib-b44bed5568c7980276f4faaec5367d65aeb0a5e1.tar.lz nixlib-b44bed5568c7980276f4faaec5367d65aeb0a5e1.tar.xz nixlib-b44bed5568c7980276f4faaec5367d65aeb0a5e1.tar.zst nixlib-b44bed5568c7980276f4faaec5367d65aeb0a5e1.zip | |
curl: 7.54.1 -> 7.55.0
Fixes #28073. Fixes CVE-2017-1000101, CVE-2017-1000100, CVE-2017-1000099.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/networking/curl/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index daf5a19b01c2..c9b70ee0e64e 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 '' |