pyrox.dev / nixpkgs
lol
fork atom

openjpeg: 2.3.1 -> 2.4.0

https://github.com/uclouvain/openjpeg/blob/v2.4.0/CHANGELOG.md

Fixes CVE-2020-15389, CVE-2020-27841, CVE-2020-27842, CVE-2020-27843, CVE-2020-27844, and CVE-2020-27845.

TredwellGit 6769eca5 8ec9d0c1

+6 -33
+5 -21
pkgs/development/libraries/openjpeg/2.x.nix
··· 1 1 { callPackage, fetchpatch, ... } @ args: 2 2 3 3 callPackage ./generic.nix (args // rec { 4 - version = "2.3.1"; 5 - branch = "2.3"; 4 + version = "2.4.0"; 5 + branch = "2.4"; 6 6 revision = "v${version}"; 7 - sha256 = "1dn98d2dfa1lqyxxmab6rrcv52dyhjr4g7i4xf2w54fqsx14ynrb"; 7 + sha256 = "143dvy5g6v6129lzvl0r8mrgva2fppkn0zl099qmi9yi9l9h7yyf"; 8 8 9 9 extraFlags = [ 10 10 "-DOPENJPEG_INSTALL_INCLUDE_DIR=${placeholder "dev"}/include/openjpeg-${branch}" ··· 14 14 patches = [ 15 15 ./fix-cmake-config-includedir.patch 16 16 (fetchpatch { 17 - url = "https://github.com/uclouvain/openjpeg/commit/21399f6b7d318fcdf4406d5e88723c4922202aa3.patch"; 18 - name = "CVE-2019-12973-1.patch"; 19 - sha256 = "161yvnfbzy2016qqapm0ywfgglgs1v8ljnk6fj8d2bwdh1cxxz8f"; 20 - }) 21 - (fetchpatch { 22 - url = "https://github.com/uclouvain/openjpeg/commit/3aef207f90e937d4931daf6d411e092f76d82e66.patch"; 23 - name = "CVE-2019-12973-2.patch"; 24 - sha256 = "1jkkfw13l7nx4hxdhc7z17f4vfgqcaf09zpl235kypbxx1ygc7vq"; 25 - }) 26 - (fetchpatch { 27 - url = "https://github.com/uclouvain/openjpeg/commit/024b8407392cb0b82b04b58ed256094ed5799e04.patch"; 28 - name = "CVE-2020-6851.patch"; 29 - sha256 = "1lfwlzqxb69cwzjp8v9lijz4c2qhf3b8m6sq1khipqlgrb3l58xw"; 30 - }) 31 - (fetchpatch { 32 - url = "https://github.com/uclouvain/openjpeg/commit/05f9b91e60debda0e83977e5e63b2e66486f7074.patch"; 33 - name = "CVE-2020-8112.patch"; 34 - sha256 = "16kykc8wbq9kx9w9kkf3i7snak82m184qrl9bpxvkjl7h0n9aw49"; 17 + url = "https://patch-diff.githubusercontent.com/raw/uclouvain/openjpeg/pull/1321.patch"; 18 + sha256 = "1cjpr76nf9g65nqkfnxnjzi3bv7ifbxpc74kxxibh58pzjlp6al8"; 35 19 }) 36 20 ]; 37 21 })
-11
pkgs/development/libraries/openjpeg/fix-cmake-config-includedir.patch
··· 1 - --- a/cmake/OpenJPEGConfig.cmake.in 2 - +++ b/cmake/OpenJPEGConfig.cmake.in 3 - @@ -32,7 +32,7 @@ 4 - set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@") 5 - file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}") 6 - 7 - - get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" ABSOLUTE) 8 - + get_filename_component(OPENJPEG_INCLUDE_DIRS "@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE) 9 - 10 - else() 11 - if(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake) 12 1 --- a/src/lib/openjp2/libopenjp2.pc.cmake.in 13 2 +++ b/src/lib/openjp2/libopenjp2.pc.cmake.in 14 3 @@ -3,7 +3,7 @@
+1 -1
pkgs/development/libraries/openjpeg/generic.nix
··· 76 76 77 77 meta = with stdenv.lib; { 78 78 description = "Open-source JPEG 2000 codec written in C language"; 79 - homepage = "http://www.openjpeg.org/"; 79 + homepage = "https://www.openjpeg.org/"; 80 80 license = licenses.bsd2; 81 81 maintainers = with maintainers; [ codyopel ]; 82 82 platforms = platforms.all;