diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-10-10 22:33:28 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-10-10 22:33:28 +0200 |
| commit | c01ef97594a8b06e884906a5efbdfacf8ba33dc3 (patch) | |
| tree | 828b4711c6ad71ab8fc9b6fc8f23f80979c5fe9b /gnu/packages/imagemagick.scm | |
| parent | 86d02fa8010c053ba980e4c39373b9bf8af0561d (diff) | |
| parent | 4b8b4418e609b5e0bfb6efbc11ac28deaa437e80 (diff) | |
| download | guix-c01ef97594a8b06e884906a5efbdfacf8ba33dc3.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/imagemagick.scm')
| -rw-r--r-- | gnu/packages/imagemagick.scm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index 7599f87311..fabbd707ac 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -46,14 +46,14 @@ ;; The 7 release series has an incompatible API, while the 6 series is still ;; maintained. Don't update to 7 until we've made sure that the ImageMagick ;; users are ready for the 7-series API. - (version "6.9.9-15") + (version "6.9.9-18") (source (origin (method url-fetch) (uri (string-append "mirror://imagemagick/ImageMagick-" version ".tar.xz")) (sha256 (base32 - "0bxgdc1qiyvag6a2iiqcbwp4ak0m1mzi9qhs51fbrvv6syy12m6c")))) + "1d70dvrgcasa3cla4c1dag4mw7vq4jk1nzbd604fk20l0l6xa78j")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch") @@ -185,7 +185,8 @@ script.") "graphicsmagick-CVE-2017-13775.patch" "graphicsmagick-CVE-2017-13776+CVE-2017-13777.patch" "graphicsmagick-CVE-2017-14042.patch" - "graphicsmagick-CVE-2017-14165.patch")))) + "graphicsmagick-CVE-2017-14165.patch" + "graphicsmagick-CVE-2017-14649.patch")))) (build-system gnu-build-system) (arguments `(#:configure-flags |