rpms/mingw-freetype
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 2.4.8

Browse Source
This commit is contained in:
Kalev Lember 2012-01-31 22:17:29 +02:00
parent a3309a3e6c
commit 63590dfbc0
4 changed files with 9 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -4,3 +4,5 @@ freetype-doc-2.3.11.tar.gz
/freetype-doc-2.4.5.tar.bz2
/freetype-2.4.6.tar.bz2
/freetype-doc-2.4.6.tar.bz2
/freetype-2.4.8.tar.bz2
/freetype-doc-2.4.8.tar.bz2

37
freetype-2.4.2-CVE-2010-3311.patch
View File

@ -1,37 +0,0 @@
--- freetype-2.4.2/src/base/ftstream.c 2010-08-04 15:52:01.000000000 +0200
+++ freetype-2.4.2/src/base/ftstream.c 2010-10-06 18:47:07.000000000 +0200
@@ -59,8 +59,17 @@
{
FT_Error error = FT_Err_Ok;
+ /* note that seeking to the first position after the file is valid */
+ if ( pos > stream->size )
+ {
+ FT_ERROR(( "FT_Stream_Seek:"
+ " invalid i/o; pos = 0x%lx, size = 0x%lx\n",
+ pos, stream->size ));
- if ( stream->read )
+ error = FT_Err_Invalid_Stream_Operation;
+ }
+
+ if ( !error && stream->read )
{
if ( stream->read( stream, pos, 0, 0 ) )
{
@@ -71,15 +80,6 @@
error = FT_Err_Invalid_Stream_Operation;
}
}
- /* note that seeking to the first position after the file is valid */
- else if ( pos > stream->size )
- {
- FT_ERROR(( "FT_Stream_Seek:"
- " invalid i/o; pos = 0x%lx, size = 0x%lx\n",
- pos, stream->size ));
-
- error = FT_Err_Invalid_Stream_Operation;
- }
if ( !error )
stream->pos = pos;

9
mingw32-freetype.spec
View File

@ -7,8 +7,8 @@
%{!?_with_subpixel_rendering: %{!?_without_subpixel_rendering: %define _without_subpixel_rendering --without-subpixel_rendering}}
Name: mingw32-freetype
Version: 2.4.6
Release: 2%{?dist}
Version: 2.4.8
Release: 1%{?dist}
Summary: Free and portable font rendering engine
License: FTL or GPLv2+
@ -23,7 +23,6 @@ Patch21: freetype-2.3.0-enable-spr.patch
Patch46: freetype-2.2.1-enable-valid.patch
#Patch47: freetype-2.3.11-more-demos.patch
Patch88: freetype-multilib.patch
Patch89: freetype-2.4.2-CVE-2010-3311.patch
BuildArch: noarch
@ -51,7 +50,6 @@ MinGW Windows Freetype library.
#%patch47 -p1 -b .more-demos
%patch88 -p1 -b .multilib
%patch89 -p1 -b .CVE-2010-3311
%build
@ -83,6 +81,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
%changelog
* Mon Jan 30 2012 Kalev Lember <kalevlember@gmail.com> - 2.4.8-1
- Update to 2.4.8
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild

4
sources
View File

@ -1,2 +1,2 @@
5e6510613f612809d2d7862592b92ab7 freetype-2.4.6.tar.bz2
e9ba39c2ca46e887e995d70f03284188 freetype-doc-2.4.6.tar.bz2
dbf2caca1d3afd410a29217a9809d397 freetype-2.4.8.tar.bz2
538c925059e90be23928b454c14df728 freetype-doc-2.4.8.tar.bz2