rpms/freetype-freeworld/devel .cvsignore, 1.11, 1.12 freetype-freeworld.spec, 1.20, 1.21 sources, 1.11, 1.12 freetype-2.4.2-CVE-2010-3311.patch, 1.1, NONE freetype-2.4.6-CVE-2011-3256.patch, 1.1, NONE

[Kevin Kofler]

Author: kkofler

Update of /cvs/free/rpms/freetype-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21798/devel

Modified Files:
	.cvsignore freetype-freeworld.spec sources 
Removed Files:
	freetype-2.4.2-CVE-2010-3311.patch 
	freetype-2.4.6-CVE-2011-3256.patch 
Log Message:
* Thu Nov 17 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.4.8-1
- Update to 2.4.8 (matches Fedora freetype, fixes CVE-2011-3439 (rh#753837))
- Drop CVE-2011-3256 patch, fixed upstream
- Drop CVE-2010-3311 patch, fixed differently upstream for a while, and the
  additional change added by that patch is no longer need


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/freetype-freeworld/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	4 Aug 2011 16:36:51 -0000	1.11
+++ .cvsignore	17 Nov 2011 16:56:37 -0000	1.12
@@ -1 +1 @@
-freetype-2.4.6.tar.bz2
+freetype-2.4.8.tar.bz2


Index: freetype-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/freetype-freeworld/devel/freetype-freeworld.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- freetype-freeworld.spec	27 Oct 2011 22:26:13 -0000	1.20
+++ freetype-freeworld.spec	17 Nov 2011 16:56:37 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: A free and portable font rendering engine
 Name: freetype-freeworld
-Version: 2.4.6
-Release: 3%{?dist}
+Version: 2.4.8
+Release: 1%{?dist}
 License: FTL or GPLv2+
 Group: System Environment/Libraries
 URL: http://www.freetype.org
@@ -12,10 +12,6 @@
 # Enable otvalid and gxvalid modules
 Patch46:  freetype-2.2.1-enable-valid.patch
 
-# Security patches
-Patch89:  freetype-2.4.2-CVE-2010-3311.patch
-Patch90:  freetype-2.4.6-CVE-2011-3256.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
 Provides: freetype-bytecode
@@ -43,9 +39,6 @@
 
 %patch46  -p1 -b .enable-valid
 
-%patch89 -p1 -b .CVE-2010-3311
-%patch90 -p1 -b .CVE-2011-3256
-
 %build
 
 %configure --disable-static
@@ -89,11 +82,17 @@
 %config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
 
 %changelog
+* Thu Nov 17 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.4.8-1
+- Update to 2.4.8 (matches Fedora freetype, fixes CVE-2011-3439 (rh#753837))
+- Drop CVE-2011-3256 patch, fixed upstream
+- Drop CVE-2010-3311 patch, fixed differently upstream for a while, and the
+  additional change added by that patch is no longer need
+
 * Fri Oct 28 2011 Nicolas Chauvet <kwizart at gmail.com> - 2.4.6-3
 - Fix for glibc bug rhbz#747377
 
 * Sun Oct 23 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.4.6-2
-- Add freetype-2.4.6-CVE-2011-3256.patch from Fedora freetype
+- Add freetype-2.4.6-CVE-2011-3256.patch from Fedora freetype (rh#749174)
     (Handle some border cases)
 
 * Thu Aug 04 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.4.6-1


Index: sources
===================================================================
RCS file: /cvs/free/rpms/freetype-freeworld/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	4 Aug 2011 16:36:51 -0000	1.11
+++ sources	17 Nov 2011 16:56:37 -0000	1.12
@@ -1 +1 @@
-5e6510613f612809d2d7862592b92ab7  freetype-2.4.6.tar.bz2
+dbf2caca1d3afd410a29217a9809d397  freetype-2.4.8.tar.bz2


--- freetype-2.4.2-CVE-2010-3311.patch DELETED ---


--- freetype-2.4.6-CVE-2011-3256.patch DELETED ---