- update to 7.0.7-31:

* Fixed numerous use of uninitialized values, integer overflow,
    memory exceeded, and timeouts (credit to OSS Fuzz).
  * Missing break when checking "compliance" element.
- removed upstreamed ImageMagick-draw-circle-primitive.patch

OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=362

ImageMagick-7.0.7-29.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eb56433007e9a439b2e39d966c9f7e7814714f68d16e148488bc401b09d59691
-size 10791064

ImageMagick-7.0.7-29.tar.bz2.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIcBAABAgAGBQJa5yKZAAoJEImrY9SCdzd6JqAP/A3b2rSwfp3+RuZzbXUnGMe+
-N73H1Ccux7/aQyoEXbBH3lnZL2L19MpJhG1REeKLXrTmjWPYQEeUYvs1z6N5qS1U
-/gDdg+888Dq/lnQ6sax5NX+U0M8aOsynxSPwbZvppnJ4QlPIrzQPzlYHBIMKHdc5
-pfv9Yg6l0ceDR3Twt6i8m6SCe/UsMhGpQf1d5dNIvFC+dOdoVAWSlUiHApIuD9nl
-is6RFq/vlUp3H8FfBVfd71rJ34NPttQAJ4xzIRkOH0Ir1elUdZLoZbUHa7UuUA2v
-EUfxUK+I59ApSWa9XcvzDZLFXZ+LCQ4Easb1H1yzIr3K4w5y/C6FzEsmBRTBH3Q4
-LerHpTB/khGd7tEXXlAgc6oCQNFVUumVpy8JxD8Bs0x9o2TZ6LXlqQHB8AlzJD00
-thvf8wO4Mb9tICtP10i35bCKox3mVEz/PiFspEnAQUvjv8Uk6QvTugDRO1DmNH3V
-JKe+VMkaZuQFPy27Yk1E+GPWRM/tzQIebbAASe1rFRxcRfsAMhmWBZmU8P2ombNj
-t2TIN9L68llmY0nvI0WzZTe3hRPzZW5gMvz/aDKOJO44EnzRHr+gDl7sGPk8p8eq
-hcC+d/HHJiDKv/BhYtQnfYwTNWmrqtTFOW7qzmhbi2VfEx6wD3/5id0jO5kKSLKX
-4gV/35cdXpKWfguutuaX
-=TSO2
------END PGP SIGNATURE-----

ImageMagick-7.0.7-31.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3d66e364bfa13cbe676e52c7f84c868c071bd8a4079a69497d34d3b5f4fe68a7
+size 10807195

ImageMagick-7.0.7-31.tar.bz2.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAABAgAGBQJa8HmvAAoJEImrY9SCdzd6f+EP+wSTSrP0aJKV15bFzPG2NHOt
+1/fpXxgRYY84dAv0jr17T7UXo3lsjSMhpO5K9e+cw7ROyRBltbdT3P/vSCFw/sRM
+WExfYztxip9jqmh45QHlBk+t75dueZ/KdKPhIkUmERY1+fw7INOzBObPoCQkE+JR
+p5PD29Lvqfr2iH/nHnSazYVDSas4omJQ8B90HndUXY57x/yKtipedV5YUGcTD0fl
+vAPsPuD+aXWbFBVaezlgYLsPjpSHDgOabdZwcqaMCnky2JgtBRAgMzDZA3CQZByc
+YgpSOzCGMI796jjkL4sPVzB087uo3YcrN1kynU/H1mMo4s4MWtnkC32VHI+/Uq6x
+Y3ffm5a+CVPb1DAPvLPcQrg/GdKCHmkXpasRqAuzMVoLzeE07ZxtzXljFyo8zNtW
+rqTMeRuvvpx6cG1OF3Ua+4adTQbp03NeIZbI7LMUIWlSWazaeKkuAwcRGxMJit+b
+ncCNqOmiwOJvs86+iHpkaO6hZAyhGJfN1zHvtvnkXhjokUVpkHdJ35WmsFOZFJB+
+4Uw0USUf6boKf8hMCF1nqWKdCN+9eQbsus/PM08p1xaB+Eh0vYoNd5sf1PpqvxdV
+WKgfD/gnCLuBfFgEoGuAhyRif4PXQ1lSGTEMeLat3TsDc64UpaSgQWsUBCLC6Yhb
+95CSy38yXMFsMsZNGsdK
+=yAzq
+-----END PGP SIGNATURE-----

