diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-10-24 21:34:41 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-10-24 21:40:28 +0200 |
| commit | c1a3522189dfdb5e2e6400d12e5518a644f97ed2 (patch) | |
| tree | d58a5eaeef0e20b51ac46c7f0247f33f4c3c7cf3 | |
| parent | curl: 7.56.0 -> 7.56.1 (diff) | |
| download | nixpkgs-c1a3522189dfdb5e2e6400d12e5518a644f97ed2.tar.gz | |
Merge #30729: freeimage: apply security patches
(cherry picked from commit dc240d20696aeb26198aa744bc99cde5bc5cf69b)
They're relatively simple patches, used by Debian.
| -rw-r--r-- | pkgs/development/libraries/freeimage/default.nix | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix index 6ee7670fc296..157f9f3936ec 100644 --- a/pkgs/development/libraries/freeimage/default.nix +++ b/pkgs/development/libraries/freeimage/default.nix @@ -8,6 +8,19 @@ stdenv.mkDerivation { sha256 = "12bz57asdcfsz3zr9i9nska0fb6h3z2aizy412qjqkixkginbz7v"; }; + patches = let + patchURL = https://anonscm.debian.org/cgit/debian-science/packages/freeimage.git/plain/debian/patches; + in [ + (fetchurl { + url = patchURL + "/Fix-CVE-2015-0852.patch"; + sha256 = "1vxdck4i5qi5j6i3cjja0gfy79mmbf0lq2qdrnqdsl4kclbvw2c8"; + }) + (fetchurl { + url = patchURL + "/Fix-CVE-2016-5684.patch"; + sha256 = "14ffgqbnwg28r6sjvm3z89zbnnm9ghbc81hdhrzxlyk3vwvd6cw3"; + }) + ]; + buildInputs = [ unzip ] ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools; prePatch = if stdenv.isDarwin |