diff options
| author | Robert Scott <code@humanleg.org.uk> | 2022-05-30 01:18:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-30 01:18:30 +0100 |
| commit | 1a5e48b6b03ca4b4ec31bbad69363228c1c5d662 (patch) | |
| tree | 02c09dad1b92e905831fdf536b35244382df4542 | |
| parent | Merge staging-next-21.11 into staging-21.11 (diff) | |
| parent | libtiff: add patches for CVE-2022-1354 & CVE-2022-1355 (diff) | |
| download | nixpkgs-1a5e48b6b03ca4b4ec31bbad69363228c1c5d662.tar.gz | |
Merge pull request #175143 from NixOS/backport-173327-to-staging-21.11
[Backport staging-21.11] libtiff: add patches for CVE-2022-1354 & CVE-2022-1355
| -rw-r--r-- | pkgs/development/libraries/libtiff/default.nix | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index c772dbddf6d7..de827a0f2c0e 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -80,6 +80,16 @@ stdenv.mkDerivation rec { url = "https://gitlab.com/libtiff/libtiff/-/commit/a95b799f65064e4ba2e2dfc206808f86faf93e85.patch"; sha256 = "0i61kkjaixdn2p933lpma9s6i0772vhxjxxcwyqagw96lmszrcm7"; }) + (fetchpatch { + name = "CVE-2022-1354.patch"; + url = "https://gitlab.com/libtiff/libtiff/-/commit/87f580f39011109b3bb5f6eca13fac543a542798.patch"; + sha256 = "0171c662xiv3295x4wsq6qq0v90js51j54vsl7wm043kjkrp1fsb"; + }) + (fetchpatch { + name = "CVE-2022-1355.patch"; + url = "https://gitlab.com/libtiff/libtiff/-/commit/c1ae29f9ebacd29b7c3e0c7db671af7db3584bc2.patch"; + sha256 = "1y75c72s41pl39d5zr5pmkiyfrancllv8fbl10zvc67pg3qjq4v8"; + }) ]; outputs = [ "bin" "dev" "dev_private" "out" "man" "doc" ]; |