about summary refs log tree commit diff
diff options
context:
space:
mode:
authorChristian Kauhaus <kc@flyingcircus.io>2019-10-27 18:07:00 +0100
committerFrederik Rietdijk <freddyrietdijk@fridh.nl>2019-11-03 10:30:17 +0100
commit9802b19e596500c62e532a9fd81a29c5ef7b76f6 (patch)
tree12fac0fceb98bb91bb98d91ac63c110436933257
parent76b16d05e60bd29a06f7cc0721efdc7a56017bf2 (diff)
downloadnixlib-9802b19e596500c62e532a9fd81a29c5ef7b76f6.tar
nixlib-9802b19e596500c62e532a9fd81a29c5ef7b76f6.tar.gz
nixlib-9802b19e596500c62e532a9fd81a29c5ef7b76f6.tar.bz2
nixlib-9802b19e596500c62e532a9fd81a29c5ef7b76f6.tar.lz
nixlib-9802b19e596500c62e532a9fd81a29c5ef7b76f6.tar.xz
nixlib-9802b19e596500c62e532a9fd81a29c5ef7b76f6.tar.zst
nixlib-9802b19e596500c62e532a9fd81a29c5ef7b76f6.zip
ilmbase-2.3.0: patch CVE-2018-18443
-rw-r--r--pkgs/development/libraries/ilmbase/default.nix15
1 files changed, 13 insertions, 2 deletions
diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix
index 5cc0f7c1f46d..82d5583c55fc 100644
--- a/pkgs/development/libraries/ilmbase/default.nix
+++ b/pkgs/development/libraries/ilmbase/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, buildPackages, automake, autoconf, libtool, which }:
+{ stdenv, fetchurl, buildPackages, automake, autoconf, libtool, which,
+  fetchpatch }:
 
 stdenv.mkDerivation rec {
   pname = "ilmbase";
@@ -21,7 +22,17 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_LINK = [ "-pthread" ];
 
-  patches = [ ./bootstrap.patch ./cross.patch ];
+  patches = [
+    ./bootstrap.patch
+    ./cross.patch
+    (fetchpatch {
+      name = "CVE-2018-18443.patch";
+      url = "https://github.com/kdt3rd/openexr/commit/5fa930b82cff2db386c64ca512af19e60c14d32a.patch";
+      sha256 = "1j6xd0qkx99acc1szycxaj0wwp01yac67jz48hwc4fwwpz8blx4s";
+      stripLen = 1;
+      excludes = [ "CHANGES.md" ];
+    })
+  ];
 
   # fails 1 out of 1 tests with
   # "lt-ImathTest: testBoxAlgo.cpp:892: void {anonymous}::boxMatrixTransform(): Assertion `b21 == b2' failed"