guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: gnu: imagemagick: Update to 6.9.3-10.


From: David Thompson
Subject: 01/01: gnu: imagemagick: Update to 6.9.3-10.
Date: Wed, 04 May 2016 17:24:40 +0000

davexunit pushed a commit to branch master
in repository guix.

commit d663e5e6001fa3d23bb80848cd46560c92ea92c8
Author: David Thompson <address@hidden>
Date:   Wed May 4 12:46:01 2016 -0400

    gnu: imagemagick: Update to 6.9.3-10.
    
    Fixes CVE-2016–3714.
    
    * gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.3-10.
    [source]: Remove patch.
    * gnu/packages/patches/imagemagick-test-segv.patch: Delete.
    * gnu/local.mk (dist_patch_DATA): Remove patch file from distribution.
---
 gnu/local.mk                                     |    1 -
 gnu/packages/imagemagick.scm                     |    5 ++---
 gnu/packages/patches/imagemagick-test-segv.patch |   20 --------------------
 3 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index a01efa9..6f9b1b1 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -544,7 +544,6 @@ dist_patch_DATA =                                           
\
   gnu/packages/patches/icu4c-CVE-2015-1270.patch               \
   gnu/packages/patches/icu4c-CVE-2015-4760.patch               \
   gnu/packages/patches/ilmbase-fix-tests.patch                 \
-  gnu/packages/patches/imagemagick-test-segv.patch             \
   gnu/packages/patches/imlib2-CVE-2016-4024.patch              \
   gnu/packages/patches/irrlicht-mesa-10.patch                  \
   gnu/packages/patches/jasper-CVE-2007-2721.patch              \
diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm
index 2bdc333..095f662 100644
--- a/gnu/packages/imagemagick.scm
+++ b/gnu/packages/imagemagick.scm
@@ -40,15 +40,14 @@
 (define-public imagemagick
   (package
     (name "imagemagick")
-    (version "6.9.2-1")
+    (version "6.9.3-10")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://imagemagick/ImageMagick-"
                                  version ".tar.xz"))
              (sha256
               (base32
-               "159afhqrj22jlz745ccbgnkdiwvn8pjcc96jic0iv9ms7gqxwln5"))
-             (patches (search-patches "imagemagick-test-segv.patch"))))
+               "0sik2jl1cywnpr5xm28mjhs1l8kxry65f3v2kqzp0cczhwf04gz3"))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags '("--with-frozenpaths")
diff --git a/gnu/packages/patches/imagemagick-test-segv.patch 
b/gnu/packages/patches/imagemagick-test-segv.patch
deleted file mode 100644
index 6626e54..0000000
--- a/gnu/packages/patches/imagemagick-test-segv.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-This patch works around a segmentation fault in 'Magick++/tests/color' when
-running 'Magick++/tests/tests.tap'.  Here we get an exception early on, which
-is supposedly harmless:
-
-  Caught exception: color: UnableToOpenConfigureFile `colors.xml' @ 
warning/configure.c/GetConfigureOptions/706
-
-However, when the stack unwinders run, 'UnregisterDOTImage' gets called even
-though 'RegisterDOTImage' hadn't been called yet; thus, 'graphic_context' in
-coders/dot.c is NULL, leading to the segfault.
-
---- ImageMagick-6.9.2-1/coders/dot.c   2015-09-16 17:32:42.900323334 +0200
-+++ ImageMagick-6.9.2-1/coders/dot.c   2015-09-16 17:32:48.312367636 +0200
-@@ -240,6 +240,7 @@ ModuleExport void UnregisterDOTImage(voi
-   (void) UnregisterMagickInfo("GV");
-   (void) UnregisterMagickInfo("DOT");
- #if defined(MAGICKCORE_GVC_DELEGATE)
-+  if (graphic_context != NULL)
-   gvFreeContext(graphic_context);
- #endif
- }



reply via email to

[Prev in Thread] Current Thread [Next in Thread]