Skip to content

[20.09] libtiff: fix two security issues #116280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mweinelt merged 1 commit into from
Mar 20, 2021
Merged

[20.09] libtiff: fix two security issues #116280

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions pkgs/development/libraries/libtiff/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{ stdenv
, fetchurl
, fetchpatch

, pkgconfig

Expand All @@ -19,6 +20,32 @@ stdenv.mkDerivation rec {

outputs = [ "bin" "dev" "out" "man" "doc" ];

patches = [
# https://gitlab.com/libtiff/libtiff/-/merge_requests/160
(fetchpatch {
name = "CVE-2020-35523.1.patch";
url = "https://gitlab.com/libtiff/libtiff/-/commit/712fe9f5b9795c5a3e80f38db90dad11e6a8bb6a.patch";
sha256 = "1h4jrilnhc50qzjxljcm0471i4inwr790b1dzdf6qvwf7fqi6wky";
})
(fetchpatch {
name = "CVE-2020-35523.2.patch";
url = "https://gitlab.com/libtiff/libtiff/-/commit/c8d613ef497058fe653c467fc84c70a62a4a71b2.patch";
sha256 = "01rzwf5xk5mf3j362g74h9qc45cnmqr0c14w5xj3p8mk160cd74q";
})
# https://gitlab.com/libtiff/libtiff/-/merge_requests/159
(fetchpatch {
name = "CVE-2020-35524.1.patch";
url = "https://gitlab.com/libtiff/libtiff/-/commit/c6a12721b46f1a72974f91177890301730d7b330.patch";
sha256 = "1lac51lsvap6wzdg1rssnq2adrpxd3bqrsdm40qd88mpa0g3rsfb";
})
(fetchpatch {
name = "CVE-2020-35524.2.patch";
url = "https://gitlab.com/libtiff/libtiff/-/commit/d74f56e3b7ea55c8a18a03bc247cd5fd0ca288b2.patch";
sha256 = "0v559fpsgnmhzgjhsp7fkm3hwrfjv2042lrczd32c0yb9jbrqxvi";
})

];

nativeBuildInputs = [ pkgconfig ];

propagatedBuildInputs = [ zlib libjpeg xz ]; #TODO: opengl support (bogus configure detection)
Expand Down