summary refs log tree commit diff
path: root/pkgs/tools/graphics/exif
diff options
context:
space:
mode:
authorRobert Scott <code@humanleg.org.uk>2021-06-12 17:10:53 +0100
committerRobert Scott <code@humanleg.org.uk>2021-06-12 17:10:53 +0100
commit764a102f35757e8916039f4ed3e88ba35d7a2195 (patch)
treee414e30f62ea13818e0111a7d1582f26faff0b85 /pkgs/tools/graphics/exif
parent0c6186fc7839a155e04da8fab13dbd5ca0da1bf5 (diff)
downloadnixpkgs-764a102f35757e8916039f4ed3e88ba35d7a2195.tar
nixpkgs-764a102f35757e8916039f4ed3e88ba35d7a2195.tar.gz
nixpkgs-764a102f35757e8916039f4ed3e88ba35d7a2195.tar.bz2
nixpkgs-764a102f35757e8916039f4ed3e88ba35d7a2195.tar.lz
nixpkgs-764a102f35757e8916039f4ed3e88ba35d7a2195.tar.xz
nixpkgs-764a102f35757e8916039f4ed3e88ba35d7a2195.tar.zst
nixpkgs-764a102f35757e8916039f4ed3e88ba35d7a2195.zip
exif: add patches for CVE-2021-27815
Diffstat (limited to 'pkgs/tools/graphics/exif')
-rw-r--r--pkgs/tools/graphics/exif/default.nix24
1 files changed, 23 insertions, 1 deletions
diff --git a/pkgs/tools/graphics/exif/default.nix b/pkgs/tools/graphics/exif/default.nix
index 130e2d96124..f07f3d05541 100644
--- a/pkgs/tools/graphics/exif/default.nix
+++ b/pkgs/tools/graphics/exif/default.nix
@@ -1,4 +1,13 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libexif, popt, libintl }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchpatch
+, autoreconfHook
+, pkg-config
+, libexif
+, popt
+, libintl
+}:
 
 stdenv.mkDerivation rec {
   pname = "exif";
@@ -11,6 +20,19 @@ stdenv.mkDerivation rec {
     sha256 = "1xlb1gdwxm3rmw7vlrynhvjp9dkwmvw23mxisdbdmma7ah2nda3i";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "CVE-2021-27815.part-1.patch";
+      url = "https://github.com/libexif/exif/commit/f6334d9d32437ef13dc902f0a88a2be0063d9d1c.patch";
+      sha256 = "0mfx7l8w3w1c2mn5h5d6s7gdfyd91wnml8v0f19v5sdn70hx5aa4";
+    })
+    (fetchpatch {
+      name = "CVE-2021-27815.part-2.patch";
+      url = "https://github.com/libexif/exif/commit/eb84b0e3c5f2a86013b6fcfb800d187896a648fa.patch";
+      sha256 = "11lyvy20maisiyhxgxvm85v5l5ba7p0bpd4m0g4ryli32mrwwy0l";
+    })
+  ];
+
   nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ libexif popt libintl ];