From: Ryan Hill Date: Fri, 6 Apr 2007 21:31:10 +0000 (+0000) Subject: Version bump. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0430c81a9f8a1eb4cfb2de81ee7e9785ded5a0f8;p=gentoo.git 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 Package-Manager: portage-2.1.2.3 --- 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 + +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/Manifest b/media-libs/freetype/Manifest index 27bdcce9435f..d3e29fea844c 100644 --- a/media-libs/freetype/Manifest +++ b/media-libs/freetype/Manifest @@ -42,6 +42,10 @@ AUX freetype-2.3.2-truetype-regression.patch 4892 RMD160 f1120ff608dc19eeb3b5f88 MD5 fac7a7cbe58f59fe4ab2f575d2695b85 files/freetype-2.3.2-truetype-regression.patch 4892 RMD160 f1120ff608dc19eeb3b5f887fdda182b8903a3ce files/freetype-2.3.2-truetype-regression.patch 4892 SHA256 b0a688533a5b7cc205b179565d28aed9d11ff9f83dda8556e13a6ab82ef258be files/freetype-2.3.2-truetype-regression.patch 4892 +AUX freetype-2.3.3-buffer-overwrite.patch 894 RMD160 6a53886d3a2129a634bfc33622327914c4f4729c SHA1 2e684d95501222418347b8953dbabb9f17e8e402 SHA256 4b3417e5c704f25a8a087949cc6a62cf92dfd53628bd466aa5a13940a3728905 +MD5 e0d01fb210f817a211ccd922d751592b files/freetype-2.3.3-buffer-overwrite.patch 894 +RMD160 6a53886d3a2129a634bfc33622327914c4f4729c files/freetype-2.3.3-buffer-overwrite.patch 894 +SHA256 4b3417e5c704f25a8a087949cc6a62cf92dfd53628bd466aa5a13940a3728905 files/freetype-2.3.3-buffer-overwrite.patch 894 DIST freetype-1.3.1.tar.gz 1427072 RMD160 43993a667b536b4f85d32318dec32eb3f3b66454 SHA1 a398fb4d6dd756826e459058d8075759086f8ca4 SHA256 a27271fc5b2d91ee8931972dfb9683cd3971272cfe04d03caf5d13b1db5287c4 DIST freetype-2.1.10-security_batch-r1.patch.bz2 10300 RMD160 3994ed6bd5fc3c1e09467267a00ae0166f180fc5 SHA1 3d9a74e6c2ccd18711610e39d339e8796108e2a5 SHA256 d1d31feb556c21a51a08451b14eccb697cf18979e2d24d4412ec47fa1597b296 DIST freetype-2.1.10.tar.bz2 1037107 RMD160 3d31d548632f14784283c97ece64c7425efc3975 SHA1 f9e5c52e466c3e41483d5d6d44b4f3135a9c4b16 SHA256 fed2ed148d7d105b95493c5e95561c8b05ee7909e00f828f036d8ed1be6a5e53 @@ -49,12 +53,15 @@ DIST freetype-2.1.9.tar.bz2 992394 RMD160 1dd8fb6fda8b159ef0d2ebedeca99a67ed65dc DIST freetype-2.2.1.tar.bz2 1212258 RMD160 1c7eb4a43501c8fd5e89d0399e184847351ee160 SHA1 4aa7d5ce2198fad586cf09ef7c9d3a6277320167 SHA256 0e8eb40392752b306d3a3de21f9fa479d53c17bd774b8051771cb258e162e006 DIST freetype-2.3.1.tar.bz2 1247997 RMD160 85bf5f82f1036fe533fa5a9802da1682d7c18e8d SHA1 f87c12c67abb5885486a248a1b83232877f074fe SHA256 be38eecd22880089223dc7e49ac79ce4fdfd1cb7ea09b3a4ef9bd1966f0d6155 DIST freetype-2.3.2.tar.bz2 1252007 RMD160 e4da77b6f8956d69e57269c5681560beda0ddb27 SHA1 4188a2ed344ddf89bdb1a054fb441019aa4b143d SHA256 ba97537c711ea1970ccd97f957cabd63474de9c05aff0fc5ae931f8c90a47e7e +DIST freetype-2.3.3.tar.bz2 1253262 RMD160 bec85941cb22fc43ab4935a074d32dc37c24b483 SHA1 01796d4ac2875b47e81cf9b0aae710459bfca633 SHA256 6ce667f4beafed9fb15895ac5dbe81504febfd8e32cf94d85dfa31c21eee2f7b DIST freetype-doc-2.1.10.tar.bz2 163725 RMD160 fef03cfdf83c8980a8b16fe7a2b9bb139f6f62a9 SHA1 27dc706f167ba21b9892e7d36b60d5a2764f905a SHA256 2bfdca5fd7bb44fe80c41b12998dc044418038e69c828b0e2c31d79d72d1117c DIST freetype-doc-2.2.1.tar.bz2 100288 RMD160 d32bb6da85e63f797eaa40ff0c0f93356bcab23d SHA1 10134cb7c6763880bab68081f6478760d1971ba6 SHA256 7b0bd93d765ee2b92e0602ec89ba5363ab23add9f947f8ab4fc67cb45c83f4c2 DIST freetype-doc-2.3.1.tar.bz2 98643 RMD160 07d65ab6635cfd827b94511e968eb9d19129839e SHA1 8a1b6565f63f4749dda88d4559dbeada55349f24 SHA256 99becb0256bce96de14e4f57065c5d0c0db72f851eced8bd58c05a3a7551c593 DIST freetype-doc-2.3.2.tar.bz2 98679 RMD160 ecd619ded06bf5bf144c18c8d981aec88bab6370 SHA1 74fe7c3b2d9b3a5e4a890d3d6bf35701f8e9494d SHA256 c30052d7d860b45edde95075525dd1c9d477d2b7ab5d99b5c601ac0a44b7d75c +DIST freetype-doc-2.3.3.tar.bz2 98685 RMD160 1b1dd6e981271497d0155cfbc82a6ac716c1f4b2 SHA1 a3a84edf3045cff715f0bc0f6e0cc69b16900724 SHA256 c8883d1f265c57f1ec7cbc6ea0ee27619f008e409f7823d7f59473246a02e60e DIST freetype1-contrib.tar.gz 538248 RMD160 ba2912ed6afb5ddd5fe930ba16d2ef23f87ec092 SHA1 d6198fe70ef16dbe2365d7971bf8a8975dd5b734 SHA256 95f0af3d6c93b061b389f502411ba639623f85b3e8d6bba6bc474ca7372d5812 DIST ft2demos-2.3.2.tar.gz 191685 RMD160 30bb4c24eefe714dc9fa628076c554604a973d1d SHA1 a373eac47b288f5747e42a9f7765813fa501f520 SHA256 60ae6647436459703344cd64e006ed4334a4f904b2cf828042216c64d093fcb0 +DIST ft2demos-2.3.3.tar.gz 196955 RMD160 a2e2c11f53fd4f929eee8966d7541974f5a1eb52 SHA1 793c3cfece5742a53ee5d120a6bdf39f97bf4a09 SHA256 ce5b54cc0e3d2738af9d8c99ebcb83d963060fa91e931d1bee079c74e29cd8b5 DIST ftdocs-2.1.9.tar.bz2 219666 RMD160 68dd21bb3d7a9ef3808f5a1887736b32b9e9a371 SHA1 aba56e909f1e76715a8971ce8457516420bac9a4 SHA256 69d0e4ad07f60da9739a0c09d35a89ab020df4bedb12a6c3817c0ffb77e6dd9f EBUILD freetype-1.3.1-r4.ebuild 3094 RMD160 a4b68a9763f0603dc4c3d869ef2a8364126ca9d2 SHA1 6dcdae3b7a317c4267202d4cb630496f951b5a74 SHA256 6a01c432a23f9c787f2b300dc336d7b2f6251b7178c7ec9d8f91b86001968a75 MD5 11bad807109dac4e9208fdab1a127b14 freetype-1.3.1-r4.ebuild 3094 @@ -92,10 +99,14 @@ EBUILD freetype-2.3.2-r3.ebuild 3056 RMD160 61657953006b48396c48009856344a49aa26 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 +EBUILD freetype-2.3.3.ebuild 3047 RMD160 e649e8edcbf35e7f8d474055f47382bddabe976a SHA1 8f32408da9ff5c259fcbe216df0643d43df53b7e SHA256 46ac92b361ea7dbbd3ff32fc1ac3b80774479428348612dc3d4efcb7d23c5dfc +MD5 272631d8d336b899a2be5de22892b866 freetype-2.3.3.ebuild 3047 +RMD160 e649e8edcbf35e7f8d474055f47382bddabe976a freetype-2.3.3.ebuild 3047 +SHA256 46ac92b361ea7dbbd3ff32fc1ac3b80774479428348612dc3d4efcb7d23c5dfc freetype-2.3.3.ebuild 3047 +MISC ChangeLog 17420 RMD160 942d4fb0e2395e0c172cee93c7828a5219922553 SHA1 d65219d31882a7fa63c16c39643923e6ada2959f SHA256 a468e72b4fec563ac0276e9ed9b8a0e3b9f79a96f931427ce125ff4d212e6d56 +MD5 e0f984a05a59df0ebeb387d7e35b5470 ChangeLog 17420 +RMD160 942d4fb0e2395e0c172cee93c7828a5219922553 ChangeLog 17420 +SHA256 a468e72b4fec563ac0276e9ed9b8a0e3b9f79a96f931427ce125ff4d212e6d56 ChangeLog 17420 MISC metadata.xml 449 RMD160 1aa0a350b9b93a527af79a3d6aa6233d498d6366 SHA1 7491212724f2bb6e5068b47ebf4047f1f2c57056 SHA256 4a2b47a4958439e0e153d37652d2165891f490c3cbf356424636edb0b91114a7 MD5 bc35457473f59e79ce028b34001d3e95 metadata.xml 449 RMD160 1aa0a350b9b93a527af79a3d6aa6233d498d6366 metadata.xml 449 @@ -127,3 +138,6 @@ SHA256 29e57481d8db1799cf0cf400fdcdf224adb40caef4d7a114115d907d974d407f files/di MD5 6d4951ef7998ea18536cfd09fffbd2aa files/digest-freetype-2.3.2-r3 750 RMD160 15b67e79494d5c89e3a136464058f37fa6e47760 files/digest-freetype-2.3.2-r3 750 SHA256 29e57481d8db1799cf0cf400fdcdf224adb40caef4d7a114115d907d974d407f files/digest-freetype-2.3.2-r3 750 +MD5 e4d47b43423b9f65287c1781c10ec2a6 files/digest-freetype-2.3.3 750 +RMD160 c47a3ea716fac6930ea392a0df38bbd079aa3b08 files/digest-freetype-2.3.3 750 +SHA256 4f0211825dcf95edbbda51f2eb7ef20d420cccb44e8e3454a5c315dd49fc8160 files/digest-freetype-2.3.3 750 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} + ! /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 +}