rpms/imlib2/F-13 imlib2-1.4.3-cve-2010-0991.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 imlib2.spec, 1.39, 1.40 sources, 1.10, 1.11 imlib2-1.4.2-cve-2008-5187, 1.1, NONE

[Tomas Smetana]

Author: tsmetana

Update of /cvs/pkgs/rpms/imlib2/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28606

Modified Files:
	.cvsignore imlib2.spec sources 
Added Files:
	imlib2-1.4.3-cve-2010-0991.patch 
Removed Files:
	imlib2-1.4.2-cve-2008-5187 
Log Message:
* Fri Apr 23 2010 Tomas Smetana <tsmetana at redhat.com> - 1.4.3-1
- new upstream version
- patch for CVE-2010-0991


imlib2-1.4.3-cve-2010-0991.patch:
 image.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE imlib2-1.4.3-cve-2010-0991.patch ---
diff -up imlib2-1.4.3/src/lib/image.h.cve-2010-0991 imlib2-1.4.3/src/lib/image.h
--- imlib2-1.4.3/src/lib/image.h.cve-2010-0991	2010-04-23 10:06:04.000000000 +0200
+++ imlib2-1.4.3/src/lib/image.h	2010-04-23 10:06:25.000000000 +0200
@@ -190,6 +190,6 @@ __hidden void              __imlib_SaveI
 
 # define IMAGE_DIMENSIONS_OK(w, h) \
    ( ((w) > 0) && ((h) > 0) && \
-     ((unsigned long long)(w) * (unsigned long long)(w) <= (1ULL << 29) - 1) )
+     ((unsigned long long)(w) * (unsigned long long)(h) <= (1ULL << 29) - 1) )
 
 #endif


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/imlib2/F-13/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	21 Oct 2008 11:22:13 -0000	1.9
+++ .cvsignore	23 Apr 2010 08:32:39 -0000	1.10
@@ -1 +1 @@
-imlib2-1.4.2.tar.bz2
+imlib2-1.4.3.tar.bz2


Index: imlib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imlib2/F-13/imlib2.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- imlib2.spec	1 Feb 2010 15:17:08 -0000	1.39
+++ imlib2.spec	23 Apr 2010 08:32:40 -0000	1.40
@@ -1,14 +1,14 @@
 Summary:        Image loading, saving, rendering, and manipulation library
 Name:           imlib2
-Version:        1.4.2
-Release:        6%{?dist}
+Version:        1.4.3
+Release:        1%{?dist}
 License:        Imlib2
 Group:          System Environment/Libraries
 URL:            http://docs.enlightenment.org/api/imlib2/html/
 Source0:        http://downloads.sourceforge.net/enlightenment/%{name}-%{version}.tar.bz2
 # Fedora specific multilib hack, upstream should switch to pkgconfig one day
 Patch0:         imlib2-1.3.0-multilib.patch
-Patch1:         imlib2-1.4.2-cve-2008-5187
+Patch1:         imlib2-1.4.3-cve-2010-0991.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libjpeg-devel libpng-devel libtiff-devel
 BuildRequires:  giflib-devel freetype-devel >= 2.1.9-4 libtool bzip2-devel
@@ -58,8 +58,7 @@ conditions of the GPL version 2 (or at y
 %prep
 %setup -q
 %patch0 -p1 -b .multilib
-%patch1 -p1 -b .cve-2008-5187
-
+%patch1 -p1 -b .cve-2010-0991
 
 %build
 asmopts="--disable-mmx --disable-amd64"
@@ -96,7 +95,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING AUTHORS README ChangeLog TODO
+%doc COPYING AUTHORS README TODO
 %{_libdir}/libImlib2.so.*
 %dir %{_libdir}/imlib2/
 %dir %{_libdir}/imlib2/filters/
@@ -118,6 +117,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Apr 23 2010 Tomas Smetana <tsmetana at redhat.com> - 1.4.3-1
+- new upstream version
+- patch for CVE-2010-0991
+
 * Mon Feb 01 2010 Tomas Smetana <tsmetana at redhat.com> - 1.4.2-6
 - fix #542607 - remove static libraries
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/imlib2/F-13/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	21 Oct 2008 11:22:14 -0000	1.10
+++ sources	23 Apr 2010 08:32:40 -0000	1.11
@@ -1 +1 @@
-9f15568e76ebda9092c571e0df261f54  imlib2-1.4.2.tar.bz2
+cdac0d47eca6023e3e2a18584d3f6940  imlib2-1.4.3.tar.bz2


--- imlib2-1.4.2-cve-2008-5187 DELETED ---