From 0a99fb041cc4b609c3ca7248108084f8ae6859a2e066728d25ca630bfa715453 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Wed, 28 Jun 2017 07:44:52 +0000 Subject: [PATCH 1/2] - updated to 7.0.6-0 * coders/png.c: Accept exIf chunks whose data segment erroneously begins with "Exif\0\0". * Introduce SetMagickSecurityPolicy() (MagickCore) and MagickSetSecurityPolicy() (MagickWand) to set the ImageMagick security policy (reference https://github.com/ImageMagick/ImageMagick/issues/407). * Removed experimental PNG zxIF chunk support; the proposal is dead. * Fix choppy bitmap font rendering (reference https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=32071). * The +opaque option is not longer a noop (reference https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=32081). * Add support for 'hex:' property. * Transient error validating the JPEG-2000 image format (reference https://github.com/ImageMagick/ImageMagick/issues/501). * Properly allocate DCM image colormap (reference https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=32063). * Improper allocation of memory for IM instances without threads (reference https://github.com/ImageMagick/ImageMagick/issues/497). * Delete corrupt image from list (reference https://github.com/ImageMagick/ImageMagick/issues/500). * Support various image operators for the compare utility (reference https://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=31938). OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=289 --- .gitattributes | 2 ++ ImageMagick-7.0.5-6.tar.xz | 3 --- ImageMagick-7.0.5-6.tar.xz.asc | 16 -------------- ImageMagick-7.0.6-0.tar.xz | 3 +++ ImageMagick-7.0.6-0.tar.xz.asc | 16 ++++++++++++++ ImageMagick-disable-insecure-coders.patch | 10 ++++----- ImageMagick.changes | 26 +++++++++++++++++++++++ ImageMagick.spec | 4 ++-- tarball_name | 3 +++ 9 files changed, 57 insertions(+), 26 deletions(-) delete mode 100644 ImageMagick-7.0.5-6.tar.xz delete mode 100644 ImageMagick-7.0.5-6.tar.xz.asc create mode 100644 ImageMagick-7.0.6-0.tar.xz create mode 100644 ImageMagick-7.0.6-0.tar.xz.asc create mode 100644 tarball_name diff --git a/.gitattributes b/.gitattributes index 9b03811..b6539d0 100644 --- a/.gitattributes +++ b/.gitattributes @@ -21,3 +21,5 @@ *.xz filter=lfs diff=lfs merge=lfs -text *.zip filter=lfs diff=lfs merge=lfs -text *.zst filter=lfs diff=lfs merge=lfs -text +## Specific LFS patterns +tarball_name filter=lfs diff=lfs merge=lfs -text diff --git a/ImageMagick-7.0.5-6.tar.xz b/ImageMagick-7.0.5-6.tar.xz deleted file mode 100644 index 425d45f..0000000 --- a/ImageMagick-7.0.5-6.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f60c3e3466ccbf9a0e643284ffec3467363edf9611f16a98387f927a974b49ab -size 8274620 diff --git a/ImageMagick-7.0.5-6.tar.xz.asc b/ImageMagick-7.0.5-6.tar.xz.asc deleted file mode 100644 index 52bc795..0000000 --- a/ImageMagick-7.0.5-6.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIcBAABAgAGBQJZFutmAAoJEImrY9SCdzd62CkP/2Bb9jUrMMvfDT/DO7sdU6SQ -UoStYhluPr33nxwU3FDSRyNoqEVr/sj9thuhAVMabZpp/cRw/yZx8GmKIBEMWKuK -kBAk7Kl890pvg41GsNZiQ6MmBoetmdEFGOq/uZJbAcgSKSNAoEZvGY2V195rLhIN -mGyYtLaqXps1A17qzpowgHV2dVVfahv9PhwM1ADXTqBDfC3nlkzp40m0cnpR7C3D -5WBSQkzWrAiKi5Uxr8Z4jwiKKkKRTUMRUsJ41Kb7RRq1fAk/u30UckT20Joui/EV -hrPw7uQffn/v/gqwwTBy4/5ZBpl7Gx1tO5iZlY5CLjJ0u7H2LS05eyxosaKixuSM -elPUoZQH4WBK0aJ4abaJ6JfXIHbNw93L0zfZCVIIhEacbVN3zegJNEqIJGdkgsiH -X9VJ49/h2lH0W3BmMMCFMQwvfF9P1b3rIMvdU/6XIoAsDFqRIWAGQYEKcGycS820 -EEXYRE3cusfO8VMY6l4RLTNTG0yw5oCTLUqY9UP8e3+y83VN8cuXjy16i1v/GeHR -dw+7ZHoruV+ZKwMGzxvuqFJH2AO/+t92pNZMVMayEffq+Xa2AseDxZOAut6Jcz9P -rwP0UFtrU6mlCONcK+Qg9FtEjcvLdneuEsfEQUIUhTJzriqnrV41zOMke4dEx2AD -jDVd0XUWcQLCUzSzK7KK -=1Q6I ------END PGP SIGNATURE----- diff --git a/ImageMagick-7.0.6-0.tar.xz b/ImageMagick-7.0.6-0.tar.xz new file mode 100644 index 0000000..0556682 --- /dev/null +++ b/ImageMagick-7.0.6-0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31587e2aa4d46301461329fd88d4ed6fccb0bd4ae786d629a153df72dbac89ee +size 8261556 diff --git a/ImageMagick-7.0.6-0.tar.xz.asc b/ImageMagick-7.0.6-0.tar.xz.asc new file mode 100644 index 0000000..edb47ff --- /dev/null +++ b/ImageMagick-7.0.6-0.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIcBAABAgAGBQJZPY+QAAoJEImrY9SCdzd6hkkQAJs0qiZ3VLh9wX6oxV5czhn+ +JSlvx5DYYFTMYfFnKrTdBImOsHeaKOXvYbT9u/KTQtiSFQ+pt7okqUcrb+5mZuP4 +JDLeYVa5NLDoMNdAdji0lGhLfxyZKLDw8P1e+y/jEHx4gUl8Xlo8hN6iGOYPfoLU +hvBg3w5/W75BHvLy72CpCiYWx+czh1FSZ77ML/ehYrn2aK5A/466KSlG/LxM/1GA +uo84AqWUpv2OJBo5DgvYwa6ea75OXmFDPMFUD2r4WB4p3dQObIpoSjy2viU8Q8XV +LYKZaE2j4bMulcfjc2Da2KGHV1PlZTjG01CaFeK0awLCLF8mW4Wv2RN5a4VthKBQ +p6fLf/bcwnPiCDtJsraP3GFYcP/6pt6h5Lm+nS694+s4zxpuEwLRczHmL+RKWOTs +dqNcjRACF/7NocB5T18sxdKvBQX3dBI+CAZdTlZ5IXe5aq2nlF0XMys+xznrCiq+ +cs+vVsr5CjMeBPYukZrMGY6REYuWYJFt8s2lD7H8/rXqE9UtPgCsnnUYk/XHwi5o +osEYLEErtMkGIUPVjG/n/9QyJWy1kf67d8VmLHGUew49uUU8dr0krCUM/IGEZ5cH +aoLQeMV+LxlBF5bjSjri5OqFEGMzysdzhteBfHMxxHw2xXb0viCLoZO52uYXrw1s +vmWpUv2jvy5mJBP0SgAm +=VIBP +-----END PGP SIGNATURE----- diff --git a/ImageMagick-disable-insecure-coders.patch b/ImageMagick-disable-insecure-coders.patch index 4ef636a..3232ecc 100644 --- a/ImageMagick-disable-insecure-coders.patch +++ b/ImageMagick-disable-insecure-coders.patch @@ -1,11 +1,11 @@ -Index: ImageMagick-6.9.8-2/config/policy.xml +Index: ImageMagick-7.0.6-0/config/policy.xml =================================================================== ---- 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 @@ +--- ImageMagick-7.0.6-0.orig/config/policy.xml 2017-06-28 09:11:49.170299620 +0200 ++++ ImageMagick-7.0.6-0/config/policy.xml 2017-06-28 09:13:16.191813685 +0200 +@@ -76,4 +76,15 @@ - + + + + diff --git a/ImageMagick.changes b/ImageMagick.changes index e21ab25..5fec37d 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Wed Jun 28 07:18:12 UTC 2017 - pgajdos@suse.com + +- updated to 7.0.6-0 + * coders/png.c: Accept exIf chunks whose data segment + erroneously begins with "Exif\0\0". + * Introduce SetMagickSecurityPolicy() (MagickCore) and + MagickSetSecurityPolicy() (MagickWand) to set the ImageMagick security + policy (reference https://github.com/ImageMagick/ImageMagick/issues/407). + * Removed experimental PNG zxIF chunk support; the proposal is dead. + * Fix choppy bitmap font rendering (reference + https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=32071). + * The +opaque option is not longer a noop (reference + https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=32081). + * Add support for 'hex:' property. + * Transient error validating the JPEG-2000 image format (reference + https://github.com/ImageMagick/ImageMagick/issues/501). + * Properly allocate DCM image colormap (reference + https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=32063). + * Improper allocation of memory for IM instances without threads (reference + https://github.com/ImageMagick/ImageMagick/issues/497). + * Delete corrupt image from list (reference + https://github.com/ImageMagick/ImageMagick/issues/500). + * Support various image operators for the compare utility (reference + https://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=31938). + ------------------------------------------------------------------- Fri May 19 08:49:39 UTC 2017 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index a6db18c..b6a99d5 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -54,8 +54,8 @@ BuildRequires: xz BuildRequires: zip %define maj 7 -%define mfr_version %{maj}.0.5 -%define mfr_revision 6 +%define mfr_version %{maj}.0.6 +%define mfr_revision 0 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} %define clibver 2 diff --git a/tarball_name b/tarball_name new file mode 100644 index 0000000..0556682 --- /dev/null +++ b/tarball_name @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31587e2aa4d46301461329fd88d4ed6fccb0bd4ae786d629a153df72dbac89ee +size 8261556 From 4ce13e22f4e3dde13f77dbb7d89f3365ef8f3451c16d7f482780ea87fe6e4b59 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Fri, 30 Jun 2017 15:45:56 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=290 --- .gitattributes | 2 -- tarball_name | 3 --- 2 files changed, 5 deletions(-) delete mode 100644 tarball_name diff --git a/.gitattributes b/.gitattributes index b6539d0..9b03811 100644 --- a/.gitattributes +++ b/.gitattributes @@ -21,5 +21,3 @@ *.xz filter=lfs diff=lfs merge=lfs -text *.zip filter=lfs diff=lfs merge=lfs -text *.zst filter=lfs diff=lfs merge=lfs -text -## Specific LFS patterns -tarball_name filter=lfs diff=lfs merge=lfs -text diff --git a/tarball_name b/tarball_name deleted file mode 100644 index 0556682..0000000 --- a/tarball_name +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:31587e2aa4d46301461329fd88d4ed6fccb0bd4ae786d629a153df72dbac89ee -size 8261556