Accepting request 634675 from graphics

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/634675
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ImageMagick?expand=0&rev=167

ImageMagick-7.0.8-11.tar.bz2

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

ImageMagick-7.0.8-11.tar.bz2.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAABAgAGBQJbhq3GAAoJEImrY9SCdzd6F8wQAIfW3tPi924gczHbUZAqdiW7
+ZIcGvzhr0SC1URz3atFUL9N3M8Y4pvCtiGL07+9amjB+/bMqg9hNV3L6VXMsax/Y
+IAPgPOS9P2YeqsvjTVAzDgVsyCY1l22ZhJ4LCPb1hU6oh4ItWTtjPr6m7q9PUA1v
+zYmEbitfK/YCPeJZWVvSDLVH54HTc73JRNAMCwRG09zDlZrh12lDb9do+/iGF7v5
+V+kYMHs8B6HFinJdX5cd0bGyylr4+bw/pMfaFKKysny8aYLQ00gD45SjByac6aal
+oT5BZFynG36PwWoApoAzIgMggYLUfTDYLP9P6Ubwkh/PIwljgoW4SVH+puAZ+vvQ
+hRyyiIyl21K5sCFPW9et4/fpEsJcAT2kYz0j7rrpPBv+CmMLwg+b0RoilUhiZzkg
+4ISLfTtv2pZCTb7k70mx03oVGTykbVJD7ek0vRO0JiybnPfOKQhK31Oq7jls1xop
+PjVMhhzSEAms0T3l6uteZW+n3Yx6zPbWfl8Ff7Ks6n4BxHdNVk/i2L+3+BDOr+oH
+5sI3CRLhM03lGFYxi9wY8M3jprSRCtcDprdHqOduhTI4ZcQDHQZyFgg/QVNar4d6
+acoFZpbXiGhXoJrRflawE0bz4zPvvSutNGA1f3Nzxn9BTFr65JDCaru/D3FGCnNq
+oKFnl1bodLvUtVFtdkux
+=/5UE
+-----END PGP SIGNATURE-----

ImageMagick-7.0.8-9.tar.bz2

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

ImageMagick-7.0.8-9.tar.bz2.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIcBAABAgAGBQJbaEG5AAoJEImrY9SCdzd6el0QAKWBfrhgLkTbD2AYzBw3wopU
-tzHFRFKwwLZAm//g4rjFA05kvqxyPVKh0p/jnQx5HFsbmhVoBB+Pa6HwB27bvROD
-UYghMgwYkIKU2hmYJujdXA+ahcC5IyWC1Q5wgTwkD30ZbsmnFCmVXz6g1akkjYPs
-aPnrkTSVhSAtPJkhHu+KjiCwJOHqZPa66LtdBKCZVtYv5wvwi2tHHFpyR07FczQj
-JA6HIjYsbT5PBqnefhaAfYAQoyhol6QNo6V31b/UzV4/wTg/5CEDtfjBIUxsgAy+
-EzEtfdZiMt+a/0qtBYujHxC5WSdZo16IHsSMtTYAVyvdS0aFLMYI5XMM3XY6xWd2
-LFnTsRn5WBgp60/+eiNUrZL37CGoJBGYoOfEuFVaEQSjjPG7tgBSJ9Y52lt00t8r
-W3edQWf6oqdDN3RW5A4UWJqiwZYYAiMhq5Hq8xuVLW0LEEiYFv7bJdlFxlYq0rfh
-aMepcqidle4uBek0F0kya77nncQEQsgSp5zPPftDluJ9NT66HHuAN5nCFEeNTZX2
-wEc/BE9R3+SjY6ZINwwYICwI3sxJk5U9sFp8OM++0cAnjNu/2IgBhUUdSE4atJkM
-2jPZ23hOmNwW3qyqDWNN0MhFRr8hhxM1l08IdUFKgeZ4OETGAU5t4WWzIAWeWT9+
-6wT99tM1Nl8vz7IYftSZ
-=XrrC
------END PGP SIGNATURE-----

ImageMagick-disable-insecure-coders.patch

@@ -1,8 +1,8 @@
-Index: ImageMagick-7.0.6-0/config/policy.xml
+Index: ImageMagick-7.0.8-10/config/policy.xml
 ===================================================================
---- ImageMagick-7.0.6-0.orig/config/policy.xml	2017-06-28 09:11:49.170299620 +0200
+--- ImageMagick-7.0.8-10.orig/config/policy.xml	2018-08-13 13:05:28.000000000 +0200
-+++ ImageMagick-7.0.6-0/config/policy.xml	2017-06-28 09:13:16.191813685 +0200
++++ ImageMagick-7.0.8-10/config/policy.xml	2018-08-22 12:24:40.219828953 +0200
-@@ -76,4 +76,15 @@
+@@ -74,4 +74,20 @@
    <!-- <policy domain="cache" name="memory-map" value="anonymous"/> -->
    <!-- <policy domain="cache" name="synchronize" value="True"/> -->
    <!-- <policy domain="cache" name="shared-secret" value="passphrase" stealth="true"/> -->
@@ -17,4 +17,9 @@ Index: ImageMagick-7.0.6-0/config/policy.xml
 +  <policy domain="coder" rights="none" pattern="SHOW" />
 +  <policy domain="coder" rights="none" pattern="WIN" />
 +  <policy domain="coder" rights="none" pattern="PLT" />
