From d1d8b6d8a836ad65581534e9ef97e901dc808696 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Mon, 25 Aug 2025 12:29:40 +0200 Subject: [PATCH] libtiff: apply patch CVE-2024-13978 and CVE-2025-9165 --- pkgs/by-name/li/libtiff/package.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/by-name/li/libtiff/package.nix b/pkgs/by-name/li/libtiff/package.nix index 33bfd037d577..497b4ddea8e3 100644 --- a/pkgs/by-name/li/libtiff/package.nix +++ b/pkgs/by-name/li/libtiff/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitLab, + fetchpatch, nix-update-script, cmake, @@ -51,6 +52,21 @@ stdenv.mkDerivation (finalAttrs: { # libc++abi 11 has an `#include `, this picks up files name # `version` in the project's include paths ./rename-version.patch + (fetchpatch { + name = "CVE-2024-13978_1.patch"; + url = "https://gitlab.com/libtiff/libtiff/-/commit/7be20ccaab97455f192de0ac561ceda7cd9e12d1.patch"; + hash = "sha256-cpsQyIvyP6LkGeQTlLX73iNd1AcPkvZ6Xqfns7G3JBc="; + }) + (fetchpatch { + name = "CVE-2024-13978_2.patch"; + url = "https://gitlab.com/libtiff/libtiff/-/commit/2ebfffb0e8836bfb1cd7d85c059cd285c59761a4.patch"; + hash = "sha256-cZlLTeB7/nvylf5SLzKF7g91aBERhZxpV5fmWEJVrX4="; + }) + (fetchpatch { + name = "CVE-2025-9165.patch"; + url = "https://gitlab.com/libtiff/libtiff/-/commit/ed141286a37f6e5ddafb5069347ff5d587e7a4e0.patch"; + hash = "sha256-DIsk8trbHMMTrj6jP5Ae8ciRjHV4CPHdWCN+VbeFnFo="; + }) ]; postPatch = ''