diff options
| author | Piotr Bogdan <ppbogdan@gmail.com> | 2017-10-10 18:34:30 +0100 |
|---|---|---|
| committer | Piotr Bogdan <ppbogdan@gmail.com> | 2017-10-23 16:13:49 +0100 |
| commit | a3dde9d13dab999352d5eb4781fc4e768492f997 (patch) | |
| tree | 2437cb4533a336785ff92c6a84d9d08960626f53 /pkgs/development/libraries/freeimage | |
| parent | 97c5dfc55efc6307a091ea70a03b1495c1f193fd (diff) | |
| download | nixpkgs-a3dde9d13dab999352d5eb4781fc4e768492f997.tar nixpkgs-a3dde9d13dab999352d5eb4781fc4e768492f997.tar.gz nixpkgs-a3dde9d13dab999352d5eb4781fc4e768492f997.tar.bz2 nixpkgs-a3dde9d13dab999352d5eb4781fc4e768492f997.tar.lz nixpkgs-a3dde9d13dab999352d5eb4781fc4e768492f997.tar.xz nixpkgs-a3dde9d13dab999352d5eb4781fc4e768492f997.tar.zst nixpkgs-a3dde9d13dab999352d5eb4781fc4e768492f997.zip | |
freeimage: fix CVE-2015-0852 & CVE-2016-5684
Diffstat (limited to 'pkgs/development/libraries/freeimage')
| -rw-r--r-- | pkgs/development/libraries/freeimage/default.nix | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix index 6ee7670fc29..a2f47da7aaf 100644 --- a/pkgs/development/libraries/freeimage/default.nix +++ b/pkgs/development/libraries/freeimage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, darwin }: +{ stdenv, fetchpatch, fetchurl, unzip, darwin }: stdenv.mkDerivation { name = "freeimage-3.17.0"; @@ -8,6 +8,17 @@ stdenv.mkDerivation { sha256 = "12bz57asdcfsz3zr9i9nska0fb6h3z2aizy412qjqkixkginbz7v"; }; + patches = [ + (fetchpatch { + url = "https://anonscm.debian.org/cgit/debian-science/packages/freeimage.git/plain/debian/patches/Fix-CVE-2015-0852.patch"; + sha256 = "0qkb96mvvhji75gz7dma3vj2b71smp96z3kl2ydj6skvnw6slnmc"; + }) + (fetchpatch { + url = "https://anonscm.debian.org/cgit/debian-science/packages/freeimage.git/plain/debian/patches/Fix-CVE-2016-5684.patch"; + sha256 = "18g5ckrvqfjcldis7zf7hmfl8b3mgnc6akd6x3cdq8c5j7l1y98f"; + }) + ]; + buildInputs = [ unzip ] ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools; prePatch = if stdenv.isDarwin |