ImageMagick-draw-circle-primitive.patch

@@ -1,33 +0,0 @@
-diff --git a/MagickCore/draw.c b/MagickCore/draw.c
-index 2cefdcfb22..4df5e0bfc7 100644
---- a/MagickCore/draw.c
-+++ b/MagickCore/draw.c
-@@ -4354,21 +4354,21 @@ RestoreMSCWarning
-       bounds.y2=p->bounds.y2;
-   }
-   bounds.x1-=(mid+1.0);
-+  bounds.y1-=(mid+1.0);
-+  bounds.x2+=(mid+1.0);
-+  bounds.y2+=(mid+1.0);
-+  if ((bounds.x1 >= image->columns) || (bounds.y1 >= image->rows) ||
-+      (bounds.x2 <= 0.0) || (bounds.y2 <= 0.0))
-+    return(MagickTrue);
-   bounds.x1=bounds.x1 < 0.0 ? 0.0 : bounds.x1 >= (double) image->columns-1.0 ?
-     (double) image->columns-1.0 : bounds.x1;
--  bounds.y1-=(mid+1.0);
-   bounds.y1=bounds.y1 < 0.0 ? 0.0 : bounds.y1 >= (double) image->rows-1.0 ?
-     (double) image->rows-1.0 : bounds.y1;
--  bounds.x2+=(mid+1.0);
-   bounds.x2=bounds.x2 < 0.0 ? 0.0 : bounds.x2 >= (double) image->columns-1.0 ?
-     (double) image->columns-1.0 : bounds.x2;
--  bounds.y2+=(mid+1.0);
-   bounds.y2=bounds.y2 < 0.0 ? 0.0 : bounds.y2 >= (double) image->rows-1.0 ?
-     (double) image->rows-1.0 : bounds.y2;
-   status=MagickTrue;
--  if ((fabs(bounds.x2-bounds.x1) < MagickEpsilon) ||
--      (fabs(bounds.y2-bounds.y1) < MagickEpsilon))
--    status=MagickFalse;
-   image_view=AcquireAuthenticCacheView(image,exception);
-   if ((primitive_info->coordinates == 1) ||
-       (polygon_info[0]->number_edges == 0))
-

ImageMagick.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri May 11 19:41:44 UTC 2018 - pgajdos@suse.com
+
+- update to 7.0.7-31:
+  * Fixed numerous use of uninitialized values, integer overflow,
+    memory exceeded, and timeouts (credit to OSS Fuzz).
+  * Missing break when checking "compliance" element.
+- removed upstreamed ImageMagick-draw-circle-primitive.patch
+
 -------------------------------------------------------------------
 Wed May  2 12:25:24 UTC 2018 - pgajdos@suse.com
 

ImageMagick.spec

@@ -18,7 +18,7 @@
 
 %define maj           7
 %define mfr_version   %{maj}.0.7
-%define mfr_revision  29
+%define mfr_revision  31
 %define quantum_depth 16
 %define source_version %{mfr_version}-%{mfr_revision}
 %define clibver   6
@@ -55,9 +55,6 @@ Patch3:         ImageMagick-s390-disable-tests.patch
 #%%ifarch i586
 Patch5:         ImageMagick-tests.tap-attributes.patch
 #%%endif
-# fix circle primitive draw
-# https://github.com/ImageMagick/ImageMagick/issues/1120
-Patch6:         ImageMagick-draw-circle-primitive.patch
 BuildRequires:  chrpath
 BuildRequires:  dos2unix
 BuildRequires:  fdupes
@@ -313,7 +310,6 @@ HTML documentation for ImageMagick library and scene examples.
 %ifarch i586
 %patch5 -p1
 %endif
-%patch6 -p1
 
 %build
 # bsc#1088463