about summary refs log tree commit diff
path: root/pkgs/applications/misc
diff options
context:
space:
mode:
authorJoachim F <joachifm@users.noreply.github.com>2018-02-23 19:14:31 +0000
committerGitHub <noreply@github.com>2018-02-23 19:14:31 +0000
commitcda0f9fedef64f08fdd97ca81d48a5aaea047006 (patch)
treef00fb4cadfd4df6b4b4a7f4f16a804bc910fa203 /pkgs/applications/misc
parenta5521d159850dbd068fd679cbae5331c1143fedc (diff)
parent998b1ef13b876372b1779a1179affbd34c64f656 (diff)
Merge pull request #35414 from flokli/CVE-2018-6544
mupdf: apply patch for CVE-2018-6544
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r--pkgs/applications/misc/mupdf/default.nix5
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index 75d8463cf7f8d..6634f40122459 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -29,6 +29,11 @@ in stdenv.mkDerivation rec {
       url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/0001-mupdf-openjpeg.patch?h=packages/mupdf&id=a910cd33a2b311712f83710dc042fbe80c104306";
       sha256 = "05i9v2ia586jyjqdb7g68ss4vkfwgp6cwhagc8zzggsba83azyqk";
     })
+    (fetchpatch {
+      name = "CVE-2018-6544.patch";
+      url = "http://git.ghostscript.com/?p=mupdf.git;a=commitdiff_plain;h=b03def134988da8c800adac1a38a41a1f09a1d89;hp=26527eef77b3e51c2258c8e40845bfbc015e405d";
+      sha256 = "1rlmjibl73ls8xfpsz69axa3lw5l47vb0a1dsjqziszsld4lpj5i";
+    })
   ]
 
   # Use shared libraries to decrease size