diff options
author | adam <adam> | 2010-12-26 19:16:15 +0000 |
---|---|---|
committer | adam <adam> | 2010-12-26 19:16:15 +0000 |
commit | 608d38cace2f01b73c034bfeb417a89f9e94d9bf (patch) | |
tree | 80224b0b13138a54c38a687ea58707a507ad7d8e | |
parent | dce315108421a2b1f4b4a58e27434d1ccb9d1413 (diff) | |
download | pkgsrc-608d38cace2f01b73c034bfeb417a89f9e94d9bf.tar.gz |
Changes 2.4.4:
I. IMPORTANT BUG FIXES
- UVS support (TrueType/OpenType cmap format 14) support is fixed.
This regression has been introduced in version 2.4.0.
II. MISCELLANEOUS
- Detect tricky fonts (e.g. MingLiU) by the lengths and checksums
of Type42-persistent subtables (`cvt ', `fpgm', and `prep') when
a TrueType font without family name is given. The previous fix,
introduced in 2.4.3, was too rigorous, causing many subsetted
fonts (mainly from PDF files) displayed badly because FreeType
forced rendering with the TrueType bytecode engine instead of
the autohinter.
- Better support for 64bit platforms.
- More fixes to improve handling of broken fonts.
-rw-r--r-- | graphics/freetype2/Makefile | 10 | ||||
-rw-r--r-- | graphics/freetype2/distinfo | 11 | ||||
-rw-r--r-- | graphics/freetype2/patches/patch-ab | 31 | ||||
-rw-r--r-- | graphics/freetype2/patches/patch-ac | 23 |
4 files changed, 20 insertions, 55 deletions
diff --git a/graphics/freetype2/Makefile b/graphics/freetype2/Makefile index 24063006668..2ead46787ce 100644 --- a/graphics/freetype2/Makefile +++ b/graphics/freetype2/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.77 2010/11/24 18:44:53 drochner Exp $ +# $NetBSD: Makefile,v 1.78 2010/12/26 19:16:15 adam Exp $ -DISTNAME= freetype-2.4.3 +DISTNAME= freetype-2.4.4 PKGNAME= ${DISTNAME:S/-/2-/} -PKGREVISION= 2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=freetype/} \ ftp://ring.aist.go.jp/pub/graphics/freetype/freetype2/ @@ -11,6 +10,7 @@ EXTRACT_SUFX= .tar.bz2 MAINTAINER= rh@NetBSD.org HOMEPAGE= http://www.freetype.org/ COMMENT= Font rendering engine and library API +LICENSE= gnu-gpl-v2 PKG_INSTALLATION_TYPES= overwrite pkgviews PKG_DESTDIR_SUPPORT= user-destdir @@ -18,8 +18,8 @@ PKG_DESTDIR_SUPPORT= user-destdir USE_LIBTOOL= yes USE_TOOLS+= grep gmake GNU_CONFIGURE= yes -CONFIGURE_DIRS= ${WRKSRC}/builds/unix -BUILD_DIRS= ${WRKSRC} +CONFIGURE_DIRS= builds/unix +BUILD_DIRS= . CONFIGURE_ARGS+= --includedir=${PREFIX}/include CONFIGURE_ARGS+= --enable-shared CONFIGURE_ENV+= ac_cv_path_GREP=${GREP:Q} ac_cv_path_EGREP=${EGREP:Q} diff --git a/graphics/freetype2/distinfo b/graphics/freetype2/distinfo index ae20c9c6d6a..8dcd914966f 100644 --- a/graphics/freetype2/distinfo +++ b/graphics/freetype2/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.39 2010/11/24 18:44:54 drochner Exp $ +$NetBSD: distinfo,v 1.40 2010/12/26 19:16:16 adam Exp $ -SHA1 (freetype-2.4.3.tar.bz2) = 16e5ba0ff23b2de372149a790b7245a762022912 -RMD160 (freetype-2.4.3.tar.bz2) = befa7c66a9574c682b45d69a1088d072d8f119d9 -Size (freetype-2.4.3.tar.bz2) = 1437406 bytes +SHA1 (freetype-2.4.4.tar.bz2) = 1d136cbc51c67b212c91ba04dc5db797f35e64e6 +RMD160 (freetype-2.4.4.tar.bz2) = 6b9b37ccdc8d1bfe0883f0e25df6de49ab30379e +Size (freetype-2.4.4.tar.bz2) = 1442053 bytes SHA1 (patch-aa) = 85bf9979802e04345a9f5ac3ada2cac9520dabcb -SHA1 (patch-ab) = fd2823043c3bf1488529167a56af69ecd036a920 -SHA1 (patch-ac) = bbd59b48a7827eb5e9c4905572f13b789a2d9c88 +SHA1 (patch-ab) = c5b63fd9ffa9efbe846d67e657a30a5d2543acf8 diff --git a/graphics/freetype2/patches/patch-ab b/graphics/freetype2/patches/patch-ab index 49943ea41ae..8a5632ab29a 100644 --- a/graphics/freetype2/patches/patch-ab +++ b/graphics/freetype2/patches/patch-ab @@ -1,24 +1,13 @@ -$NetBSD: patch-ab,v 1.15 2010/11/24 18:44:54 drochner Exp $ +$NetBSD: patch-ab,v 1.16 2010/12/26 19:16:16 adam Exp $ -CVE-2010-3855 - ---- src/truetype/ttgxvar.c.orig 2010-07-12 19:03:49.000000000 +0000 -+++ src/truetype/ttgxvar.c -@@ -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(); +--- builds/unix/unix-cc.in.orig 2010-12-26 19:07:52.000000000 +0000 ++++ builds/unix/unix-cc.in +@@ -101,7 +101,7 @@ LDFLAGS := @LDFLAGS@ + CCraw_build := @CC_BUILD@ # native CC of building system + E_BUILD := @EXEEXT_BUILD@ # extension for exexutable on building system + EXPORTS_LIST := $(OBJ_DIR)/ftexport.sym +-CCexe := $(CCraw_build) # used to compile `apinames' only ++CCexe := $(CCraw_build) @CFLAGS@ # used to compile `apinames' only -- if ( runcnt < 1 ) -+ if ( runcnt < 1 || i + runcnt >= n ) - goto Exit; - for ( j = 0; j < runcnt; ++j ) + # Library linking diff --git a/graphics/freetype2/patches/patch-ac b/graphics/freetype2/patches/patch-ac deleted file mode 100644 index e0454947309..00000000000 --- a/graphics/freetype2/patches/patch-ac +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ac,v 1.6 2010/11/24 18:44:54 drochner Exp $ - -CVE-2010-3814 - ---- src/truetype/ttinterp.c.orig 2010-10-01 06:08:19.000000000 +0000 -+++ src/truetype/ttinterp.c -@@ -5795,7 +5795,16 @@ - if ( CUR.GS.gep2 == 0 && CUR.zp2.n_points > 0 ) - last_point = (FT_UShort)( CUR.zp2.n_points - 1 ); - else if ( CUR.GS.gep2 == 1 && CUR.zp2.n_contours > 0 ) -+ { - last_point = (FT_UShort)( CUR.zp2.contours[CUR.zp2.n_contours - 1] ); -+ -+ if ( BOUNDS( last_point, CUR.zp2.n_points ) ) -+ { -+ if ( CUR.pedantic_hinting ) -+ CUR.error = TT_Err_Invalid_Reference; -+ return; -+ } -+ } - else - last_point = 0; - |