++  <policy domain="coder" rights="none" pattern="PS" />
++  <policy domain="coder" rights="none" pattern="PS2" />
++  <policy domain="coder" rights="none" pattern="PS3" />
++  <policy domain="coder" rights="none" pattern="PDF" />
++  <policy domain="coder" rights="none" pattern="XPS" />
  </policymap>

ImageMagick-filter.t.patch

@@ -1,49 +0,0 @@
-diff --git a/MagickCore/fx.c b/MagickCore/fx.c
-index 75b2b98c16..3bdc468273 100644
---- a/MagickCore/fx.c
-+++ b/MagickCore/fx.c
-@@ -3394,7 +3394,7 @@ MagickExport Image *ImplodeImage(const Image *image,const double amount,
-       delta.x=scale.x*(double) (x-center.x);
-       distance=delta.x*delta.x+delta.y*delta.y;
-       if ((distance >= (radius*radius)) ||
--          (GetPixelWriteMask(canvas_image,p) > (QuantumRange/2)))
-+          (GetPixelWriteMask(canvas_image,p) <= (QuantumRange/2)))
-         for (i=0; i < (ssize_t) GetPixelChannels(canvas_image); i++)
-         {
-           PixelChannel channel = GetPixelChannelChannel(canvas_image,i);
-@@ -5227,7 +5227,7 @@ MagickExport Image *SwirlImage(const Image *image,double degrees,
-       delta.x=scale.x*(double) (x-center.x);
-       distance=delta.x*delta.x+delta.y*delta.y;
-       if ((distance >= (radius*radius)) ||
--          (GetPixelWriteMask(canvas_image,p) > (QuantumRange/2)))
-+          (GetPixelWriteMask(canvas_image,p) <= (QuantumRange/2)))
-         {
-           register ssize_t
-             i;
-@@ -5729,7 +5729,7 @@ MagickExport Image *WaveImage(const Image *image,const double amplitude,
-       }
-     for (x=0; x < (ssize_t) wave_image->columns; x++)
-     {
--      if (GetPixelWriteMask(image,p) > (QuantumRange/2))
-+      if (GetPixelWriteMask(image,p) <= (QuantumRange/2))
-         {
-           register ssize_t
-             i;
-diff --git a/MagickCore/image.c b/MagickCore/image.c
-index a74ba1118c..310eb535cc 100644
---- a/MagickCore/image.c
-+++ b/MagickCore/image.c
-@@ -3374,10 +3374,10 @@ MagickExport MagickBooleanType SetImageRegionMask(Image *image,
-       Quantum
-         pixel;
- 
--      pixel=QuantumRange;
-+      pixel=(Quantum) 0;
-       if (((x >= region->x) && (x < (region->x+(ssize_t) region->width))) &&
-           ((y >= region->y) && (y < (region->y+(ssize_t) region->height))))
--        pixel=(Quantum) 0;
-+        pixel=QuantumRange;
-       switch (type)
-       {
-         case ReadPixelMask:
-

ImageMagick.changes

@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Mon Sep  3 08:20:41 UTC 2018 - pgajdos@suse.com
+
+- update to 7.0.8-11:
+  * Fixed numerous use of uninitialized values, integer overflow, memory
+    exceeded, and timeouts (credit to OSS Fuzz).
+  * Add support for "module" security policy.
+
+-------------------------------------------------------------------
+Wed Aug 22 09:10:19 UTC 2018 - pgajdos@suse.com
+
+- disable PS, PS2, PS3, XPS and PDF coders in default policy.xml 
+  [bsc#1105592]
+
+-------------------------------------------------------------------
+Fri Aug 17 07:54:19 UTC 2018 - pgajdos@suse.com
+
+- update to 7.0.8-10:
+  * Added dcraw coder (dcraw:img.cr2) that can be used to force the use of the
+    dcraw delegate when libraw is the default raw delegate.
+  * Restored thread support for the HEIC coder.
+  * ThumbnailImage function no longer reveals sensitive information (reference
+    https://github.com/ImageMagick/ImageMagick/issues/1243).
+- remove upstreamed ImageMagick-filter.t.patch
+
 -------------------------------------------------------------------
 Mon Aug  6 13:42:03 UTC 2018 - pgajdos@suse.com
 

ImageMagick.spec

@@ -18,7 +18,7 @@
 
 %define maj           7
 %define mfr_version   %{maj}.0.8
-%define mfr_revision  9
+%define mfr_revision  11
 %define quantum_depth 16
 %define source_version %{mfr_version}-%{mfr_revision}
 %define clibver   6
@@ -45,8 +45,6 @@ Patch2:         ImageMagick-library-installable-in-parallel.patch
 #%%ifarch s390x s390 ppc64 ppc
 Patch3:         ImageMagick-s390-disable-tests.patch
 #%%endif
-# https://github.com/ImageMagick/ImageMagick/issues/1241
-Patch4:         ImageMagick-filter.t.patch
 BuildRequires:  chrpath
 BuildRequires:  dos2unix
 BuildRequires:  fdupes
@@ -298,7 +296,6 @@ HTML documentation for ImageMagick library and scene examples.
 %ifarch s390x s390 ppc ppc64
 %patch3 -p1
 %endif
-%patch4 -p1
 
 %build
 # bsc#1088463