[ImageMagick/f16] Add Patch3: ImageMagick-6.7.0-10-CVE-2012-0259.patch - http://www.imagemagick.org/discourse-server/v

[Pavel Alexeev]

commit b63c710a2874f4e7b5a3274826d6a7ffa108c91a
Author: Pavel Alexeev (aka Pahan-Hubbitus) <pahan at hubbitus.info>
Date:   Tue Jun 12 15:04:08 2012 +0400

    Add Patch3: ImageMagick-6.7.0-10-CVE-2012-0259.patch - http://www.imagemagick.org/discourse-server/viewtopic.php?f=4&t=20629 (bz#807993)
    
    - And Patch4: ImageMagick-6.7.0-10-CVE-2012-1620.patch - http://www.imagemagick.org/discourse-server/viewtopic.php?p=82865#p82865 (bz#807993)

 ImageMagick.spec |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)
---
diff --git a/ImageMagick.spec b/ImageMagick.spec
index 570c007..97ced08 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -3,7 +3,7 @@
 
 Name:           ImageMagick
 Version:        %{VER}.%{Patchlevel}
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        An X application for displaying and manipulating images
 Group:          Applications/Multimedia
 License:        ImageMagick
@@ -12,6 +12,11 @@ Source0:        ftp://ftp.ImageMagick.org/pub/%{name}/%{name}-%{VER}-%{Patchleve
 Patch1:         ImageMagick-6.4.0-multilib.patch
 #Upstream patch for ffmpeg support
 Patch2:         ImageMagick-delegates.patch
+# http://www.imagemagick.org/discourse-server/viewtopic.php?f=4&t=20629 (bz#807993)
+# Tiff part patch adopted to older IM version
+Patch3:         ImageMagick-6.7.0-10-CVE-2012-0259.patch
+# http://www.imagemagick.org/discourse-server/viewtopic.php?p=82865#p82865 (bz#807993)
+Patch4:         ImageMagick-6.7.0-10-CVE-2012-1610.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel
@@ -131,6 +136,10 @@ however.
 %setup -q -n %{name}-%{VER}-%{Patchlevel}
 %patch1 -p1 -b .multilib
 %patch2 -p0 -b .delegates
+%patch3 -p1 -b .CVE-2012-0259
+%patch4 -p1 -b .CVE-2012-1610
+
+
 sed -i 's/libltdl.la/libltdl.so/g' configure
 iconv -f ISO-8859-1 -t UTF-8 README.txt > README.txt.tmp
 touch -r README.txt README.txt.tmp
@@ -306,6 +315,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jun 12 2012 Pavel Alexeev <Pahan at Hubbitus.info> - 6.7.0.10-5
+- Add Patch3: ImageMagick-6.7.0-10-CVE-2012-0259.patch - http://www.imagemagick.org/discourse-server/viewtopic.php?f=4&t=20629 (bz#807993)
+- And Patch4: ImageMagick-6.7.0-10-CVE-2012-1620.patch - http://www.imagemagick.org/discourse-server/viewtopic.php?p=82865#p82865 (bz#807993)
+
 * Wed Nov 2 2011 Orion Poplawski <orion at cora.nwra.com> - 6.7.0.10-4
 - Patch delegates.xml for ffmpeg (bug #750383)