From f772e1dab7c1a797d124a42c291abdcdedac1fcd Mon Sep 17 00:00:00 2001
From: Marek Kasik <mkasik@redhat.com>
Date: Tue, 15 Nov 2011 17:07:58 +0100
Subject: [PATCH] Update to 2.4.8

Remove an unneeded patch
---
 .gitignore                         |  3 +++
 freetype-2.4.2-CVE-2010-3311.patch | 37 ------------------------------
 freetype.spec                      | 11 +++++----
 sources                            |  6 ++---
 4 files changed, 12 insertions(+), 45 deletions(-)
 delete mode 100644 freetype-2.4.2-CVE-2010-3311.patch

diff --git a/.gitignore b/.gitignore
index a4919f9..e1f5eb2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,6 @@ ft2demos-2.4.2.tar.bz2
 /freetype-2.4.7.tar.bz2
 /freetype-doc-2.4.7.tar.bz2
 /ft2demos-2.4.7.tar.bz2
+/freetype-2.4.8.tar.bz2
+/freetype-doc-2.4.8.tar.bz2
+/ft2demos-2.4.8.tar.bz2
diff --git a/freetype-2.4.2-CVE-2010-3311.patch b/freetype-2.4.2-CVE-2010-3311.patch
deleted file mode 100644
index 7f51a95..0000000
--- a/freetype-2.4.2-CVE-2010-3311.patch
+++ /dev/null
@@ -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;
diff --git a/freetype.spec b/freetype.spec
index b5f8001..9666094 100644
--- a/freetype.spec
+++ b/freetype.spec
@@ -6,8 +6,8 @@
 
 Summary: A free and portable font rendering engine
 Name: freetype
-Version: 2.4.7
-Release: 2%{?dist}
+Version: 2.4.8
+Release: 1%{?dist}
 License: FTL or GPLv2+
 Group: System Environment/Libraries
 URL: http://www.freetype.org
@@ -25,8 +25,6 @@ Patch47:  freetype-2.3.11-more-demos.patch
 # Fix multilib conflicts
 Patch88:  freetype-multilib.patch
 
-Patch89:  freetype-2.4.2-CVE-2010-3311.patch
-
 Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
 BuildRequires: libX11-devel
@@ -86,7 +84,6 @@ pushd ft2demos-%{version}
 popd
 
 %patch88 -p1 -b .multilib
-%patch89 -p1 -b .CVE-2010-3311
 
 %build
 
@@ -219,6 +216,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/tutorial
 
 %changelog
+* Tue Nov 15 2011 Marek Kasik <mkasik@redhat.com> 2.4.8-1
+- Update to 2.4.8
+- Remove an unneeded patch
+
 * Wed Oct 26 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.7-2
 - Rebuilt for glibc bug#747377
 
diff --git a/sources b/sources
index d8c35c2..0d9f9c5 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-dbadce8f0c5e70a0b7c51eadf2dd9394  freetype-2.4.7.tar.bz2
-09bfc874435c300252d42b8961564c05  freetype-doc-2.4.7.tar.bz2
-d0118543dfe789bb9fb3b43593b62c05  ft2demos-2.4.7.tar.bz2
+dbf2caca1d3afd410a29217a9809d397  freetype-2.4.8.tar.bz2
+538c925059e90be23928b454c14df728  freetype-doc-2.4.8.tar.bz2
+f44562cf0b434b6dc3488751f82d99ec  ft2demos-2.4.8.tar.bz2