diff options
author | Gabriel Ebner <gebner@gebner.org> | 2019-08-21 14:49:03 +0200 |
---|---|---|
committer | Gabriel Ebner <gebner@gebner.org> | 2019-08-21 15:13:37 +0200 |
commit | ccebe4291104ec223fa0f43400831d61747d6e79 (patch) | |
tree | 8396b6b49a2cc597bd7b66958c8a18489ae44289 /pkgs/development/libraries/libheif | |
parent | 59d3b6ee8268112da4eea11c1d5b1e479095fffe (diff) |
libheif: 1.4.0 -> 1.5.0
Diffstat (limited to 'pkgs/development/libraries/libheif')
-rw-r--r-- | pkgs/development/libraries/libheif/1.4.0-CVE-2019-11471.patch | 15 | ||||
-rw-r--r-- | pkgs/development/libraries/libheif/default.nix | 6 |
2 files changed, 2 insertions, 19 deletions
diff --git a/pkgs/development/libraries/libheif/1.4.0-CVE-2019-11471.patch b/pkgs/development/libraries/libheif/1.4.0-CVE-2019-11471.patch deleted file mode 100644 index 2ea1b124ce7b8..0000000000000 --- a/pkgs/development/libraries/libheif/1.4.0-CVE-2019-11471.patch +++ /dev/null @@ -1,15 +0,0 @@ -Adapted from upstream commit 995a4283d8ed2d0d2c1ceb1a577b993df2f0e014 ---- a/libheif/heif_context.cc -+++ b/libheif/heif_context.cc -@@ -571,6 +571,11 @@ - image->set_is_alpha_channel_of(refs[0]); - - auto master_iter = m_all_images.find(refs[0]); -+ if (master_iter == m_all_images.end()) { -+ return Error(heif_error_Invalid_input, -+ heif_suberror_Nonexisting_item_referenced, -+ "Non-existing alpha image referenced"); -+ } - master_iter->second->set_alpha_channel(image); - } - diff --git a/pkgs/development/libraries/libheif/default.nix b/pkgs/development/libraries/libheif/default.nix index 7e1bb2daa9e14..02c4dd3348137 100644 --- a/pkgs/development/libraries/libheif/default.nix +++ b/pkgs/development/libraries/libheif/default.nix @@ -1,18 +1,16 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libde265, x265, libpng, libjpeg }: stdenv.mkDerivation rec { - version = "1.4.0"; pname = "libheif"; + version = "1.5.0"; src = fetchFromGitHub { owner = "strukturag"; repo = "libheif"; rev = "v${version}"; - sha256 = "0vbjknkb2ccmw3xh2j8ljz5sj9i8wv92iw7zghcc5wn64sk1xkk2"; + sha256 = "1nvfjmnha06689imm8v24nlc011814gc9xq3x54cnmqvh5gn98ah"; }; - patches = [ ./1.4.0-CVE-2019-11471.patch ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libde265 x265 libpng libjpeg ]; |