From 218d08515cf93fd7439f8f1b0f1b991163333e8a Mon Sep 17 00:00:00 2001
From: Bernhard M. Wiedemann <bwiedemann+opensusegit@suse.de>
Date: Dec 07 2019 14:25:29 +0000
Subject: Update ImageMagick to rev 190 via SR 752343
https://build.opensuse.org/request/show/752343
by user dimstar_suse
- version update to 7.0.9.6
* Increase the maximum number of bezier coordinates (reference
https://github.com/ImageMagick/ImageMagick/issues/1784).
* Santize "'" from SHOW and WIN delegates under Linux, '"\' for Windows
(thanks to Enzo Puig).
* Correct for TGA orientation (reference
https://imagemagick.org/discourse-server/viewtopic.php?f=3&t=34757).
* The result for -compose Copy -extent on a MYK image is CMYK (reference
https://imagemagick.org/discourse-server/viewtopic.php?f=3&t=37118).
* Fix potential buffer overflow when reading a fax image (alert from
Justin).
* Support dng:use-camera-wb option.
- added patches
https://github.com/ImageMagick/ImageMagick/issues/1792
+ ImageMagick-targa.patch
- version update to 7.0.9.5
* Ensure Ascii85 compressio
---
diff --git a/packages/i/ImageMagick/.files b/packages/i/ImageMagick/.files
index b4fee23..924d604 100644
Binary files a/packages/i/ImageMagick/.files and b/packages/i/ImageMagick/.files differ
diff --git a/packages/i/ImageMagick/.rev b/packages/i/ImageMagick/.rev
index 5e7fc9b..3e72dce 100644
--- a/packages/i/ImageMagick/.rev
+++ b/packages/i/ImageMagick/.rev
@@ -2342,4 +2342,35 @@ Use SUSE- proprietary prefix until SPDX upstream accepts ImageMagick as license
% baselibs.conf</comment>
<requestid>744072</requestid>
</revision>
+ <revision rev="190" vrev="1">
+ <srcmd5>e18db13c3ef81fd68bc405d9d76cb797</srcmd5>
+ <version>7.0.9.6</version>
+ <time>1575728378</time>
+ <user>dimstar_suse</user>
+ <comment>- version update to 7.0.9.6
+ * Increase the maximum number of bezier coordinates (reference
+ https://github.com/ImageMagick/ImageMagick/issues/1784).
+ * Santize "'" from SHOW and WIN delegates under Linux, '"\' for Windows
+ (thanks to Enzo Puig).
+ * Correct for TGA orientation (reference
+ https://imagemagick.org/discourse-server/viewtopic.php?f=3&t=34757).
+ * The result for -compose Copy -extent on a MYK image is CMYK (reference
+ https://imagemagick.org/discourse-server/viewtopic.php?f=3&t=37118).
+ * Fix potential buffer overflow when reading a fax image (alert from
+ Justin).
+ * Support dng:use-camera-wb option.
+- added patches
+ https://github.com/ImageMagick/ImageMagick/issues/1792
+ + ImageMagick-targa.patch
+
+- version update to 7.0.9.5
+ * Ensure Ascii85 compression is thread safe.
+ * Santize ';' from SHOW and WIN delegates.
+ * Add exception parameter to CMS transform methods.
+ * Output exception there is an attempt to perform an operation not allowed by
+ the security policy
+ * JPEG and JPG are aliases in coder security policy.
+ * Fixed numerous issues posted to GitHub</comment>
+ <requestid>752343</requestid>
+ </revision>
</revisionlist>
diff --git a/packages/i/ImageMagick/ImageMagick-7.0.9-1.tar.bz2 b/packages/i/ImageMagick/ImageMagick-7.0.9-1.tar.bz2
deleted file mode 120000
index 3006a16..0000000
--- a/packages/i/ImageMagick/ImageMagick-7.0.9-1.tar.bz2
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeifg47rjzxgb6i32veznth4unwba6yflshkm3earhz25f45ojojpze
\ No newline at end of file
diff --git a/packages/i/ImageMagick/ImageMagick-7.0.9-1.tar.bz2.asc b/packages/i/ImageMagick/ImageMagick-7.0.9-1.tar.bz2.asc
deleted file mode 100644
index 3de0cdd..0000000
--- a/packages/i/ImageMagick/ImageMagick-7.0.9-1.tar.bz2.asc
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQIcBAABAgAGBQJdttLDAAoJEImrY9SCdzd66AYP+gL/qaQ31ywKvPJJE6z4Q8Ls
-0X6tsInK4I3/ZE90howwMW8/1pj4P7mpWa1ATJk5k2jHMRi+cwuabOpwvGVlxxcL
-JyOFXpbHjLG8W88x3ddKfox1WYnXlQgpsPbsQH0sswBtT5xMPexctLQDYzCCaM+d
-roaodpgdtgcKT7N6tRtig77RS5VoBVS6nxeYKVTlXI1UfIbcTWwDVQQU4bTPS2nb
-BKcTakMkcNyPks60aQgpmDGwvU4T2oR9wIEovFP1sHm1eK7Ln8fLhmRQ7/8lrdp6
-3xhTP7UPPKL2V31tHcg07P1L4qpKcoUW/8YFh3s2SPTcw30OWuAYFlD5kbnpWfKh
-ZgLX8qYamlFDWeOXQz+8Oj0Y1trcPj8PsiBiMDKGLY6GL4YpKG3Ma2VZQtWbywkB
-RSP8Cw/H8UKsdpa2BnEy9WPjLIaDbZ5zv0/RPtAHFZ3GP2vYuyrqPv8ekuffUm0U
-+IBtp4xALVPq/QP7aaIDUr3X8hRHgX+Dux9UFPDkUEZm2JDK1elDPtkSW4l0dwnh
-J0uODGtnnh8OgPf/8YGYuh1QmdBFalTUBnPZnaLRrcN5Df1TtzJ9r0GJIL9irrrN
-YBypGkGy3IEgiURktBBRoz+gKlQ6voGXsUSkOtQ7JKJ3HOvqDu8iXjChsRI1Bo7V
-PwmgMc/gDsNl4mTLQeE7
-=RnPo
------END PGP SIGNATURE-----
diff --git a/packages/i/ImageMagick/ImageMagick-7.0.9-6.tar.bz2 b/packages/i/ImageMagick/ImageMagick-7.0.9-6.tar.bz2
new file mode 120000
index 0000000..1b940e7
--- /dev/null
+++ b/packages/i/ImageMagick/ImageMagick-7.0.9-6.tar.bz2
@@ -0,0 +1 @@
+/ipfs/bafybeigzitzxymbdu52uppbjcd3kyb36wlcndc4wnigytrxmrw7pyqkirm
\ No newline at end of file
diff --git a/packages/i/ImageMagick/ImageMagick-7.0.9-6.tar.bz2.asc b/packages/i/ImageMagick/ImageMagick-7.0.9-6.tar.bz2.asc
new file mode 100644
index 0000000..a50ff54
--- /dev/null
+++ b/packages/i/ImageMagick/ImageMagick-7.0.9-6.tar.bz2.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQIcBAABAgAGBQJd3XaWAAoJEImrY9SCdzd6sP8QAJoL8h0jyfaR3GrwfaMgq4Ha
+ykwZjv1wG32ZxrzvbLvITMBDFnAwAL1JUb4aVVM9St1SOzdILR40slmirfCKCqK8
+BZYCfImX7bi+5l3swHLuUSO7eWuer3ymEXct4804iDdoCvN7IqKeLumauQamQPqj
++U7qz5prOnjtz5i8zGkp6X2jve+y08BqgjQO1+yRj16awQVL7PWRrmcph5prkV3b
+dgyX16fPXD8LLSm/kUojNlpBAbwkp2AQQbo83LqvV/7TqjTDJcVc+buAfOGRsB84
+iGczBK6TNVe5A10oX7bZRvITYeChvwFKd2zbqzAOrXPpK4wL9GqautN7/+7hvfqh
+uBcHvgZCfKndc51DAea4+tiOytJW6W/hZTD39V4pf22XUPu4Qo1kuxXz1idn6BrK
+fDCBgl5bPCC8Rc5mr7euy/mrIfIPhNEWVwgdWEwa90rbB5/NFlBK6mIkNs6z45D+
+n4xS1BAEwxhRk4kU65mx6kw6mRV5/fxiAbtWx7NqULiSE30aYJkuZUR4anvQJq1c
+Z9egJJOphWdtFF5VDi0JihvFw6dP9OQIrBUVDKEMgFE1qlhzAybuDDk7aCaBli2/
+3g0H4TzdVuREXexAODludZKJyMQPBbBOB2OtU5aRVkqSKnQ7ivix+XxNskePzTjy
+q1fzcTJzqm/SsKPdOI+k
+=+KQi
+-----END PGP SIGNATURE-----
diff --git a/packages/i/ImageMagick/ImageMagick-targa.patch b/packages/i/ImageMagick/ImageMagick-targa.patch
new file mode 100644
index 0000000..845f4c7
--- /dev/null
+++ b/packages/i/ImageMagick/ImageMagick-targa.patch
@@ -0,0 +1,26 @@
+Index: ImageMagick-7.0.9-6/PerlMagick/t/read.t
+===================================================================
+--- ImageMagick-7.0.9-6.orig/PerlMagick/t/read.t 2019-11-26 12:55:49.000000000 +0100
++++ ImageMagick-7.0.9-6/PerlMagick/t/read.t 2019-11-29 12:46:51.788561500 +0100
+@@ -162,7 +162,7 @@ testReadCompare('sun:input.im24', 'refer
+
+ print("Truevision Targa image file ...\n");
+ ++$test;
+-testReadCompare('input.tga', 'reference/read/input_tga.miff', q//, 0.0, 0.0);
++testReadCompare('input.tga', 'reference/read/input_tga.miff', q//, 0.1, 1.0);
+
+ print("PSX TIM file ...\n");
+ ++$test;
+Index: ImageMagick-7.0.9-6/PerlMagick/t/write.t
+===================================================================
+--- ImageMagick-7.0.9-6.orig/PerlMagick/t/write.t 2019-11-26 12:55:49.000000000 +0100
++++ ImageMagick-7.0.9-6/PerlMagick/t/write.t 2019-11-29 12:47:44.072847607 +0100
+@@ -190,7 +190,7 @@ print("Truevision Targa image file ...\n
+ testReadWrite( 'TGA:input.tga',
+ 'TGA:output.tga',
+ q//,
+- 'd0b17026dc758a4088c96bc0f21a2bf14e3ab4af8a35638129f7731f2f1cbe7e');
++ '5fd8b14e213578e41bb598825d5a9431f025de653c15896c696063fc3ed472ff');
+
+ print("Khoros Visualization image file ...\n");
+ ++$test;
diff --git a/packages/i/ImageMagick/ImageMagick.changes b/packages/i/ImageMagick/ImageMagick.changes
index 8966c88..a4937ce 100644
--- a/packages/i/ImageMagick/ImageMagick.changes
+++ b/packages/i/ImageMagick/ImageMagick.changes
@@ -1,4 +1,35 @@
-------------------------------------------------------------------
+Wed Nov 27 11:05:14 UTC 2019 - pgajdos@suse.com
+
+- version update to 7.0.9.6
+ * Increase the maximum number of bezier coordinates (reference
+ https://github.com/ImageMagick/ImageMagick/issues/1784).
+ * Santize "'" from SHOW and WIN delegates under Linux, '"\' for Windows
+ (thanks to Enzo Puig).
+ * Correct for TGA orientation (reference
+ https://imagemagick.org/discourse-server/viewtopic.php?f=3&t=34757).
+ * The result for -compose Copy -extent on a MYK image is CMYK (reference
+ https://imagemagick.org/discourse-server/viewtopic.php?f=3&t=37118).
+ * Fix potential buffer overflow when reading a fax image (alert from
+ Justin).
+ * Support dng:use-camera-wb option.
+- added patches
+ https://github.com/ImageMagick/ImageMagick/issues/1792
+ + ImageMagick-targa.patch
+
+-------------------------------------------------------------------
+Wed Nov 20 08:08:39 UTC 2019 - pgajdos@suse.com
+
+- version update to 7.0.9.5
+ * Ensure Ascii85 compression is thread safe.
+ * Santize ';' from SHOW and WIN delegates.
+ * Add exception parameter to CMS transform methods.
+ * Output exception there is an attempt to perform an operation not allowed by
+ the security policy
+ * JPEG and JPG are aliases in coder security policy.
+ * Fixed numerous issues posted to GitHub
+
+-------------------------------------------------------------------
Wed Oct 30 09:51:39 UTC 2019 - pgajdos@suse.com
- version update to 7.0.9.1
diff --git a/packages/i/ImageMagick/ImageMagick.spec b/packages/i/ImageMagick/ImageMagick.spec
index 294e844..a8feb3c 100644
--- a/packages/i/ImageMagick/ImageMagick.spec
+++ b/packages/i/ImageMagick/ImageMagick.spec
@@ -20,7 +20,7 @@
%define asan_build 0
%define maj 7
%define mfr_version %{maj}.0.9
-%define mfr_revision 1
+%define mfr_revision 6
%define quantum_depth 16
%define source_version %{mfr_version}-%{mfr_revision}
%define clibver 7
@@ -49,6 +49,8 @@ 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/1792
+Patch4: ImageMagick-targa.patch
BuildRequires: chrpath
BuildRequires: fdupes
BuildRequires: gcc-c++
@@ -333,6 +335,7 @@ preserved.
%ifarch s390x s390 ppc ppc64
%patch3 -p1
%endif
+%patch4 -p1
%build
# bsc#1088463