mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 06:31:02 +00:00
Merge: openexr: upstream security patch
This commit is contained in:
commit
a2799407e8
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, zlib, ilmbase }:
|
||||
{ lib, stdenv, fetchurl, fetchpatch, autoconf, automake, libtool, pkgconfig, zlib, ilmbase }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "openexr-${lib.getVersion ilmbase}";
|
||||
|
@ -8,6 +8,18 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0ca2j526n4wlamrxb85y2jrgcv0gf21b3a19rr0gh4rjqkv1581n";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./bootstrap.patch
|
||||
(fetchpatch {
|
||||
# https://github.com/openexr/openexr/issues/232
|
||||
# https://github.com/openexr/openexr/issues/238
|
||||
name = "CVE-2017-12596.patch";
|
||||
url = "https://github.com/openexr/openexr/commit/f09f5f26c1924.patch";
|
||||
sha256 = "1d014da7c8cgbak5rgr4mq6wzm7kwznb921pr7nlb52vlfvqp4rs";
|
||||
stripLen = 1;
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [ "bin" "dev" "out" "doc" ];
|
||||
|
||||
preConfigure = ''
|
||||
|
@ -20,8 +32,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
patches = [ ./bootstrap.patch ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://www.openexr.com/;
|
||||
license = licenses.bsd3;
|
||||
|
|
Loading…
Reference in a new issue