about summary refs log tree commit diff
path: root/pkgs/tools/text/catdoc
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2017-08-01 09:27:59 +0200
committerFranz Pletz <fpletz@fnordicwalking.de>2017-08-01 10:26:19 +0200
commit5bfc47bbabf246390a6daf9555869903933294e0 (patch)
tree2e96eb3c51ad7344c63e6ce5ae85678a0f77ee2b /pkgs/tools/text/catdoc
parent3621bc76fd51e975960210548f0e3d2963bb379d (diff)
catdoc: add to patch fix CVE-2017-11110
Diffstat (limited to 'pkgs/tools/text/catdoc')
-rw-r--r--pkgs/tools/text/catdoc/default.nix9
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/tools/text/catdoc/default.nix b/pkgs/tools/text/catdoc/default.nix
index fb0309e753250..2a06b25b11daa 100644
--- a/pkgs/tools/text/catdoc/default.nix
+++ b/pkgs/tools/text/catdoc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, fetchpatch }:
 
 stdenv.mkDerivation rec {
   name = "catdoc-${version}";
@@ -9,6 +9,13 @@ stdenv.mkDerivation rec {
     sha256 = "514a84180352b6bf367c1d2499819dfa82b60d8c45777432fa643a5ed7d80796";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://anonscm.debian.org/git/collab-maint/catdoc.git/diff/debian/patches/05-CVE-2017-11110.patch?id=21dd5b29b11be04149587657dd90253f52dfef0b";
+      sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73";
+    })
+  ];
+
   configureFlags = "--disable-wordview";
 
   meta = with stdenv.lib; {