- up to 2.4.4

- remove CVE-2010-3855.patch (applied upstream)

Changed files:
    freetype-CVE-2010-3855.patch -> 1.2
    freetype.spec -> 1.158

diff --git a/freetype-CVE-2010-3855.patch b/freetype-CVE-2010-3855.patch
deleted file mode 100644 (file)
index b6a3fd7..0000000
--- a/freetype-CVE-2010-3855.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- freetype-2.4.3/src/truetype/ttgxvar.c      2010-07-12 21:03:49.000000000 +0200
-+++ freetype-2.4.3/src/truetype/ttgxvar.c      2010-11-15 10:23:43.856348141 +0100
-@@ -154,7 +154,7 @@
-         runcnt = runcnt & GX_PT_POINT_RUN_COUNT_MASK;
-         first  = points[i++] = FT_GET_USHORT();
- 
--        if ( runcnt < 1 )
-+        if ( runcnt < 1 || i + runcnt >= n )
-           goto Exit;
- 
-         /* first point not included in runcount */
-@@ -165,7 +165,7 @@
-       {
-         first = points[i++] = FT_GET_BYTE();
- 
--        if ( runcnt < 1 )
-+        if ( runcnt < 1 || i + runcnt >= n )
-           goto Exit;
- 
-         for ( j = 0; j < runcnt; ++j )

diff --git a/freetype.spec b/freetype.spec
index 858349e1a8ecf95553b4e675556f6c48560913e7..23d98f2f445fa72c67503c71b46c3e3a68f63078 100644 (file)
--- a/freetype.spec
+++ b/freetype.spec
@@ -12,18 +12,17 @@ Summary(pt_BR.UTF-8):       Biblioteca de renderização de fontes TrueType
 Summary(ru.UTF-8):     Растеризатор шрифтов TrueType
 Summary(uk.UTF-8):     Растеризатор шрифтів TrueType
 Name:          freetype
-Version:       2.4.3
-Release:       3
+Version:       2.4.4
+Release:       1
 Epoch:         1
 License:       GPL or FTL
 Group:         Libraries
 Source0:       http://downloads.sourceforge.net/freetype/%{name}-%{version}.tar.bz2
-# Source0-md5: 75ac7082bde7b3805dc5d6bc806fa045
+# Source0-md5: b3e2b6e2f1c3e0dffa1fd2a0f848b671
 Source1:       http://downloads.sourceforge.net/freetype/%{name}-doc-%{version}.tar.bz2
-# Source1-md5: 79a0fa0444eb7f2f46e75cae74c0772d
+# Source1-md5: a657e301bc1568848ee981297ca599dc
 Source2:       http://downloads.sourceforge.net/freetype/ft2demos-%{version}.tar.bz2
-# Source2-md5: ffc0152660b96ba2126926860e6d7bcc
-Patch0:                %{name}-CVE-2010-3855.patch
+# Source2-md5: 8a95c095fa5fe87a00b08e3027105071
 URL:           http://www.freetype.org/
 BuildRequires: automake
 BuildRequires: python
@@ -188,7 +187,6 @@ Programy demonstracyjne do biblioteki FreeType.
 
 %prep
 %setup -q -a1 -a2
-%patch0 -p1
 
 %build
 CFLAGS="%{rpmcflags} \