summary refs log tree commit diff
path: root/pkgs/development/libraries/libtiff
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2022-04-10 11:31:09 +0200
committerVladimír Čunát <v@cunat.cz>2022-04-10 11:31:09 +0200
commitebf62e1f1fc4554e447387dc222d944842b66570 (patch)
tree00111dc772cc1c0f48b478b4de26fbb2cc52f533 /pkgs/development/libraries/libtiff
parentbe1d810695f3419c16e3ad4ce85382f05d929039 (diff)
parent748dfdd1f58ee07395fbfd6689a360e3dd6dda5b (diff)
downloadnixpkgs-ebf62e1f1fc4554e447387dc222d944842b66570.tar
nixpkgs-ebf62e1f1fc4554e447387dc222d944842b66570.tar.gz
nixpkgs-ebf62e1f1fc4554e447387dc222d944842b66570.tar.bz2
nixpkgs-ebf62e1f1fc4554e447387dc222d944842b66570.tar.lz
nixpkgs-ebf62e1f1fc4554e447387dc222d944842b66570.tar.xz
nixpkgs-ebf62e1f1fc4554e447387dc222d944842b66570.tar.zst
nixpkgs-ebf62e1f1fc4554e447387dc222d944842b66570.zip
Merge #165872: libtiff: add patches for multiple CVEs
...into staging
Diffstat (limited to 'pkgs/development/libraries/libtiff')
-rw-r--r--pkgs/development/libraries/libtiff/default.nix30
1 files changed, 30 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index 19076527340..6b455d992b8 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -53,6 +53,36 @@ stdenv.mkDerivation rec {
       url = "https://gitlab.com/libtiff/libtiff/-/commit/561599c99f987dc32ae110370cfdd7df7975586b.patch";
       sha256 = "0ycirjjc1vigj03kwjb92n6jszsl9p17ccw5hry7lli9gxyyr0an";
     })
+    (fetchpatch {
+      name = "CVE-2022-0891.patch";
+      url = "https://gitlab.com/libtiff/libtiff/-/commit/46dc8fcd4d38c3b6f35ab28e532aee80e6f609d6.patch";
+      sha256 = "1zn2pgsmbrjx3g2bpdggvwwbp6i348mikwlx4ws482h2379vmyj1";
+    })
+    (fetchpatch {
+      name = "CVE-2022-0865.patch";
+      url = "https://gitlab.com/libtiff/libtiff/-/commit/5e18004500cda10d9074bdb6166b054e95b659ed.patch";
+      sha256 = "131b9ial6avl2agwk31wp2jkrx59955f4r0dikx1jdaywqb7zhd1";
+    })
+    (fetchpatch {
+      name = "CVE-2022-0924.patch";
+      url = "https://gitlab.com/libtiff/libtiff/-/commit/408976c44ef0aad975e0d1b6c6dc80d60f9dc665.patch";
+      sha256 = "1aqaynp74ijxr3rizvbyz23ncs71pbbcw5src1zv46473sy55s8p";
+    })
+    (fetchpatch {
+      name = "CVE-2022-0907.patch";
+      url = "https://gitlab.com/libtiff/libtiff/-/commit/f2b656e2e64adde07a6cffd5c8e96bd81a850fea.patch";
+      sha256 = "0nsplq671qx0f35qww9mx27raqp3nvslz8iv7f3hxdgldylmh2vs";
+    })
+    (fetchpatch {
+      name = "CVE-2022-0909.patch";
+      url = "https://gitlab.com/libtiff/libtiff/-/commit/f8d0f9aa1ba04c9ae3bfe869a18141a8b8117ad7.patch";
+      sha256 = "1plhk6ildl16bp0k3wvzfd4a97hqfqfbbn7vjinsaasf4v0x3q5j";
+    })
+    (fetchpatch {
+      name = "CVE-2022-0908.patch";
+      url = "https://gitlab.com/libtiff/libtiff/-/commit/a95b799f65064e4ba2e2dfc206808f86faf93e85.patch";
+      sha256 = "0i61kkjaixdn2p933lpma9s6i0772vhxjxxcwyqagw96lmszrcm7";
+    })
   ];
 
   postPatch = ''