diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-29 00:01:33 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-29 00:01:33 +0000 |
| commit | 4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc (patch) | |
| tree | 009d65e0b0351612af7de7970317a9890fdc1657 /pkgs/tools/graphics | |
| parent | 6fcda9f1ec27db14412a2103281b4b14f806066a (diff) | |
| parent | db809100db91e97c118a70c3879307afdbf1dbb7 (diff) | |
| download | nixpkgs-4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc.tar nixpkgs-4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc.tar.gz nixpkgs-4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc.tar.bz2 nixpkgs-4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc.tar.lz nixpkgs-4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc.tar.xz nixpkgs-4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc.tar.zst nixpkgs-4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/graphics')
| -rw-r--r-- | pkgs/tools/graphics/exif/default.nix | 24 |
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 ]; |