summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorAndreas Rammhold <andreas@rammhold.de>2018-02-23 22:25:37 +0100
committerAndreas Rammhold <andreas@rammhold.de>2018-02-23 22:25:37 +0100
commita6664d8192038c4dc2ad44169dbb76556fe71ac1 (patch)
treeeabff20a76889b958df35b024ce34bbd2587fb15 /pkgs
parent49b7fc390826f85e5d746fa4b66454e10862a410 (diff)
downloadnixlib-a6664d8192038c4dc2ad44169dbb76556fe71ac1.tar
nixlib-a6664d8192038c4dc2ad44169dbb76556fe71ac1.tar.gz
nixlib-a6664d8192038c4dc2ad44169dbb76556fe71ac1.tar.bz2
nixlib-a6664d8192038c4dc2ad44169dbb76556fe71ac1.tar.lz
nixlib-a6664d8192038c4dc2ad44169dbb76556fe71ac1.tar.xz
nixlib-a6664d8192038c4dc2ad44169dbb76556fe71ac1.tar.zst
nixlib-a6664d8192038c4dc2ad44169dbb76556fe71ac1.zip
mupdf: apply patch for CVE-2018-6544 (part 2)
This (hopefully) completes 998b1ef.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/misc/mupdf/default.nix7
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index 6634f4012245..5326f948d894 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -30,10 +30,15 @@ in stdenv.mkDerivation rec {
       sha256 = "05i9v2ia586jyjqdb7g68ss4vkfwgp6cwhagc8zzggsba83azyqk";
     })
     (fetchpatch {
-      name = "CVE-2018-6544.patch";
+      name = "CVE-2018-6544.1.patch";
       url = "http://git.ghostscript.com/?p=mupdf.git;a=commitdiff_plain;h=b03def134988da8c800adac1a38a41a1f09a1d89;hp=26527eef77b3e51c2258c8e40845bfbc015e405d";
       sha256 = "1rlmjibl73ls8xfpsz69axa3lw5l47vb0a1dsjqziszsld4lpj5i";
     })
+    (fetchpatch {
+      name = "CVE-2018-6544.2.patch";
+      url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=26527eef77b3e51c2258c8e40845bfbc015e405d;hp=ab98356f959c7a6e94b1ec10f78dd2c33ed3f3e7";
+      sha256 = "1brcc029s5zmd6ya0d9qk3mh9qwx5g6vhsf1j8h879092sya5627";
+    })
   ]
 
   # Use shared libraries to decrease size