From 86e9db7524aef50fa78f4e2fe1cc90b3409d1b4830f377a9bf13107a88d36eec Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 20 Mar 2017 14:29:08 +0000 Subject: [PATCH] - updated to 6.8.8-2 * Support namespaces for the security policy. * Respect throttle policy. * Support the -authenticate option for PDF. * Fix Spurious memory allocation message. * Identical images should return inf for PSNR. * Fixed fd leak for webp coder. * Prevent random pixel data for corrupt JPEG image. * Support pixel-cache and shred security policies. * Fixed memory leak when creating nested exceptions in Magick++. * Eliminate bogus assertion. * Unbreak build without JPEG support. OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=276 --- ...gick-6.8.8-1-disable-insecure-coders.patch | 12 ++++----- ImageMagick-6.9.7-7.tar.xz | 3 --- ImageMagick-6.9.7-7.tar.xz.asc | 16 ------------ ImageMagick-6.9.8-2.tar.xz | 3 +++ ImageMagick-6.9.8-2.tar.xz.asc | 16 ++++++++++++ ImageMagick-montage.t.patch | 25 +++++++++++++++++++ ImageMagick.changes | 16 ++++++++++++ ImageMagick.spec | 6 +++-- 8 files changed, 70 insertions(+), 27 deletions(-) delete mode 100644 ImageMagick-6.9.7-7.tar.xz delete mode 100644 ImageMagick-6.9.7-7.tar.xz.asc create mode 100644 ImageMagick-6.9.8-2.tar.xz create mode 100644 ImageMagick-6.9.8-2.tar.xz.asc create mode 100644 ImageMagick-montage.t.patch diff --git a/ImageMagick-6.8.8-1-disable-insecure-coders.patch b/ImageMagick-6.8.8-1-disable-insecure-coders.patch index 1d86708..4ef636a 100644 --- a/ImageMagick-6.8.8-1-disable-insecure-coders.patch +++ b/ImageMagick-6.8.8-1-disable-insecure-coders.patch @@ -1,10 +1,10 @@ -Index: ImageMagick-6.9.6-5/config/policy.xml +Index: ImageMagick-6.9.8-2/config/policy.xml =================================================================== ---- ImageMagick-6.9.6-5.orig/config/policy.xml 2016-11-15 12:05:54.000000000 +0100 -+++ ImageMagick-6.9.6-5/config/policy.xml 2016-11-22 10:30:23.722541610 +0100 -@@ -65,4 +65,15 @@ - - +--- ImageMagick-6.9.8-2.orig/config/policy.xml 2017-03-19 00:28:24.000000000 +0100 ++++ ImageMagick-6.9.8-2/config/policy.xml 2017-03-20 14:05:22.979847731 +0100 +@@ -81,4 +81,15 @@ + + + + diff --git a/ImageMagick-6.9.7-7.tar.xz b/ImageMagick-6.9.7-7.tar.xz deleted file mode 100644 index 3a965bc..0000000 --- a/ImageMagick-6.9.7-7.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c23420e208d8c90bd7c05d7a3f14e976b479a93ceb3354dd4d84c830fe30a40b -size 8798164 diff --git a/ImageMagick-6.9.7-7.tar.xz.asc b/ImageMagick-6.9.7-7.tar.xz.asc deleted file mode 100644 index 969b271..0000000 --- a/ImageMagick-6.9.7-7.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIcBAABAgAGBQJYlf4ZAAoJEImrY9SCdzd6yA0P/1dt9hZqn3K6UtyTOeZJ0bOc -aT7ZJDn5O3eSRqHZB31heJlhZgJD4g5cwDkwoU2nC4m/S/+6x3dwwCdFtmMh8fyS -Dt++YYFuJMLjChh4l5JuDwKd5RmaiLgCo0W0DGk6p8dL1fxB6hCDcmR9piFp2hJU -5ZPH8InXY7vlS2Pv+iXqSqPGjdIUBXcmmNcBsRIYb+KVKKSjQq2J3yLRWfOF9AJH -dspb2juW3wJz6ey9mQId795p7PIMOndsBYoSuLVhlBbrztuqWuKpaTNs9JGmYPIB -GOrY71B/g0a7zhGJKjw3F5yKBTmnHR7LmZzhKCmLQdZ+lkFoIHDZL4mrahpNEPsz -DvQuyee2QgHNh1AeeKQsPy/q/H6OEL6lhxWWZ5b7k1bBkVdkpJI7ZyGGhrhvV6AE -aPlI3NBPczIi52whLpBVE1dLcEkHQVD7sUffw7tSBZUGuWBSJozRyj7Ri8UVcOVE -sW0NGl3/EKkrItr2VB6WcoiGMaH3ESCd/sfGV1qNz4zm6FnjHkR0vT5pb1pZ2kYt -EIFbMcttVq9kw9VprrT7YmxCRIlGnost8OgGommBIaL/3VRFGqeb0q+W1pwNFRSQ -2jnyDu2EsIn6qklSX0kmgVRwt0OtCVKFzXMvtOFtWkfu4QrYKOd1b7lT/OhTfxxl -kTW9why7LAExUDEXfyhJ -=ttT+ ------END PGP SIGNATURE----- diff --git a/ImageMagick-6.9.8-2.tar.xz b/ImageMagick-6.9.8-2.tar.xz new file mode 100644 index 0000000..2012057 --- /dev/null +++ b/ImageMagick-6.9.8-2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be809993975dbc84b69987a8b914b656849351396c519b54199083967fceb143 +size 9041700 diff --git a/ImageMagick-6.9.8-2.tar.xz.asc b/ImageMagick-6.9.8-2.tar.xz.asc new file mode 100644 index 0000000..2f081c9 --- /dev/null +++ b/ImageMagick-6.9.8-2.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIcBAABAgAGBQJYzwUmAAoJEImrY9SCdzd6zfsQALCX7jCrEE64DlFshM5+y1gc +zZwPOZNnUy5c3dt7ERfiWLy6XeZE0TgLPYcC3/Lw/ZRusG1FpVEquCjI/GvcuXug +vOJzZ0gP3tBKrisQxfn1D6/VY94Rki8OIS56vGAtGInFkBpaoEdc4b98xHHeyrNk +fY/mhvmAKimTmLu9upkPbDDRT7MecJsJHZMfmrwijq7EZdGcBfjAPGb7rmwdhNff +T2wk4ukEuVRnR3v4jzjrhvLqOfCttLOngBQa21rA2ZUM8pjeBc55emdhaDJvEitG +vATRhsFTBTczWk4rEIW0McuF+R8pWq4Br5IiXZKq3HdJSPP0A8crqCuvBzYCjlML +TXwgUa9RVwVDSoSrbPoPqne21up57YqBUZ/ZFYq2i5F451+b8ikwwnkudIahgloR +9uqXUsdHN06VL8MJFKMjJETHQhaoa3J3gDE8nWNRSSuWGUtTTDNuPy8P7bVsG7AH +Xwoup7NLd/MO5qHHXG87RMZ3YughRywnsUnFpgE7L6lk/qwlUasiY8x2OKWiCfNq +cs8dILjR6CTRULXF+dGg+LX2PrC3Yc9JqpXaD4kPQnydj/aJIw87QaSwFIDMmUtO +zl3QJ/+bUC7WQ5hKFp0LaC4HQepcpni/6Aebbf9ruCo9th7eZN4Y2KnFmRfe314A +IYZ3JDynDFUjPlACJ4HF +=kb7Q +-----END PGP SIGNATURE----- diff --git a/ImageMagick-montage.t.patch b/ImageMagick-montage.t.patch new file mode 100644 index 0000000..6dec273 --- /dev/null +++ b/ImageMagick-montage.t.patch @@ -0,0 +1,25 @@ +Revert this patch for 6.8.9-2 +https://github.com/ImageMagick/ImageMagick/commit/56d460bf2bc74bed22bed8dfe1cb0479035a24f7 + +From 56d460bf2bc74bed22bed8dfe1cb0479035a24f7 Mon Sep 17 00:00:00 2001 +From: Cristy +Date: Thu, 16 Feb 2017 10:54:27 -0500 +Subject: [PATCH] ... + +--- + PerlMagick/t/montage.t | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/PerlMagick/t/montage.t b/PerlMagick/t/montage.t +index 16f6e2d..b323bfe 100644 +--- a/PerlMagick/t/montage.t ++++ b/PerlMagick/t/montage.t +@@ -165,7 +165,7 @@ testMontage( q/bordercolor=>'blue', mattecolor=>'red'/, + q/background=>'#696e7e',, tile=>'4x4', geometry=>'90x80+6+6>', frame=>'8x10', + borderwidth=>'0', gravity=>'Center', shadow=>'True', texture=>'granite:'/, + '8418407b6d56d2c1b67bc735004794d9eb20609d30115a93255eefcad3499e95', +- '9209b2db884fa4730eeab6c410b90e094fa305635baab7ede17270c13f6e80ad', ++ '35864982c2d66e1f9f4ac8150a7f8bd0926d0d48a2b4602bb229f878bd4d8752', + '5793a1de15b5d73df297968af79fa01a110c1585cccd46dcbef794674ab5f174'); + + # diff --git a/ImageMagick.changes b/ImageMagick.changes index 6e5de99..43528cb 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Mar 20 14:21:31 UTC 2017 - pgajdos@suse.com + +- updated to 6.8.8-2 + * Support namespaces for the security policy. + * Respect throttle policy. + * Support the -authenticate option for PDF. + * Fix Spurious memory allocation message. + * Identical images should return inf for PSNR. + * Fixed fd leak for webp coder. + * Prevent random pixel data for corrupt JPEG image. + * Support pixel-cache and shred security policies. + * Fixed memory leak when creating nested exceptions in Magick++. + * Eliminate bogus assertion. + * Unbreak build without JPEG support. + ------------------------------------------------------------------- Mon Feb 13 14:55:23 UTC 2017 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index ff0a787..b4302de 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -62,8 +62,8 @@ BuildRequires: xz BuildRequires: zip %define maj 6 -%define mfr_version %{maj}.9.7 -%define mfr_revision 7 +%define mfr_version %{maj}.9.8 +%define mfr_revision 2 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} %define clibver 4 @@ -92,6 +92,7 @@ Patch4: ImageMagick-6.8.5.7-no-XPMCompliance.patch # bugs # will ask upstream if needed, or if other solution exists Patch11: ImageMagick-6.8.4.0-dont-build-in-install.patch +Patch12: ImageMagick-montage.t.patch Patch20: ImageMagick-6.8.8-1-disable-insecure-coders.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -252,6 +253,7 @@ HTML documentation for ImageMagick library and scene examples. %patch3 %patch4 %patch11 +%patch12 -p1 -R %patch20 -p1 # remove executeable bits from per demos