Version bump.

 - includes the patch for CVE-2007-1351 present in 2.3.2-r3 along with other
 various bugfixes
 - also includes upstream patch for memory buffer overwrite soon to be
 released as freetype-2.3.4
 - new ftdiff utility for side-by-side font comparisons
(Portage version: 2.1.2.3)

4 files changed, 149 insertions, 1 deletions

diff --git a/media-libs/freetype/ChangeLog b/media-libs/freetype/ChangeLog
index c84a13af1934..af3a25130c1f 100644
--- a/media-libs/freetype/ChangeLog
+++ b/media-libs/freetype/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-libs/freetype
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.114 2007/04/04 14:23:26 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.115 2007/04/06 21:31:10 dirtyepic Exp $
+
+*freetype-2.3.3 (06 Apr 2007)
+
+  06 Apr 2007; Ryan Hill <dirtyepic@gentoo.org>
+  +files/freetype-2.3.3-buffer-overwrite.patch, +freetype-2.3.3.ebuild:
+  Version bump.
+   - includes the patch for CVE-2007-1351 present in 2.3.2-r3 along with other
+   various bugfixes
+   - also includes upstream patch for memory buffer overwrite soon to be
+   released as freetype-2.3.4
+   - new ftdiff utility for side-by-side font comparisons
 
 *freetype-2.3.2-r3 (04 Apr 2007)
 
