updated patchset

(Portage version: 2.1)

3 files changed, 89 insertions, 1 deletions

diff --git a/media-libs/freetype/ChangeLog b/media-libs/freetype/ChangeLog
index af83cca37139..1c3901d662a5 100644
--- a/media-libs/freetype/ChangeLog
+++ b/media-libs/freetype/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/freetype
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.82 2006/06/20 12:35:11 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.83 2006/06/22 14:21:10 foser Exp $
+
+*freetype-2.1.10-r2 (22 Jun 2006)
+
+  22 Jun 2006; Marinus Schraal <foser@gentoo.org> freetype-2.1.10-r1.ebuild :
+  Updated security patchset to deal with crashers (#124828,#137388)
 
   20 Jun 2006; Marinus Schraal <foser@gentoo.org> metadata.xml :
   Add fonts@gentoo.org as herd
diff --git a/media-libs/freetype/files/digest-freetype-2.1.10-r2 b/media-libs/freetype/files/digest-freetype-2.1.10-r2
new file mode 100644
index 000000000000..ca5fe245107e
--- /dev/null
+++ b/media-libs/freetype/files/digest-freetype-2.1.10-r2
@@ -0,0 +1,7 @@
+MD5 8c5f24790e1e8b0b2710e633c150b650 freetype-2.1.10-security_batch-r1.patch.bz2 10300
+RMD160 3994ed6bd5fc3c1e09467267a00ae0166f180fc5 freetype-2.1.10-security_batch-r1.patch.bz2 10300
+SHA256 d1d31feb556c21a51a08451b14eccb697cf18979e2d24d4412ec47fa1597b296 freetype-2.1.10-security_batch-r1.patch.bz2 10300
+MD5 a4012e7d1f6400df44a16743b11b8423 freetype-2.1.10.tar.bz2 1037107
+RMD160 3d31d548632f14784283c97ece64c7425efc3975 freetype-2.1.10.tar.bz2 1037107
+SHA256 fed2ed148d7d105b95493c5e95561c8b05ee7909e00f828f036d8ed1be6a5e53 freetype-2.1.10.tar.bz2 1037107
+MD5 10608a55ee9ee12e29ba3d705318e61d freetype-doc-2.1.10.tar.bz2 163725
diff --git a/media-libs/freetype/freetype-2.1.10-r2.ebuild b/media-libs/freetype/freetype-2.1.10-r2.ebuild
new file mode 100644
index 000000000000..ee4680202bd4
--- /dev/null
+++ b/media-libs/freetype/freetype-2.1.10-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.1.10-r2.ebuild,v 1.1 2006/06/22 14:21:10 foser Exp $
+
+inherit eutils flag-o-matic gnuconfig libtool
+
+DESCRIPTION="A high-quality and portable font engine"
+HOMEPAGE="http://www.freetype.org/"
+SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
+	mirror://gentoo/freetype-2.1.10-security_batch-r1.patch.bz2
+	doc? ( mirror://sourceforge/${PN}/${PN}-doc-${PV}.tar.bz2 )"
+
+LICENSE="FTL GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="zlib bindist doc"
+
+# 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}
+
+	# fix internal header cast which gets used by pango (bad)
+	epatch ${FILESDIR}/${P}-internal_header.patch
+	# fix bunch of overflows etc. (#124828)
+	epatch ${WORKDIR}/${P}-security_batch-r1.patch
+	# revert pointer
+	epatch ${FILESDIR}/${P}-revert_pointer.patch
+	# fix artificial bold bug (#127872)
+	cd ${S}/src/base
+	epatch ${FILESDIR}/${P}-fix_synth.patch
+
+	gnuconfig_update ${S}
+	elibtoolize
+	epunt_cxx
+
+}
+
+src_compile() {
+
+	# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=118021
+	append-flags "-fno-strict-aliasing"
+
+	use bindist || append-flags -DTT_CONFIG_OPTION_BYTECODE_INTERPRETER
+
+	# Fix missing symbols in fontconfig in some circumstances
+	append-flags -DFT_CONFIG_OPTION_OLD_INTERNALS
+
+	make setup CFG="--host=${CHOST} --prefix=/usr `use_with zlib` --libdir=/usr/$(get_libdir)" unix || die
+
+	emake || die
+
+}
+
+src_install() {
+
+	make DESTDIR="${D}" install || die
+
+	dodoc ChangeLog README
+	dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,*.txt,PATENTS,TODO}
+
+	cd ${WORKDIR}/${PN}-doc-${PV}
+	use doc && dohtml -r docs/*
+
+}