summary refs log tree commit diff
diff options
context:
space:
mode:
authorsymphorien <symphorien@users.noreply.github.com>2018-09-28 22:15:53 +0000
committerxeji <36407913+xeji@users.noreply.github.com>2018-09-29 00:15:53 +0200
commite502c72773e559a9453086d48943e64074406094 (patch)
treed0e9d4e976694b906346008b96e3f1e45777bc54
parent7ecc7c922078c41c9d97177ea13d9cef747dd6d2 (diff)
downloadnixlib-e502c72773e559a9453086d48943e64074406094.tar
nixlib-e502c72773e559a9453086d48943e64074406094.tar.gz
nixlib-e502c72773e559a9453086d48943e64074406094.tar.bz2
nixlib-e502c72773e559a9453086d48943e64074406094.tar.lz
nixlib-e502c72773e559a9453086d48943e64074406094.tar.xz
nixlib-e502c72773e559a9453086d48943e64074406094.tar.zst
nixlib-e502c72773e559a9453086d48943e64074406094.zip
exempi: patch CVE-2018-12648, enable tests on linux (#47496)
-rw-r--r--pkgs/development/libraries/exempi/default.nix15
1 files changed, 14 insertions, 1 deletions
diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix
index ac2c21d4cf0e..3bc5270f0537 100644
--- a/pkgs/development/libraries/exempi/default.nix
+++ b/pkgs/development/libraries/exempi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, expat, zlib, boost, libiconv, darwin }:
+{ stdenv, fetchurl, fetchpatch, expat, zlib, boost, libiconv, darwin }:
 
 stdenv.mkDerivation rec {
   name = "exempi-2.4.5";
@@ -8,6 +8,17 @@ stdenv.mkDerivation rec {
     sha256 = "07i29xmg8bqriviaf4vi1mwha4lrw85kfla29cfym14fp3z8aqa0";
   };
 
+  patches = [
+    # CVE-2018-12648
+    # https://gitlab.freedesktop.org/libopenraw/exempi/issues/9
+    # remove with exempi > 2.4.5
+    (fetchpatch {
+      name = "CVE-2018-12648.patch";
+      url = https://gitlab.freedesktop.org/libopenraw/exempi/commit/8ed2f034705fd2d032c81383eee8208fd4eee0ac.patch;
+      sha256 = "1nh8irk5p26868875wq5n8g92xp4crfb8fdd8gyna76ldyzqqx9q";
+    })
+  ];
+
   configureFlags = [
     "--with-boost=${boost.dev}"
   ];
@@ -15,6 +26,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ expat zlib boost ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.CoreServices ];
 
+  doCheck = stdenv.isLinux;
+
   meta = with stdenv.lib; {
     homepage = https://libopenraw.freedesktop.org/wiki/Exempi/;
     platforms = platforms.linux ++ platforms.darwin;