From 623165630bfd6e166db1accd3c79806ff3129919 Mon Sep 17 00:00:00 2001 From: Tomas Smetana Date: Thu, 7 Oct 2010 15:41:57 +0200 Subject: [PATCH] - new upstream version --- .gitignore | 1 + imlib2-1.4.3-cve-2010-0991.patch | 11 ----------- imlib2.spec | 7 ++++--- sources | 2 +- 4 files changed, 6 insertions(+), 15 deletions(-) delete mode 100644 imlib2-1.4.3-cve-2010-0991.patch diff --git a/.gitignore b/.gitignore index 3c70395..a6377b0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ imlib2-1.4.3.tar.bz2 +/imlib2-1.4.4.tar.bz2 diff --git a/imlib2-1.4.3-cve-2010-0991.patch b/imlib2-1.4.3-cve-2010-0991.patch deleted file mode 100644 index 1ff1847..0000000 --- a/imlib2-1.4.3-cve-2010-0991.patch +++ /dev/null @@ -1,11 +0,0 @@ -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 diff --git a/imlib2.spec b/imlib2.spec index cd6d6ca..a54151c 100644 --- a/imlib2.spec +++ b/imlib2.spec @@ -1,6 +1,6 @@ Summary: Image loading, saving, rendering, and manipulation library Name: imlib2 -Version: 1.4.3 +Version: 1.4.4 Release: 1%{?dist} License: Imlib2 Group: System Environment/Libraries @@ -8,7 +8,6 @@ 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.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,7 +57,6 @@ conditions of the GPL version 2 (or at your option) any later version. %prep %setup -q %patch0 -p1 -b .multilib -%patch1 -p1 -b .cve-2010-0991 %build asmopts="--disable-mmx --disable-amd64" @@ -117,6 +115,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Oct 07 2010 Tomas Smetana - 1.4.4-1 +- new upstream version + * Fri Apr 23 2010 Tomas Smetana - 1.4.3-1 - new upstream version - patch for CVE-2010-0991 diff --git a/sources b/sources index 5a00e2a..1d8bb0b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cdac0d47eca6023e3e2a18584d3f6940 imlib2-1.4.3.tar.bz2 +b6de51879502e857d5b1f7622267a030 imlib2-1.4.4.tar.bz2