From 0596ac9667b19a9dabd42d5a8e8fe3d6265b2099 Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@satoshilabs.com>
Date: Sat, 6 Jul 2019 10:40:29 +0200
Subject: [PATCH] openjpeg: CVE-2019-12973
---
pkgs/development/libraries/openjpeg/2.x.nix | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/pkgs/development/libraries/openjpeg/2.x.nix b/pkgs/development/libraries/openjpeg/2.x.nix
index e865e2e8549d..24f3752ef435 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";
+ })
];
})