summary refs log tree commit diff
path: root/pkgs/development/libraries/openjpeg
diff options
context:
space:
mode:
authorMarek Mahut <marek.mahut@satoshilabs.com>2019-07-06 10:40:29 +0200
committerFrederik Rietdijk <freddyrietdijk@fridh.nl>2019-07-17 10:50:49 +0200
commit0596ac9667b19a9dabd42d5a8e8fe3d6265b2099 (patch)
tree9c4a124b64520ec194d1c0ed560da7d6fa73bc48 /pkgs/development/libraries/openjpeg
parentff1be88e38a933b5d5a4c040c1095257e4cf957c (diff)
downloadnixpkgs-0596ac9667b19a9dabd42d5a8e8fe3d6265b2099.tar
nixpkgs-0596ac9667b19a9dabd42d5a8e8fe3d6265b2099.tar.gz
nixpkgs-0596ac9667b19a9dabd42d5a8e8fe3d6265b2099.tar.bz2
nixpkgs-0596ac9667b19a9dabd42d5a8e8fe3d6265b2099.tar.lz
nixpkgs-0596ac9667b19a9dabd42d5a8e8fe3d6265b2099.tar.xz
nixpkgs-0596ac9667b19a9dabd42d5a8e8fe3d6265b2099.tar.zst
nixpkgs-0596ac9667b19a9dabd42d5a8e8fe3d6265b2099.zip
openjpeg: CVE-2019-12973
Diffstat (limited to 'pkgs/development/libraries/openjpeg')
-rw-r--r--pkgs/development/libraries/openjpeg/2.x.nix10
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/development/libraries/openjpeg/2.x.nix b/pkgs/development/libraries/openjpeg/2.x.nix
index e865e2e8549..24f3752ef43 100644
--- a/pkgs/development/libraries/openjpeg/2.x.nix
+++ b/pkgs/development/libraries/openjpeg/2.x.nix
@@ -13,5 +13,15 @@ callPackage ./generic.nix (args // rec {
 
   patches = [
     ./fix-cmake-config-includedir.patch
+    (fetchpatch {
+      url = "https://github.com/uclouvain/openjpeg/commit/21399f6b7d318fcdf4406d5e88723c4922202aa3.patch";
+      name = "CVE-2019-12973-1.patch";
+      sha256 = "161yvnfbzy2016qqapm0ywfgglgs1v8ljnk6fj8d2bwdh1cxxz8f";
+    })
+    (fetchpatch {
+      url = "https://github.com/uclouvain/openjpeg/commit/3aef207f90e937d4931daf6d411e092f76d82e66.patch";
+      name = "CVE-2019-12973-2.patch";
+      sha256 = "1jkkfw13l7nx4hxdhc7z17f4vfgqcaf09zpl235kypbxx1ygc7vq";
+    })
   ];
 })