diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2019-12-15 22:53:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-15 22:53:36 +0000 |
| commit | 5f21b4b896f9c70bf871840a434cfd75b2fdec33 (patch) | |
| tree | b5bfc26c168056391ddf870f420966d68cc9ab59 /pkgs/tools | |
| parent | 05c6009f5640cf99caa75d6fa4cdf48704a3e19d (diff) | |
| parent | f23627cb12cef703ace198544920a90fdea376c4 (diff) | |
| download | nixpkgs-5f21b4b896f9c70bf871840a434cfd75b2fdec33.tar nixpkgs-5f21b4b896f9c70bf871840a434cfd75b2fdec33.tar.gz nixpkgs-5f21b4b896f9c70bf871840a434cfd75b2fdec33.tar.bz2 nixpkgs-5f21b4b896f9c70bf871840a434cfd75b2fdec33.tar.lz nixpkgs-5f21b4b896f9c70bf871840a434cfd75b2fdec33.tar.xz nixpkgs-5f21b4b896f9c70bf871840a434cfd75b2fdec33.tar.zst nixpkgs-5f21b4b896f9c70bf871840a434cfd75b2fdec33.zip | |
Merge pull request #75723 from andir/advancecomp
advancecomp: fix CVE-2019-9210
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/compression/advancecomp/default.nix | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/pkgs/tools/compression/advancecomp/default.nix b/pkgs/tools/compression/advancecomp/default.nix index 8bee8059fe2..46c8f4338c6 100644 --- a/pkgs/tools/compression/advancecomp/default.nix +++ b/pkgs/tools/compression/advancecomp/default.nix @@ -1,5 +1,9 @@ -{ stdenv, fetchFromGitHub -, autoreconfHook, zlib }: +{ stdenv +, fetchFromGitHub +, fetchpatch +, autoreconfHook +, zlib +}: stdenv.mkDerivation rec { pname = "advancecomp"; @@ -15,6 +19,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ zlib ]; + patches = [ + (fetchpatch { + name = "CVE-2019-9210.patch"; + url = "https://github.com/amadvance/advancecomp/commit/fcf71a89265c78fc26243574dda3a872574a5c02.patch"; + sha256 = "0cdv9g87c1y8zwhqkd9ba2zjw4slcvg7yzcqv43idvnwb5fl29n7"; + excludes = [ "doc/history.d" ]; + }) + ]; + meta = with stdenv.lib; { description = ''A set of tools to optimize deflate-compressed files''; license = licenses.gpl3 ; |