- new upstream version
This commit is contained in:
parent
9d6314968a
commit
623165630b
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
|||||||
imlib2-1.4.3.tar.bz2
|
imlib2-1.4.3.tar.bz2
|
||||||
|
/imlib2-1.4.4.tar.bz2
|
||||||
|
@ -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
|
|
@ -1,6 +1,6 @@
|
|||||||
Summary: Image loading, saving, rendering, and manipulation library
|
Summary: Image loading, saving, rendering, and manipulation library
|
||||||
Name: imlib2
|
Name: imlib2
|
||||||
Version: 1.4.3
|
Version: 1.4.4
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
License: Imlib2
|
License: Imlib2
|
||||||
Group: System Environment/Libraries
|
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
|
Source0: http://downloads.sourceforge.net/enlightenment/%{name}-%{version}.tar.bz2
|
||||||
# Fedora specific multilib hack, upstream should switch to pkgconfig one day
|
# Fedora specific multilib hack, upstream should switch to pkgconfig one day
|
||||||
Patch0: imlib2-1.3.0-multilib.patch
|
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)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
BuildRequires: libjpeg-devel libpng-devel libtiff-devel
|
BuildRequires: libjpeg-devel libpng-devel libtiff-devel
|
||||||
BuildRequires: giflib-devel freetype-devel >= 2.1.9-4 libtool bzip2-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
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1 -b .multilib
|
%patch0 -p1 -b .multilib
|
||||||
%patch1 -p1 -b .cve-2010-0991
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
asmopts="--disable-mmx --disable-amd64"
|
asmopts="--disable-mmx --disable-amd64"
|
||||||
@ -117,6 +115,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Oct 07 2010 Tomas Smetana <tsmetana@redhat.com> - 1.4.4-1
|
||||||
|
- new upstream version
|
||||||
|
|
||||||
* Fri Apr 23 2010 Tomas Smetana <tsmetana@redhat.com> - 1.4.3-1
|
* Fri Apr 23 2010 Tomas Smetana <tsmetana@redhat.com> - 1.4.3-1
|
||||||
- new upstream version
|
- new upstream version
|
||||||
- patch for CVE-2010-0991
|
- patch for CVE-2010-0991
|
||||||
|
Loading…
Reference in New Issue
Block a user