diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-09-02 15:57:56 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-09-02 15:57:56 +0200 |
| commit | 30dfac27a5642c36e7bb1ba7966566864ba2d28d (patch) | |
| tree | 3b59623014eeea1df02cda5f926d803b9a36a828 /gnu/packages/imagemagick.scm | |
| parent | d2ee294c0400ac8f2a10f10c3c9644da513a3712 (diff) | |
| parent | 65e4109cdc96fbaee088f50d0138af8acef43141 (diff) | |
| download | guix-30dfac27a5642c36e7bb1ba7966566864ba2d28d.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/imagemagick.scm')
| -rw-r--r-- | gnu/packages/imagemagick.scm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index 4056d486fb..57ac7fda97 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016 Mark H Weaver <mhw@netris.org> +;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> ;;; ;;; This file is part of GNU Guix. ;;; @@ -179,7 +180,9 @@ script.") (patches (search-patches "graphicsmagick-CVE-2017-12935.patch" "graphicsmagick-CVE-2017-12936.patch" - "graphicsmagick-CVE-2017-12937.patch")))) + "graphicsmagick-CVE-2017-12937.patch" + "graphicsmagick-CVE-2017-13775.patch" + "graphicsmagick-CVE-2017-13776+CVE-2017-13777.patch")))) (build-system gnu-build-system) (arguments `(#:configure-flags |