diff --git a/media-libs/freetype/files/digest-freetype-2.3.3 b/media-libs/freetype/files/digest-freetype-2.3.3
new file mode 100644
index 000000000000..30ff9a2cb83f
--- /dev/null
+++ b/media-libs/freetype/files/digest-freetype-2.3.3
@@ -0,0 +1,9 @@
+MD5 c0367b4059f672789b7a41e65f7a4b4a freetype-2.3.3.tar.bz2 1253262
+RMD160 bec85941cb22fc43ab4935a074d32dc37c24b483 freetype-2.3.3.tar.bz2 1253262
+SHA256 6ce667f4beafed9fb15895ac5dbe81504febfd8e32cf94d85dfa31c21eee2f7b freetype-2.3.3.tar.bz2 1253262
+MD5 3f0df79c7504aee5a2f5803afd510efd freetype-doc-2.3.3.tar.bz2 98685
+RMD160 1b1dd6e981271497d0155cfbc82a6ac716c1f4b2 freetype-doc-2.3.3.tar.bz2 98685
+SHA256 c8883d1f265c57f1ec7cbc6ea0ee27619f008e409f7823d7f59473246a02e60e freetype-doc-2.3.3.tar.bz2 98685
+MD5 f501c6f6ba5e9afad24ea5450fbb7125 ft2demos-2.3.3.tar.gz 196955
+RMD160 a2e2c11f53fd4f929eee8966d7541974f5a1eb52 ft2demos-2.3.3.tar.gz 196955
+SHA256 ce5b54cc0e3d2738af9d8c99ebcb83d963060fa91e931d1bee079c74e29cd8b5 ft2demos-2.3.3.tar.gz 196955
diff --git a/media-libs/freetype/files/freetype-2.3.3-buffer-overwrite.patch b/media-libs/freetype/files/freetype-2.3.3-buffer-overwrite.patch
new file mode 100644
index 000000000000..bbb8b2b5370a
--- /dev/null
+++ b/media-libs/freetype/files/freetype-2.3.3-buffer-overwrite.patch
@@ -0,0 +1,25 @@
+===================================================================
+RCS file: /var/lib/cvs/sources/freetype/freetype2/src/base/ftbitmap.c,v
+retrieving revision 1.17
+retrieving revision 1.18
+diff -u -r1.17 -r1.18
+--- freetype/freetype2/src/base/ftbitmap.c	2007/03/29 11:56:21	1.17
++++ freetype/freetype2/src/base/ftbitmap.c	2007/04/06 08:19:04	1.18
+@@ -149,15 +149,15 @@
+       if ( bit_last < bit_width )
+       {
+         FT_Byte*  line  = bitmap->buffer + ( bit_last >> 3 );
++        FT_Byte*  end   = bitmap->buffer + pitch;
+         FT_Int    shift = bit_last & 7;
+         FT_UInt   mask  = 0xFF00U >> shift;
+         FT_Int    count = height;
+ 
+ 
+-        for ( ; count > 0; count--, line += pitch )
++        for ( ; count > 0; count--, line += pitch, end += pitch )
+         {
+           FT_Byte*  write = line;
+-          FT_Byte*  end   = line + pitch;
+ 
+ 
+           if ( shift > 0 )
diff --git a/media-libs/freetype/freetype-2.3.3.ebuild b/media-libs/freetype/freetype-2.3.3.ebuild
new file mode 100644
index 000000000000..0b205bba0aba
--- /dev/null
+++ b/media-libs/freetype/freetype-2.3.3.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.3.3.ebuild,v 1.1 2007/04/06 21:31:10 dirtyepic Exp $
+
+inherit eutils flag-o-matic libtool
+
+DESCRIPTION="A high-quality and portable font engine"
+HOMEPAGE="http://www.freetype.org/"
+SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
+	mirror://sourceforge/freetype/ft2demos-${PV}.tar.gz
+	doc? ( mirror://sourceforge/${PN}/${PN}-doc-${PV}.tar.bz2 )"
+
+LICENSE="FTL GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="bindist debug doc zlib"
+
+# The RDEPEND below makes sure that if there is a version of moz/ff/tb
+# installed, then it will have the freetype-2.1.8+ binary compatibility patch.
+# Otherwise updating freetype will cause moz/ff/tb crashes.  #59849
+# 20 Nov 2004 agriffis
+DEPEND="zlib? ( sys-libs/zlib )"
+
+RDEPEND="${DEPEND}
+	!<www-client/mozilla-1.7.3-r3
+	!<www-client/mozilla-firefox-1.0-r3
+	!<mail-client/mozilla-thunderbird-0.9-r3
+	!<media-libs/libwmf-0.2.8.2"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	enable_option() {
+		sed -i -e "/#define $1/a #define $1" \
+			include/freetype/config/ftoption.h \
+			|| die "unable to enable option $1"
+	}
+
+	disable_option() {
+		sed -i -e "/#define $1/ { s:^:/*:; s:$:*/: }" \
+			include/freetype/config/ftoption.h \
+			|| die "unable to disable option $1"
+	}
+
+	if ! use bindist; then
+		# Bytecodes and subpixel hinting supports are patented
+		# in United States; for safety, disable them while building
+		# binaries, so that no risky code is distributed.
+		# See http://freetype.org/patents.html
+
+		enable_option TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+		enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+		disable_option TT_CONFIG_OPTION_UNPATENTED_HINTING
+	fi
+
+	if use debug; then
+		enable_option FT_DEBUG_LEVEL_ERROR
+		enable_option FT_DEBUG_MEMORY
+	fi
+
+	enable_option FT_CONFIG_OPTION_INCREMENTAL
+	disable_option FT_CONFIG_OPTION_OLD_INTERNALS
+
+	epatch "${FILESDIR}"/${PN}-2.3.2-enable-valid.patch
+
+	# Fix memory buffer overwrite (2.3.3 only)
+	# http://savannah.nongnu.org/bugs/?19536
+	epatch "${FILESDIR}"/${P}-buffer-overwrite.patch
+
+	sed -i -e "s:\.\.\/freetype2$:../freetype-${PV}:" ../ft2demos-${PV}/Makefile
+
+	elibtoolize
+	epunt_cxx
+}
+
+src_compile() {
+	# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=118021
+	append-flags "-fno-strict-aliasing"
+
+	type -P gmake &> /dev/null && export GNUMAKE=gmake
+	econf $(use_with zlib) || die "econf failed"
+	emake || die "emake failed"
+
+	cd ../ft2demos-${PV}
+	emake || die "ft2demos emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc ChangeLog README
+	dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,*.txt,PATENTS,TODO}
+
+	#cd "${WORKDIR}"/${PN}-doc-${PV}
+	use doc && dohtml -r docs/*
+
+	rm ../ft2demos-${PV}/bin/README
+	for ft2demo in ../ft2demos-${PV}/bin/*; do
+		./builds/unix/libtool --mode=install $(type -P install) -m 755 $ft2demo \
+			${D}/usr/bin
+	done
+}