From 66d281f7e3bf2fa53bcb77d6226c16b29a35d2b5 Mon Sep 17 00:00:00 2001
From: Marinus Schraal <foser@gentoo.org>
Date: Wed, 4 Apr 2007 14:23:26 +0000
Subject: [PATCH] more security patching Package-Manager: portage-2.1.2.3

---
 media-libs/freetype/ChangeLog                 |  4 +-
 media-libs/freetype/Manifest                  | 23 ++++--
 .../freetype/files/digest-freetype-2.1.10-r3  |  9 ++
 media-libs/freetype/freetype-2.1.10-r3.ebuild | 82 +++++++++++++++++++
 media-libs/freetype/freetype-2.3.2-r3.ebuild  |  4 +-
 5 files changed, 110 insertions(+), 12 deletions(-)
 create mode 100644 media-libs/freetype/files/digest-freetype-2.1.10-r3
 create mode 100644 media-libs/freetype/freetype-2.1.10-r3.ebuild

diff --git a/media-libs/freetype/ChangeLog b/media-libs/freetype/ChangeLog
index 9e65f799b855..c84a13af1934 100644
--- a/media-libs/freetype/ChangeLog
+++ b/media-libs/freetype/ChangeLog
@@ -1,11 +1,11 @@
 # 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.113 2007/04/04 13:51:04 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.114 2007/04/04 14:23:26 foser Exp $
 
 *freetype-2.3.2-r3 (04 Apr 2007)
 
   04 Apr 2007; Marinus Schraal <foser@gentoo.org> freetype-2.3.2-r3.ebuild,
