Accepting request 579307 from graphics

- upstream fixes the test by changing the signature
  - ImageMagick-820e636.patch
  + ImageMagick-write.t-PICT-signature.patch

- update to 7.0.7.23
  * Fixed numerous use of uninitialized values, integer overflow,
    memory exceeded, and timeouts (credit to OSS Fuzz).
  * Add list-length policy to limit the maximum image sequence length.
- added patches
  + ImageMagick-montage.t-directory-exception.patch
  + ImageMagick-820e636.patch

- Add explicit buildrequires on: pkgconfig(libwebpmux), 
  pkgconfig(cairo), pkgconfig(fontconfig), pkgconfig(libpng), 
  pkgconfig(x11), pkgconfig(xext), pkgconfig(zlib). all
  of them direct build dependencies but not included in 
  the spec file

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

ImageMagick-7.0.7-22.tar.bz2

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

ImageMagick-7.0.7-22.tar.bz2.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIcBAABAgAGBQJaZjmHAAoJEImrY9SCdzd6rasQAKCbtiK81Ic826qC1tFRExvi
-M2vcgg8HcEJbIMMdyHppTjl0RTQIw4RIQyeLhB8z/EpbkH1hQ+XtYtWKBF+OqSq+
-oysJ2ClkJP1tBJ76qDx6razD3L+ntZ3AfuVBPS2ZEz4IhzsapBS9mFZ72pwlRjhD
-N8nixmWIRz13l9qSN02s3TWe+6lfZ4D5BN21IwaZzoUSZhuY8ZQxMSOfdbd13B7k
-nPMK6k3RAf+FCWqtf/tl3m8P5MOfJw8Cul/I0X4beGeIn/ShlQx17NJGEgkMvbLh
-c6whs3v2h7HaXvDpzToNPJQOoIRyTahS1CuB8JaZMdG78QOBvv/8QGweDh4RHuwr
-s/bwxQto7Qxp/RxDDQ4CBnmHWl4Jl3N4BsvT7+bgIMznHOcK5HJlP66/IvgdK2kU
-tdjsq05MlK6Kpbpn2hieht6uN3w4v8X2gUVk/94ckBpFF64VdhJGCUS19QOYqBLq
-VC64tVMOrYrfpAaMkGceXBvOoscVr56C70r8Py+3OKci7voLyFw1aNYSc2qmWp2K
-HvU5OPPS8mudzBmO9N1Gtij2pBoLqyOZNACBPv0FIs2m/0s7qLKOyi+/xxBkkgPM
-K2v+5JQ4ntSUXIEvdcM9Gewfxg8+CWyk/RB2EFn0MD9+dfcyWXB14xZ2ECDXy1cM
-8fXJuSlRBMOJPS4KOS+6
-=352t
------END PGP SIGNATURE-----

ImageMagick-7.0.7-23.tar.bz2

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

ImageMagick-7.0.7-23.tar.bz2.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAABAgAGBQJaijVsAAoJEImrY9SCdzd6khIP/2oRwQ+/F5P/ba/4fJx3xlbf
+BH8iS6UmOopd0eVO1BIfNo1uBr4i+kp20nE5GkYFL3pi8XiAaQ7l+IaYudUakaiD
+NNSjfbA9KSD6sUBHv+l/VSFv2WD1xE6wXXfAiNj06paX+q5D2nDHf9dPzc4Pr1s6
+h3hZYW4GZ4wAZH+bFXZ+tzCwxZBqaTkWQG43kEgTbjsjVxcOB4HTIyMQBuRfE7de
+FrbUPi6hmrqO7Oi2ZoqqNcQmvZbdPd2dZa0D0/E6/C4IMEcQrGMIqiEIQCigo37I
+huXykRHMzxjkht3Cz8Einy1mOHCTLfaELLamXuUVz25C51rxUwVQqJ+nxgSDkUAL
+06B8Hf7v2PbvUP99CFjJjrB2Y/krutpWVtocT0kxbb+qmBcL1MHf4Tqdr2v1LD4W
+sxHvpVhWuwjvAKScqLC2xuibxJE0s+wW4Zx9KPBjbzGAeJk6gGZCZHcxty+QmFi8
+FCZZBkyYyF/eZ304D99ycMVjJS9Wy5bbCrjlzUtG97hDAynSGtVB3CpEpyhLBFW3
+RweM6Js7Bl1DZ1PigyXz4cy5Ag1jScNFUOZMTyYNTnVXmwVkblpfEPHGn3ik55uT
+OrZRaQi2hDS05zVNGwLeBvNGgxyqIiSP0IKrLdgl4zgulundaxk5izj8CRfRr8aW
+3aS9lWLmz9b9bMuzSJcX
+=roPT
+-----END PGP SIGNATURE-----

ImageMagick-montage.t-directory-exception.patch

