summary refs log tree commit diff
diff options
context:
space:
mode:
authorGraham Christensen <graham@grahamc.com>2017-02-07 08:28:52 -0500
committerGitHub <noreply@github.com>2017-02-07 08:28:52 -0500
commit34157f7a046bf0aafd9daea0fc6c46d33e53239e (patch)
tree05b38d20dd444e34bd39b25ac875620ffc2ea7b1
parent83865b2c6cba71c15336ab9aefa3b6bed6986abe (diff)
parent83f83ca4345be7221dd63e4451e3cf5ef1374117 (diff)
downloadnixlib-34157f7a046bf0aafd9daea0fc6c46d33e53239e.tar
nixlib-34157f7a046bf0aafd9daea0fc6c46d33e53239e.tar.gz
nixlib-34157f7a046bf0aafd9daea0fc6c46d33e53239e.tar.bz2
nixlib-34157f7a046bf0aafd9daea0fc6c46d33e53239e.tar.lz
nixlib-34157f7a046bf0aafd9daea0fc6c46d33e53239e.tar.xz
nixlib-34157f7a046bf0aafd9daea0fc6c46d33e53239e.tar.zst
nixlib-34157f7a046bf0aafd9daea0fc6c46d33e53239e.zip
Merge pull request #22509 from joachifm/jbig2dec
jbig2dec: update & security patch
-rw-r--r--pkgs/development/libraries/jbig2dec/default.nix18
1 files changed, 13 insertions, 5 deletions
diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix
index 123379d788dc..45df4876be1f 100644
--- a/pkgs/development/libraries/jbig2dec/default.nix
+++ b/pkgs/development/libraries/jbig2dec/default.nix
@@ -1,15 +1,23 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, fetchpatch }:
 
 stdenv.mkDerivation rec {
-  name = "jbig2dec-0.11";
+  name = "jbig2dec-0.13";
 
   src = fetchurl {
-    url = "mirror://sourceforge/jbig2dec/${name}.tar.xz";
-    sha256 = "1xddc30garsg5j8p348cz5l8vn8j7723c0sykv0kc1w5ihaghsq1";
+    url = "http://downloads.ghostscript.com/public/jbig2dec/${name}.tar.gz";
+    sha256 = "04akiwab8iy5iy34razcvh9mcja9wy737civ3sbjxk4j143s1b2s";
   };
 
+  patches =
+    [ (fetchpatch {
+        url = "http://git.ghostscript.com/?p=jbig2dec.git;a=patch;h=e698d5c11d27212aa1098bc5b1673a3378563092";
+        sha256 = "1fc8xm1z98xj2zkcl0zj7dpjjsbz3vn61b59jnkhcyzy3iiczv7f";
+        name = "CVE-2016-9601.patch";
+      })
+    ];
+
   meta = {
-    homepage = http://jbig2dec.sourceforge.net/;
+    homepage = https://www.ghostscript.com/jbig2dec.html;
     description = "Decoder implementation of the JBIG2 image compression format";
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.unix;