summary refs log tree commit diff
path: root/pkgs/tools/security
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2017-11-22 08:20:03 +0000
committerGitHub <noreply@github.com>2017-11-22 08:20:03 +0000
commit98d12e681c94efbaee7fe99691cd2284a9ffbcab (patch)
tree244da012fa3a9373a980a969b1fb9f76486ac945 /pkgs/tools/security
parent565d92a10ffa84da57e056fabcf295a4e58e4b02 (diff)
parentf01acd4cd57e1c9fc30323edf193b72db391eb0b (diff)
downloadnixlib-98d12e681c94efbaee7fe99691cd2284a9ffbcab.tar
nixlib-98d12e681c94efbaee7fe99691cd2284a9ffbcab.tar.gz
nixlib-98d12e681c94efbaee7fe99691cd2284a9ffbcab.tar.bz2
nixlib-98d12e681c94efbaee7fe99691cd2284a9ffbcab.tar.lz
nixlib-98d12e681c94efbaee7fe99691cd2284a9ffbcab.tar.xz
nixlib-98d12e681c94efbaee7fe99691cd2284a9ffbcab.tar.zst
nixlib-98d12e681c94efbaee7fe99691cd2284a9ffbcab.zip
Merge pull request #31909 from andir/clamav
clamav: apply patch for CVE-2017-6420
Diffstat (limited to 'pkgs/tools/security')
-rw-r--r--pkgs/tools/security/clamav/default.nix10
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix
index 83a2a1fd85ea..506d6fc3fce8 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/pkgs/tools/security/clamav/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl
+{ stdenv, fetchurl, fetchpatch, zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl
 , libmilter, pcre }:
 
 stdenv.mkDerivation rec {
@@ -10,6 +10,14 @@ stdenv.mkDerivation rec {
     sha256 = "0yh2q318bnmf2152g2h1yvzgqbswn0wvbzb8p4kf7v057shxcyqn";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "CVE-2017-6420.patch";
+      url = "https://github.com/vrtadmin/clamav-devel/commit/dfc00cd3301a42b571454b51a6102eecf58407bc.patch";
+      sha256 = "08w3p3a4pmi0cmcmyxkagsbn3g0jgx1jqlc34pn141x0qzrlqr60";
+    })
+  ];
+
   # don't install sample config files into the absolute sysconfdir folder
   postPatch = ''
     substituteInPlace Makefile.in --replace ' etc ' ' '