BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

openjpeg: 2.3.0 -> 2.3.1

Browse source 
bug fixes, security fixes*

I /think/ we had patches for the mentioned CVE's,
but another pair of eyes is appreciated.
This commit is contained in:
Will Dietz 2019-04-06 11:03:39 -05:00 committed by Frederik Rietdijk
parent 99a2cefdde
commit 07540c0ca1
1 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/development/libraries/openjpeg/2.x.nix
View file

@ -1,10 +1,10 @@
{ callPackage, fetchpatch, ... } @ args: { callPackage, fetchpatch, ... } @ args:
callPackage ./generic.nix (args // rec { callPackage ./generic.nix (args // rec {
version = "2.3.0"; version = "2.3.1";
branch = "2.3"; branch = "2.3";
revision = "v${version}"; revision = "v${version}";
sha256 = "08plxrnfl33sn2vh5nwbsngyv6b1sfpplvx881crm1v1ai10m2lz"; sha256 = "1dn98d2dfa1lqyxxmab6rrcv52dyhjr4g7i4xf2w54fqsx14ynrb";
extraFlags = [ extraFlags = [
"-DOPENJPEG_INSTALL_INCLUDE_DIR=${placeholder "dev"}/include/openjpeg-${branch}" "-DOPENJPEG_INSTALL_INCLUDE_DIR=${placeholder "dev"}/include/openjpeg-${branch}"
@ -12,20 +12,6 @@ callPackage ./generic.nix (args // rec {
]; ];
patches = [ patches = [
(fetchpatch {
name = "CVE-2018-7648.patch";
url = "https://github.com/uclouvain/openjpeg/commit/cc3824767bde397fedb8a1ae4786a222ba860c8d.patch";
sha256 = "1j5nxmlgyfkxldk2f1ij6h850xw45q3b5brxqa04dxsfsv8cdj5j";
})
(fetchpatch {
name = "CVE-2017-17480+CVE-2018-18088.patch";
url = "https://github.com/uclouvain/openjpeg/commit/92023cd6c377e0384a7725949b25655d4d94dced.patch";
sha256 = "0rrxxqcp3vjkmvywxj9ac766m3fppy0x0nszrkf8irrqy1gnp38k";
})
(fetchpatch {
url = https://github.com/uclouvain/openjpeg/commit/24fd3ce777a64b8b315cfe1ee642ec7b1cc6aa97.patch;
sha256 = "1sl5wplgdfiqw8qbd8s5j5hq3ynbwgsnv8nxqfrk5s7vyrzx9pxv";
})
./fix-cmake-config-includedir.patch ./fix-cmake-config-includedir.patch
]; ];
}) })