diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-11-16 18:26:13 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-11-16 18:31:37 +0100 |
| commit | 08cc1b8b5b6efdb5664f048e08d2c42deb77a21d (patch) | |
| tree | 5736c262f96a3471e005175100ae91cc165562e0 | |
| parent | Merge #73253: gdal: patch CVE-2019-17545 (diff) | |
| download | nixpkgs-08cc1b8b5b6efdb5664f048e08d2c42deb77a21d.tar.gz | |
Merge #72958: libexif: fix CVE-2018-20030
(cherry picked from commit 908f6240d89293dbcdc41758ac0b6f2c1a7107e8)
Fixes #57153.
| -rw-r--r-- | pkgs/development/libraries/libexif/default.nix | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/pkgs/development/libraries/libexif/default.nix b/pkgs/development/libraries/libexif/default.nix index 5a8f5126680e..833ccf5dca5d 100644 --- a/pkgs/development/libraries/libexif/default.nix +++ b/pkgs/development/libraries/libexif/default.nix @@ -9,21 +9,32 @@ stdenv.mkDerivation rec { }; patches = [ - (fetchpatch { - name = "CVE-2017-7544.patch"; - url = https://sourceforge.net/p/libexif/bugs/_discuss/thread/fc394c4b/489a/attachment/xx.pat; - sha256 = "1qgk8hgnxr8d63jsc4vljxz9yg33mbml280dq4a6050rmk9wq4la"; - }) + (fetchpatch { + name = "CVE-2017-7544.patch"; + url = "https://github.com/libexif/libexif/commit/c39acd1692023b26290778a02a9232c873f9d71a.patch"; + sha256 = "0xgx6ly2i4q05shb61mfx6njwf1yp347jkznm0ka4m85i41xm6sd"; + }) + (fetchpatch { + name = "CVE-2018-20030-1.patch"; + url = "https://github.com/libexif/libexif/commit/5d28011c40ec86cf52cffad541093d37c263898a.patch"; + sha256 = "1wv8s962wmbn2m2xypgirf12g6msrbplpsmd5bh86irfwhkcppj3"; + }) + (fetchpatch { + name = "CVE-2018-20030-2.patch"; + url = "https://github.com/libexif/libexif/commit/6aa11df549114ebda520dde4cdaea2f9357b2c89.patch"; + sha256 = "01aqvz63glwq6wg0wr7ykqqghb4abgq77ghvhizbzadg1k4h7drx"; + excludes = [ "NEWS" ]; + }) ]; - patchFlags = "-p0"; buildInputs = [ gettext ]; meta = { - homepage = http://libexif.sourceforge.net/; + homepage = https://libexif.github.io/; description = "A library to read and manipulate EXIF data in digital photographs"; license = stdenv.lib.licenses.lgpl21; platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.erictapen ]; }; } |