From 7fee334d387b8c0ebff8a28d0cc6050583670238de0e6dcb752eeff717ede168 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Wed, 23 Feb 2011 16:53:30 +0000 Subject: [PATCH 1/3] Accepting request 62334 from home:jnweiger:branches:graphics OBS-URL: https://build.opensuse.org/request/show/62334 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=56 --- ImageMagick.changes | 6 ++++++ ImageMagick.spec | 8 +++++--- survive-exif.patch | 20 ++++++++++++++++++++ 3 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 survive-exif.patch diff --git a/ImageMagick.changes b/ImageMagick.changes index 891e093..3fd9275 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Feb 21 14:51:56 UTC 2011 - jw@novell.com + +- added patch for crash reading png with exif + [bnc#673789] + ------------------------------------------------------------------- Mon Feb 14 10:09:28 CET 2011 - pgajdos@suse.cz diff --git a/ImageMagick.spec b/ImageMagick.spec index 5c4ddf1..e5ca197 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,7 +1,7 @@ # -# spec file for package ImageMagick (Version 6.6.5.8) +# spec file for package ImageMagick # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,7 +30,7 @@ License: Public Domain, Freeware Group: Productivity/Graphics/Other AutoReqProv: on Version: 6.6.5.8 -Release: 2 +Release: 3 %define source_version 6.6.5-8 %define libver 4 Summary: Viewer and Converter for Images @@ -42,6 +42,7 @@ Source2: xtp-%{xtp_version}.tar.bz2 Source3: baselibs.conf Patch1: ImageMagick-%{version}-examples.patch Patch2: ImageMagick-%{version}-doc.patch +Patch3: survive-exif.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %package -n perl-PerlMagick @@ -119,6 +120,7 @@ rm -rf xtp-%{xtp_version} %setup -n ImageMagick-%{source_version} -b 2 %patch1 %patch2 +%patch3 -p1 %build %define system_ltdl 0 diff --git a/survive-exif.patch b/survive-exif.patch new file mode 100644 index 0000000..d18b87b --- /dev/null +++ b/survive-exif.patch @@ -0,0 +1,20 @@ +--- ImageMagick-6.6.7-8/magick/property.c.orig 2010-12-24 14:44:32.000000000 +0100 ++++ ImageMagick-6.6.7-8/magick/property.c 2011-02-21 15:09:40.008402000 +0100 +@@ -2012,9 +2012,14 @@ MagickExport const char *GetImagePropert + { + if (GetEXIFProperty(image,property) != MagickFalse) + { +- p=(const char *) GetValueFromSplayTree((SplayTreeInfo *) +- image->properties,property); +- return(p); ++ // FIXME: GetEXIFProperty should have return MagickFalse, if it failed, no? ++ // I see here a false positive of exif:Orientation, which exiftool does not see. ++ if (image->properties) ++ { ++ p=(const char *) GetValueFromSplayTree((SplayTreeInfo *) ++ image->properties,property); ++ return(p); ++ } + } + } + break; From ac846029b5acc94e62a8e951cd6f8cebd42df6c5e33e103069b2d517d99de348 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Wed, 23 Feb 2011 19:15:00 +0000 Subject: [PATCH 2/3] - updated to 6.6.7.9: fixes [bnc#673789] OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=57 --- ImageMagick-6.6.5-8.tar.bz2 | 3 --- ImageMagick-6.6.7-9.tar.bz2 | 3 +++ ...doc.patch => ImageMagick-6.6.7.9-doc.patch | 0 ...atch => ImageMagick-6.6.7.9-examples.patch | 0 ImageMagick.changes | 5 +++++ ImageMagick.spec | 6 ++---- survive-exif.patch | 20 ------------------- 7 files changed, 10 insertions(+), 27 deletions(-) delete mode 100644 ImageMagick-6.6.5-8.tar.bz2 create mode 100644 ImageMagick-6.6.7-9.tar.bz2 rename ImageMagick-6.6.5.8-doc.patch => ImageMagick-6.6.7.9-doc.patch (100%) rename ImageMagick-6.6.5.8-examples.patch => ImageMagick-6.6.7.9-examples.patch (100%) delete mode 100644 survive-exif.patch diff --git a/ImageMagick-6.6.5-8.tar.bz2 b/ImageMagick-6.6.5-8.tar.bz2 deleted file mode 100644 index 064a05a..0000000 --- a/ImageMagick-6.6.5-8.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2b9611ed9ed66b49e9b8e5f91f1d2502f55725ae486b16b557ff889c9c0d74f8 -size 8703988 diff --git a/ImageMagick-6.6.7-9.tar.bz2 b/ImageMagick-6.6.7-9.tar.bz2 new file mode 100644 index 0000000..d4bdbcb --- /dev/null +++ b/ImageMagick-6.6.7-9.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c156a20dfe2f7819d51ba6ea19faae96d1617abb7c08c055d3ce5ddd27700985 +size 10132009 diff --git a/ImageMagick-6.6.5.8-doc.patch b/ImageMagick-6.6.7.9-doc.patch similarity index 100% rename from ImageMagick-6.6.5.8-doc.patch rename to ImageMagick-6.6.7.9-doc.patch diff --git a/ImageMagick-6.6.5.8-examples.patch b/ImageMagick-6.6.7.9-examples.patch similarity index 100% rename from ImageMagick-6.6.5.8-examples.patch rename to ImageMagick-6.6.7.9-examples.patch diff --git a/ImageMagick.changes b/ImageMagick.changes index 3fd9275..e125d70 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 23 20:14:56 CET 2011 - pgajdos@suse.cz + +- updated to 6.6.7.9: fixes [bnc#673789] + ------------------------------------------------------------------- Mon Feb 21 14:51:56 UTC 2011 - jw@novell.com diff --git a/ImageMagick.spec b/ImageMagick.spec index e5ca197..e22f3b4 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -29,9 +29,9 @@ Provides: imagemag License: Public Domain, Freeware Group: Productivity/Graphics/Other AutoReqProv: on -Version: 6.6.5.8 +Version: 6.6.7.9 Release: 3 -%define source_version 6.6.5-8 +%define source_version 6.6.7-9 %define libver 4 Summary: Viewer and Converter for Images Url: http://www.imagemagick.org @@ -42,7 +42,6 @@ Source2: xtp-%{xtp_version}.tar.bz2 Source3: baselibs.conf Patch1: ImageMagick-%{version}-examples.patch Patch2: ImageMagick-%{version}-doc.patch -Patch3: survive-exif.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %package -n perl-PerlMagick @@ -120,7 +119,6 @@ rm -rf xtp-%{xtp_version} %setup -n ImageMagick-%{source_version} -b 2 %patch1 %patch2 -%patch3 -p1 %build %define system_ltdl 0 diff --git a/survive-exif.patch b/survive-exif.patch deleted file mode 100644 index d18b87b..0000000 --- a/survive-exif.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- ImageMagick-6.6.7-8/magick/property.c.orig 2010-12-24 14:44:32.000000000 +0100 -+++ ImageMagick-6.6.7-8/magick/property.c 2011-02-21 15:09:40.008402000 +0100 -@@ -2012,9 +2012,14 @@ MagickExport const char *GetImagePropert - { - if (GetEXIFProperty(image,property) != MagickFalse) - { -- p=(const char *) GetValueFromSplayTree((SplayTreeInfo *) -- image->properties,property); -- return(p); -+ // FIXME: GetEXIFProperty should have return MagickFalse, if it failed, no? -+ // I see here a false positive of exif:Orientation, which exiftool does not see. -+ if (image->properties) -+ { -+ p=(const char *) GetValueFromSplayTree((SplayTreeInfo *) -+ image->properties,property); -+ return(p); -+ } - } - } - break; From b7890530190bde710d49e9a1538895c32ac2621f735dd21a2145dcfb6ffcc8c1 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Wed, 23 Feb 2011 19:16:52 +0000 Subject: [PATCH 3/3] * removed survive-exif.patch OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=58 --- ImageMagick.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/ImageMagick.changes b/ImageMagick.changes index e125d70..b2b053f 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -2,6 +2,7 @@ Wed Feb 23 20:14:56 CET 2011 - pgajdos@suse.cz - updated to 6.6.7.9: fixes [bnc#673789] + * removed survive-exif.patch ------------------------------------------------------------------- Mon Feb 21 14:51:56 UTC 2011 - jw@novell.com