about summary refs log tree commit diff
path: root/pkgs/applications/misc/mupdf
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2017-02-01 18:57:11 +0100
committerMichael Raskin <7c6f434c@mail.ru>2017-02-01 19:28:44 +0100
commitea5c83daa207148b5eba8d395a673f4b56da7ed4 (patch)
treee2db71128e31f91dba8dfb1f969117b6d078c3ba /pkgs/applications/misc/mupdf
parent6ba35336f03381284e49b6a025e6008a01f7e77f (diff)
downloadnixlib-ea5c83daa207148b5eba8d395a673f4b56da7ed4.tar
nixlib-ea5c83daa207148b5eba8d395a673f4b56da7ed4.tar.gz
nixlib-ea5c83daa207148b5eba8d395a673f4b56da7ed4.tar.bz2
nixlib-ea5c83daa207148b5eba8d395a673f4b56da7ed4.tar.lz
nixlib-ea5c83daa207148b5eba8d395a673f4b56da7ed4.tar.xz
nixlib-ea5c83daa207148b5eba8d395a673f4b56da7ed4.tar.zst
nixlib-ea5c83daa207148b5eba8d395a673f4b56da7ed4.zip
mupdf: 1.9a -> 1.10a
Diffstat (limited to 'pkgs/applications/misc/mupdf')
-rw-r--r--pkgs/applications/misc/mupdf/default.nix19
1 files changed, 4 insertions, 15 deletions
diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index e1926ce386f7..ba2313fc7b5a 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -3,31 +3,20 @@
 , libX11, libXcursor, libXrandr, libXinerama, libXext, harfbuzz, mesa }:
 
 stdenv.mkDerivation rec {
-  version = "1.9a";
+  version = "1.10a";
   name = "mupdf-${version}";
 
   src = fetchurl {
     url = "http://mupdf.com/downloads/archive/${name}-source.tar.gz";
-    sha256 = "1k64pdapyj8a336jw3j61fhn0rp4q6az7d0dqp9r5n3d9rgwa5c0";
+    sha256 = "0dm8wcs8i29aibzkqkrn8kcnk4q0kd1v66pg48h5c3qqp4v1zk5a";
   };
 
   patches = [
-    # http://www.openwall.com/lists/oss-security/2016/08/03/2
-    (fetchpatch {
-      name = "mupdf-fix-CVE-2016-6525.patch";
-      url = "http://git.ghostscript.com/?p=mupdf.git;a=commitdiff_plain;h=39b0f07dd960f34e7e6bf230ffc3d87c41ef0f2e;hp=fa1936405b6a84e5c9bb440912c23d532772f958";
-      sha256 = "1g9fkd1f5rx1z043vr9dj4934qf7i4nkvbwjc61my9azjrrc3jv7";
-    })
-    (fetchpatch {
-      name = "mupdf-696941-fix-use-after-free.patch";
-      url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=fa1936405b6a84e5c9bb440912c23d532772f958";
-      sha256 = "02j9b6my1h3rb0sz9yp6gi7c4ldi3mz0z9s5i8g9cl0arxyzys5h";
-    })
     # Compatibility with new openjpeg
     (fetchpatch {
       name = "mupdf-1.9a-openjpeg-2.1.1.patch";
-      url = "https://git.archlinux.org/svntogit/community.git/plain/mupdf/trunk/0001-mupdf-openjpeg.patch?id=9083dac2a398bfe694d31a0c6a0a839c5a756e53";
-      sha256 = "14ndgy3w1sl25km9bcc2zfcxrcihqjw1sdzkpcw5g1mi7gcgxp3g";
+      url = "https://git.archlinux.org/svntogit/community.git/plain/mupdf/trunk/0001-mupdf-openjpeg.patch?id=5a28ad0a8999a9234aa7848096041992cc988099";
+      sha256 = "1i24qr4xagyapx4bijjfksj4g3bxz8vs5c2mn61nkm29c63knp75";
     })
   ];