From 2f6dabc675e39074227c8948cf1a11a6d65a3c2f5d8679da9e0d0280bb6334d0 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Fri, 11 May 2018 19:53:15 +0000 Subject: [PATCH] - 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 | 3 --- ImageMagick-7.0.7-29.tar.bz2.asc | 16 ------------ ImageMagick-7.0.7-31.tar.bz2 | 3 +++ ImageMagick-7.0.7-31.tar.bz2.asc | 16 ++++++++++++ ImageMagick-draw-circle-primitive.patch | 33 ------------------------- ImageMagick.changes | 9 +++++++ ImageMagick.spec | 6 +---- 7 files changed, 29 insertions(+), 57 deletions(-) delete mode 100644 ImageMagick-7.0.7-29.tar.bz2 delete mode 100644 ImageMagick-7.0.7-29.tar.bz2.asc create mode 100644 ImageMagick-7.0.7-31.tar.bz2 create mode 100644 ImageMagick-7.0.7-31.tar.bz2.asc delete mode 100644 ImageMagick-draw-circle-primitive.patch diff --git a/ImageMagick-7.0.7-29.tar.bz2 b/ImageMagick-7.0.7-29.tar.bz2 deleted file mode 100644 index 70ff31f..0000000 --- a/ImageMagick-7.0.7-29.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eb56433007e9a439b2e39d966c9f7e7814714f68d16e148488bc401b09d59691 -size 10791064 diff --git a/ImageMagick-7.0.7-29.tar.bz2.asc b/ImageMagick-7.0.7-29.tar.bz2.asc deleted file mode 100644 index 2f0988d..0000000 --- a/ImageMagick-7.0.7-29.tar.bz2.asc +++ /dev/null @@ -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----- diff --git a/ImageMagick-7.0.7-31.tar.bz2 b/ImageMagick-7.0.7-31.tar.bz2 new file mode 100644 index 0000000..14393b0 --- /dev/null +++ b/ImageMagick-7.0.7-31.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d66e364bfa13cbe676e52c7f84c868c071bd8a4079a69497d34d3b5f4fe68a7 +size 10807195 diff --git a/ImageMagick-7.0.7-31.tar.bz2.asc b/ImageMagick-7.0.7-31.tar.bz2.asc new file mode 100644 index 0000000..57f8fb6 --- /dev/null +++ b/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----- diff --git a/ImageMagick-draw-circle-primitive.patch b/ImageMagick-draw-circle-primitive.patch deleted file mode 100644 index 017083d..0000000 --- a/ImageMagick-draw-circle-primitive.patch +++ /dev/null @@ -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)) - diff --git a/ImageMagick.changes b/ImageMagick.changes index 3253780..9436586 100644 --- a/ImageMagick.changes +++ b/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 diff --git a/ImageMagick.spec b/ImageMagick.spec index bf5acb0..bf665ef 100644 --- a/ImageMagick.spec +++ b/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