aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/image.scm
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2015-10-07 22:17:12 -0400
committerMark H Weaver <mhw@netris.org>2015-10-07 22:18:13 -0400
commit7ab73c4addad7cf5358b988943871ea85192f692 (patch)
treedaac18417460238dbc4bbfe805dfa7889a630e77 /gnu/packages/image.scm
parentd04efa0fff908de0f8822a27582b4b1c3dcae553 (diff)
downloadguix-7ab73c4addad7cf5358b988943871ea85192f692.tar
guix-7ab73c4addad7cf5358b988943871ea85192f692.tar.gz
gnu: openjpeg-2.x: Add fix for CVE-2015-6581.
* gnu/packages/patches/openjpeg-CVE-2015-6581.patch: New file. * gnu-system.am (dist_patch_DATA): Add it. * gnu/packages/image.scm (openjpeg, openjpeg-2.0)[source]: Add patch.
Diffstat (limited to 'gnu/packages/image.scm')
-rw-r--r--gnu/packages/image.scm6
1 files changed, 4 insertions, 2 deletions
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 26f1be9a2f..23ad59ce9a 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -272,7 +272,8 @@ work.")
version ".tar.gz"))
(sha256
(base32 "00zzm303zvv4ijzancrsb1cqbph3pgz0nky92k9qx3fq9y0vnchj"))
- (patches (list (search-patch "openjpeg-use-after-free-fix.patch")))))
+ (patches (map search-patch '("openjpeg-use-after-free-fix.patch"
+ "openjpeg-CVE-2015-6581.patch")))))
(build-system cmake-build-system)
(arguments
;; Trying to run `$ make check' results in a no rule fault.
@@ -308,7 +309,8 @@ error-resilience, a Java-viewer for j2k-images, ...")
version ".tar.gz"))
(sha256
(base32 "1c2xc3nl2mg511b63rk7hrckmy14681p1m44mzw3n1fyqnjm0b0z"))
- (patches (list (search-patch "openjpeg-use-after-free-fix.patch")))))))
+ (patches (map search-patch '("openjpeg-use-after-free-fix.patch"
+ "openjpeg-CVE-2015-6581.patch")))))))
(define-public openjpeg-1
(package (inherit openjpeg)