rpms/ImageMagick/F-11 .cvsignore, 1.26, 1.27 ImageMagick.spec, 1.90, 1.91 sources, 1.26, 1.27

[Pavel Alexeev]

Author: hubbitus

Update of /cvs/pkgs/rpms/ImageMagick/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4416

Modified Files:
	.cvsignore ImageMagick.spec sources 
Log Message:
- Fix BZ#503017 (CVE-2009-1882), BZ#543519 add patch2 ( http://people.debian.org/~naoliv/misc/imagemagick/SA35216.diff )
	to do not update and ABI change.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ImageMagick/F-11/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	13 Apr 2009 17:25:44 -0000	1.26
+++ .cvsignore	6 Jan 2010 20:07:08 -0000	1.27
@@ -1 +1,2 @@
 ImageMagick-6.5.1-2.tar.bz2
+ImageMagick-6.5.1-2-SA35216.diff


Index: ImageMagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ImageMagick/F-11/ImageMagick.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- ImageMagick.spec	13 Apr 2009 17:25:44 -0000	1.90
+++ ImageMagick.spec	6 Jan 2010 20:07:08 -0000	1.91
@@ -3,13 +3,15 @@
 
 Name:           ImageMagick
 Version:        %{VER}.%{Patchlevel}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An X application for displaying and manipulating images
 Group:          Applications/Multimedia
 License:        ImageMagick
 Url:            http://www.imagemagick.org/
 Source0:        ftp://ftp.ImageMagick.org/pub/%{name}/%{name}-%{VER}-%{Patchlevel}.tar.bz2
 Patch1:         ImageMagick-6.4.0-multilib.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=503017, http://people.debian.org/~naoliv/misc/imagemagick/SA35216.diff
+Patch2:		 ImageMagick-6.5.1-2-SA35216.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel
@@ -128,6 +130,9 @@ however.
 %prep
 %setup -q -n %{name}-%{VER}-%{Patchlevel}
 %patch1 -p1 -b .multilib
+
+%patch2 -p1 -b .CVE-2009-1882
+
 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
@@ -301,6 +306,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jan 6 2010 Pavel Alexeev <Pahan at Hubbitus.info> - 6.5.1.2-2
+- Fix BZ#503017 (CVE-2009-1882), BZ#543519 add patch2 ( http://people.debian.org/~naoliv/misc/imagemagick/SA35216.diff )
+	to do not update and ABI change.
+
 * Mon Apr 13 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 6.5.1.2-1
 - update to 6.5.1-2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ImageMagick/F-11/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	13 Apr 2009 17:25:44 -0000	1.26
+++ sources	6 Jan 2010 20:07:08 -0000	1.27
@@ -1 +1,2 @@
 ad7d28ccef6ba3ea7bb44039b3ff5048  ImageMagick-6.5.1-2.tar.bz2
+8c0a6747b6d8db8453850903bc2e1995  ImageMagick-6.5.1-2-SA35216.diff