diff options
author | Marius Bakke <mbakke@fastmail.com> | 2017-09-04 22:34:28 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2017-09-04 22:34:28 +0200 |
commit | a76585e5535f433d37c0900cf0b2d3c9d3b3461c (patch) | |
tree | 007befec20e2a33117256eeee11b7c642179dad4 /gnu/packages/image.scm | |
parent | 1dc32c2961402c946c25e5a1aabe79a30cce3cff (diff) | |
parent | c427fda233a7da0c8eb27e244a562c51d3835503 (diff) | |
download | patches-a76585e5535f433d37c0900cf0b2d3c9d3b3461c.tar patches-a76585e5535f433d37c0900cf0b2d3c9d3b3461c.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/image.scm')
-rw-r--r-- | gnu/packages/image.scm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 503a249a91..5d062b107b 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -520,7 +520,9 @@ work.") (sha256 (base32 "0yvfghxwfm3dcqr9krkw63pcd76hzkknc3fh7bh11s8qlvjvrpbg")) - (patches (search-patches "openjpeg-CVE-2017-12982.patch")))) + (patches (search-patches "openjpeg-CVE-2017-12982.patch" + "openjpeg-CVE-2017-14040.patch" + "openjpeg-CVE-2017-14041.patch")))) (build-system cmake-build-system) (arguments ;; Trying to run `$ make check' results in a no rule fault. |