summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorAndreas Rammhold <andreas@rammhold.de>2019-12-15 23:15:35 +0100
committerAndreas Rammhold <andreas@rammhold.de>2019-12-15 23:15:35 +0100
commitf23627cb12cef703ace198544920a90fdea376c4 (patch)
tree41a649298cdf8ad8c1dcc7acce8a19649745a6a7 /pkgs/tools
parentce549ddf2659af40a8c0221d41953f7624f9d255 (diff)
downloadnixpkgs-f23627cb12cef703ace198544920a90fdea376c4.tar
nixpkgs-f23627cb12cef703ace198544920a90fdea376c4.tar.gz
nixpkgs-f23627cb12cef703ace198544920a90fdea376c4.tar.bz2
nixpkgs-f23627cb12cef703ace198544920a90fdea376c4.tar.lz
nixpkgs-f23627cb12cef703ace198544920a90fdea376c4.tar.xz
nixpkgs-f23627cb12cef703ace198544920a90fdea376c4.tar.zst
nixpkgs-f23627cb12cef703ace198544920a90fdea376c4.zip
advancecomp: fix CVE-2019-9210
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/compression/advancecomp/default.nix17
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 ;