@@ -0,0 +1,12 @@
+--- a/PerlMagick/t/subroutines.pl
++++ b/PerlMagick/t/subroutines.pl
+@@ -1050,7 +1050,7 @@ sub testMontage {
+       } else {
+         # Check montage directory
+         my $directory = $montage->Get('directory');
+-        my $expected = join( "\n", @colors ) . "\n";
++        my $expected = join( "\xff", @colors ) . "\xff";
+         if ( !defined($directory) ) {
+           print "ok $test\n";
+         } elsif ( $directory  ne $expected) {
+

ImageMagick-write.t-PICT-signature.patch

@@ -0,0 +1,11 @@
+--- a/PerlMagick/t/write.t
++++ b/PerlMagick/t/write.t
+@@ -129,7 +129,7 @@ print("Apple Macintosh QuickDraw/PICT file ...\n");
+ testReadWrite( 'PICT:input.pict',
+   'PICT:output.pict',
+   q//,
+-  'f7b3db46d6f696ea8392f0ad0be945dd502a806e2c1e9c082efef517191758f7');
++  '646ac633d5b5553721e032d2c9f8f54ffc19d315832bbf808c2b7321b1067293');
+ 
+ print("Portable pixmap format (color), ASCII format ...\n");
+ ++$test;

ImageMagick.changes

@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Fri Feb 23 08:05:31 UTC 2018 - pgajdos@suse.com
+
+- upstream fixes the test by changing the signature
+  - ImageMagick-820e636.patch
+  + ImageMagick-write.t-PICT-signature.patch
+
+-------------------------------------------------------------------
+Wed Feb 21 13:24:09 UTC 2018 - pgajdos@suse.com
+
+- update to 7.0.7.23
+  * Fixed numerous use of uninitialized values, integer overflow,
+    memory exceeded, and timeouts (credit to OSS Fuzz).
+  * Add list-length policy to limit the maximum image sequence length.
+- added patches
+  + ImageMagick-montage.t-directory-exception.patch
+  + ImageMagick-820e636.patch
+
+-------------------------------------------------------------------
+Mon Feb 19 21:58:06 UTC 2018 - crrodriguez@opensuse.org
+
+- Add explicit buildrequires on: pkgconfig(libwebpmux), 
+  pkgconfig(cairo), pkgconfig(fontconfig), pkgconfig(libpng), 
+  pkgconfig(x11), pkgconfig(xext), pkgconfig(zlib). all
+  of them direct build dependencies but not included in 
+  the spec file
+
 -------------------------------------------------------------------
 Wed Jan 31 18:50:15 CET 2018 - ro@suse.de
 

ImageMagick.spec

@@ -18,7 +18,7 @@
 
 %define maj           7
 %define mfr_version   %{maj}.0.7
-%define mfr_revision  22
+%define mfr_revision  23
 %define quantum_depth 16
 %define source_version %{mfr_version}-%{mfr_revision}
 %define clibver   5
@@ -45,9 +45,13 @@ Patch1:         ImageMagick-relax-filter.t.patch
 #%%endif
 #%%endif
 Patch2:         ImageMagick-library-installable-in-parallel.patch
-#%%ifarch s390x
+#%%ifarch s390x s390 ppc64 ppc
 Patch3:         ImageMagick-s390-disable-tests.patch
 #%%endif
+# https://github.com/ImageMagick/ImageMagick/issues/992
+Patch4:         ImageMagick-montage.t-directory-exception.patch
+# https://github.com/ImageMagick/ImageMagick/issues/994
+Patch5:         ImageMagick-write.t-PICT-signature.patch
 BuildRequires:  chrpath
 BuildRequires:  dcraw
 %if 0%{?suse_version} >= 1315
@@ -94,6 +98,7 @@ BuildRequires:  pkgconfig(libopenjp2) >= 2.1.0
 BuildRequires:  pkgconfig(librsvg-2.0)
 BuildRequires:  pkgconfig(libtiff-4) >= 4.0.3
 BuildRequires:  pkgconfig(libwebp)
+BuildRequires:  pkgconfig(libwebpmux)
 BuildRequires:  pkgconfig(libxml-2.0)
 %if 0%{?suse_version} > 1315
 BuildRequires:  pkgconfig(lqr-1)
@@ -113,6 +118,12 @@ BuildRequires:  librsvg-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  libxml-devel
 BuildRequires:  perl-parent
+BuildRequires:  pkgconfig(cairo)
+BuildRequires:  pkgconfig(fontconfig)
+BuildRequires:  pkgconfig(libpng)
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(zlib)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %endif
 
@@ -290,6 +301,8 @@ HTML documentation for ImageMagick library and scene examples.
 %ifarch s390x s390 ppc ppc64
 %patch3 -p1
 %endif
+%patch4 -p1
+%patch5 -p1
 
 %build
 # make library binary package parallel installable