diff options
| author | Will Dietz <w@wdtz.org> | 2019-04-06 11:03:39 -0500 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-04-16 18:55:43 +0200 |
| commit | 07540c0ca19bc1dac31accbd43ef759658aecc19 (patch) | |
| tree | bdefe17561cfa9771691fb31eefcc4b9d5a55225 | |
| parent | 99a2cefddeb6c6adad29ad0365f8ff025c46796a (diff) | |
| download | nixlib-07540c0ca19bc1dac31accbd43ef759658aecc19.tar nixlib-07540c0ca19bc1dac31accbd43ef759658aecc19.tar.gz nixlib-07540c0ca19bc1dac31accbd43ef759658aecc19.tar.bz2 nixlib-07540c0ca19bc1dac31accbd43ef759658aecc19.tar.lz nixlib-07540c0ca19bc1dac31accbd43ef759658aecc19.tar.xz nixlib-07540c0ca19bc1dac31accbd43ef759658aecc19.tar.zst nixlib-07540c0ca19bc1dac31accbd43ef759658aecc19.zip | |
openjpeg: 2.3.0 -> 2.3.1
bug fixes, security fixes* I /think/ we had patches for the mentioned CVE's, but another pair of eyes is appreciated.
| -rw-r--r-- | pkgs/development/libraries/openjpeg/2.x.nix | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/pkgs/development/libraries/openjpeg/2.x.nix b/pkgs/development/libraries/openjpeg/2.x.nix index 3aa2fdf0dd25..e865e2e8549d 100644 --- a/pkgs/development/libraries/openjpeg/2.x.nix +++ b/pkgs/development/libraries/openjpeg/2.x.nix @@ -1,10 +1,10 @@ { callPackage, fetchpatch, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2.3.0"; + version = "2.3.1"; branch = "2.3"; revision = "v${version}"; - sha256 = "08plxrnfl33sn2vh5nwbsngyv6b1sfpplvx881crm1v1ai10m2lz"; + sha256 = "1dn98d2dfa1lqyxxmab6rrcv52dyhjr4g7i4xf2w54fqsx14ynrb"; extraFlags = [ "-DOPENJPEG_INSTALL_INCLUDE_DIR=${placeholder "dev"}/include/openjpeg-${branch}" @@ -12,20 +12,6 @@ callPackage ./generic.nix (args // rec { ]; 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 ]; }) |