-  files/freetype-2.3.2-bdflib.patch :
+  freetype-2.1.10-r3.ebuild, files/freetype-2.3.2-bdflib.patch :
   Fix for CVE-2007-1351 (#172577)
 
   01 Apr 2007; Ryan Hill <dirtyepic@gentoo.org> freetype-2.1.9-r1.ebuild:
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index 59a699c1b27d..27bdcce9435f 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -68,6 +68,10 @@ EBUILD freetype-2.1.10-r2.ebuild 2218 RMD160 1be25ecc279a37bfcc827d0695049051800
 MD5 fe9ba62dea689a935b4a6c9448f9cbc9 freetype-2.1.10-r2.ebuild 2218
 RMD160 1be25ecc279a37bfcc827d06950490518007b3f3 freetype-2.1.10-r2.ebuild 2218
 SHA256 d6c05b618c9c5507ab6127abfd01c925144079646ec195b5fb51eb4a1894189b freetype-2.1.10-r2.ebuild 2218
+EBUILD freetype-2.1.10-r3.ebuild 2315 RMD160 13517bdfa75cb7bc3f63164ae37a4178bed9211c SHA1 ff06bc3b3dbc600e3c94da57e17b7eda93bf8616 SHA256 8a0cb1de0eb2eab2e8cf8e2d603cf5995168dac3e4e13451d709f494212fbe38
+MD5 e380f340081e1af80a10916efb2a47b0 freetype-2.1.10-r3.ebuild 2315
+RMD160 13517bdfa75cb7bc3f63164ae37a4178bed9211c freetype-2.1.10-r3.ebuild 2315
+SHA256 8a0cb1de0eb2eab2e8cf8e2d603cf5995168dac3e4e13451d709f494212fbe38 freetype-2.1.10-r3.ebuild 2315
 EBUILD freetype-2.1.9-r1.ebuild 2125 RMD160 cb37dbc1753bc565b07842f44e012b6c26cc2340 SHA1 d48f5e902f709839609d9aa905972561144b60fb SHA256 eb02a32636bf51252984236d4fdc61a12536b9317778cc0967a4e9d5e4c9c663
 MD5 30ca0975fc22badd82a7f5ce0f87ce79 freetype-2.1.9-r1.ebuild 2125
 RMD160 cb37dbc1753bc565b07842f44e012b6c26cc2340 freetype-2.1.9-r1.ebuild 2125
@@ -84,14 +88,14 @@ EBUILD freetype-2.3.2-r2.ebuild 2988 RMD160 51c5a8f3824644a09336966f37b95041c0c9
 MD5 463b59c8beab6ee9977a4289979e0d40 freetype-2.3.2-r2.ebuild 2988
 RMD160 51c5a8f3824644a09336966f37b95041c0c9ba84 freetype-2.3.2-r2.ebuild 2988
 SHA256 bf61943dc9a696c1f5170f9005e32f2638a0c833798392621a7c236279cf12d1 freetype-2.3.2-r2.ebuild 2988
-EBUILD freetype-2.3.2-r3.ebuild 3037 RMD160 53734f9a7fd2ed5cbc304407bd668d9d34a64299 SHA1 321ea00113b5554f571bf37d143f0469178a5bfc SHA256 a58953eef843958bb8618511c2ddefc29aa163a8f141646ef7a1d4a7d2bbd6f8
-MD5 9617c05c2045d8ff657fbacbedfb0812 freetype-2.3.2-r3.ebuild 3037
-RMD160 53734f9a7fd2ed5cbc304407bd668d9d34a64299 freetype-2.3.2-r3.ebuild 3037
-SHA256 a58953eef843958bb8618511c2ddefc29aa163a8f141646ef7a1d4a7d2bbd6f8 freetype-2.3.2-r3.ebuild 3037
-MISC ChangeLog 16961 RMD160 fd89050ff4336a91e055a38ad9fbc7882f16e6b7 SHA1 1cb90f8278a6ecf267ad7be24936accb7bdfd38e SHA256 7d5e4af0e29172c5bc73e7d9c1dc47e4fa6357ebb3add3341e19a3ea0424c2bf
-MD5 cc7e8239ea1e1cccc46954b17955b70e ChangeLog 16961
-RMD160 fd89050ff4336a91e055a38ad9fbc7882f16e6b7 ChangeLog 16961
-SHA256 7d5e4af0e29172c5bc73e7d9c1dc47e4fa6357ebb3add3341e19a3ea0424c2bf ChangeLog 16961
+EBUILD freetype-2.3.2-r3.ebuild 3056 RMD160 61657953006b48396c48009856344a49aa261001 SHA1 16ad65cbb8777fed7fb79ebd055f73d575d832e3 SHA256 b2297d4bbbecc3d8351be0d3bde4b283aa4c32c4c83318ce3f990794af552c72
+MD5 b8940188d3bba1537c5cdf239489d01c freetype-2.3.2-r3.ebuild 3056
+RMD160 61657953006b48396c48009856344a49aa261001 freetype-2.3.2-r3.ebuild 3056
+SHA256 b2297d4bbbecc3d8351be0d3bde4b283aa4c32c4c83318ce3f990794af552c72 freetype-2.3.2-r3.ebuild 3056
+MISC ChangeLog 16988 RMD160 88b2e0cef7a7967ccf839efface59e3eef109554 SHA1 e3a217fb44faa2d5e7dc81cb18a37ba6227b68fd SHA256 03dcc1549aafd411de5f636ce34f4084e201a145a4866cf3735832a645be7206
+MD5 4c75c77474a2551d2187023d175d6f5c ChangeLog 16988
+RMD160 88b2e0cef7a7967ccf839efface59e3eef109554 ChangeLog 16988
+SHA256 03dcc1549aafd411de5f636ce34f4084e201a145a4866cf3735832a645be7206 ChangeLog 16988
 MISC metadata.xml 449 RMD160 1aa0a350b9b93a527af79a3d6aa6233d498d6366 SHA1 7491212724f2bb6e5068b47ebf4047f1f2c57056 SHA256 4a2b47a4958439e0e153d37652d2165891f490c3cbf356424636edb0b91114a7
 MD5 bc35457473f59e79ce028b34001d3e95 metadata.xml 449
 RMD160 1aa0a350b9b93a527af79a3d6aa6233d498d6366 metadata.xml 449
@@ -105,6 +109,9 @@ SHA256 a246ee2bcd4f324ce902f48e815880d7352c85388cffa2ed2afa255410ccc796 files/di
 MD5 c7f077933d57907377995b1fecf98549 files/digest-freetype-2.1.10-r2 822
 RMD160 9f4891075f0ca9c564a932acdf563d7fb6f215ab files/digest-freetype-2.1.10-r2 822
 SHA256 e99172c4c57de9df61db320bba4778ff1c5e89b166b56350aac3470b7c4504c0 files/digest-freetype-2.1.10-r2 822
+MD5 c7f077933d57907377995b1fecf98549 files/digest-freetype-2.1.10-r3 822
+RMD160 9f4891075f0ca9c564a932acdf563d7fb6f215ab files/digest-freetype-2.1.10-r3 822
+SHA256 e99172c4c57de9df61db320bba4778ff1c5e89b166b56350aac3470b7c4504c0 files/digest-freetype-2.1.10-r3 822
 MD5 b240cade20edb6f33fe3c6a8c599a7e7 files/digest-freetype-2.1.9-r1 488
 RMD160 db309224ff7b6d1e1898eeb39416d8836c21f2b2 files/digest-freetype-2.1.9-r1 488
 SHA256 d3da26b45e4594494cd665551dabded16009799a41656ee29cf86288f866b708 files/digest-freetype-2.1.9-r1 488
diff --git a/media-libs/freetype/files/digest-freetype-2.1.10-r3 b/media-libs/freetype/files/digest-freetype-2.1.10-r3
new file mode 100644
index 000000000000..cd91f56c10ab
--- /dev/null
+++ b/media-libs/freetype/files/digest-freetype-2.1.10-r3
@@ -0,0 +1,9 @@
+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
+RMD160 fef03cfdf83c8980a8b16fe7a2b9bb139f6f62a9 freetype-doc-2.1.10.tar.bz2 163725
+SHA256 2bfdca5fd7bb44fe80c41b12998dc044418038e69c828b0e2c31d79d72d1117c freetype-doc-2.1.10.tar.bz2 163725
diff --git a/media-libs/freetype/freetype-2.1.10-r3.ebuild b/media-libs/freetype/freetype-2.1.10-r3.ebuild
new file mode 100644
index 000000000000..507493a33922
--- /dev/null
+++ b/media-libs/freetype/freetype-2.1.10-r3.ebuild
@@ -0,0 +1,82 @@
+# 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.1.10-r3.ebuild,v 1.1 2007/04/04 14:23:26 foser 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://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 ~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
+	# fix CVE-2007-1351 (#172577)
+	cd ${S}
+	epatch "${FILESDIR}/${PN}-2.3.2-bdflib.patch"
+
+	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 "make failed"
+
+	if use doc ; then
+		emake refdoc || die "refdoc failed"
+	fi
+
+}
+
+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/*
+
+}
diff --git a/media-libs/freetype/freetype-2.3.2-r3.ebuild b/media-libs/freetype/freetype-2.3.2-r3.ebuild
index 3a31ebfe25c8..cd0ec65bb1d9 100644
--- a/media-libs/freetype/freetype-2.3.2-r3.ebuild
+++ b/media-libs/freetype/freetype-2.3.2-r3.ebuild
@@ -1,6 +1,6 @@
 # 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.2-r3.ebuild,v 1.1 2007/04/04 13:51:04 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.3.2-r3.ebuild,v 1.2 2007/04/04 14:23:26 foser Exp $
 
 inherit eutils flag-o-matic libtool
 
@@ -66,7 +66,7 @@ src_unpack() {
 	# 2.3.2 only - bug #170532
 	epatch "${FILESDIR}"/${P}-truetype-regression.patch
 
-	# sec vuln
+	# fix CVE-2007-1351 (#172577)
 	epatch "${FILESDIR}"/${P}-bdflib.patch
 
 	sed -i -e "s:\.\.\/freetype2$:../freetype-${PV}:" ../ft2demos-${PV}/Makefile
-- 
2.26.2