From: Ben de Groot Date: Tue, 24 Feb 2015 12:26:39 +0000 (+0000) Subject: remove vulnerable versions (bug #539796) X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5a64a2b7b315ce67e297046cfd714fe5463fb23b;p=gentoo.git remove vulnerable versions (bug #539796) Package-Manager: portage-2.2.17/cvs/Linux x86_64 Manifest-Sign-Key: 0x4FDF9CFD2FAC514E! --- diff --git a/media-libs/freetype/ChangeLog b/media-libs/freetype/ChangeLog index b2ffee64a788..9218c7cc5b1d 100644 --- a/media-libs/freetype/ChangeLog +++ b/media-libs/freetype/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-libs/freetype # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.424 2015/02/24 10:57:22 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.425 2015/02/24 12:26:29 yngwin Exp $ + + 24 Feb 2015; Ben de Groot + -files/2.5.4-0001-pcf-Fix-Savannah-bug-43774.patch, + -files/2.5.4-0002-src-pcf-pcfread.c-pcf_read_TOC-Improve-fix-from-2014.patch, + -freetype-2.5.3-r1.ebuild, -freetype-2.5.4-r1.ebuild, freetype-2.5.5.ebuild: + remove vulnerable versions (bug #539796) 24 Feb 2015; Agostino Sarubbo freetype-2.5.5.ebuild: Stable for alpha, wrt bug #539796 diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest index a90af6d92234..bc4521494dac 100644 --- a/media-libs/freetype/Manifest +++ b/media-libs/freetype/Manifest @@ -1,41 +1,31 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX 2.5.4-0001-pcf-Fix-Savannah-bug-43774.patch 4386 SHA256 e8b4f20c254fb2e6db1092456096d6abd74ba5548d3a1a77573e4a61e3a059bc SHA512 71e027d8239966b49c16ad7f9cc454fc6030aa2b281ae90e87469bc351ef1bcf2a24140cf1d52cebe9fd5ad7b57f214dbe3b4ef080874c07cc22940880a94217 WHIRLPOOL 5b2d5a0629e136b9d525fabec82b1c9908f4374048fd290fb488d02d048b517f5bcba3be9a6a675e6d3e4d46cc3168a18398057569016f7ce4148814a7832a5b -AUX 2.5.4-0002-src-pcf-pcfread.c-pcf_read_TOC-Improve-fix-from-2014.patch 1092 SHA256 1b0e9ae3f7707ef255ed215d633c53e50ae20cde415e45fb5c0aee8e1100bacc SHA512 4d03362faba804e81ddee7d199d8bf8b352fe5710742c8e3b057a88702c1abeceae34877eff0bef5bdc7d319a5e6a1290d69f025d9019801ad4c426a45b69d51 WHIRLPOOL 337821f639c4589d136d6da7e2026a6957637f62bd01dfdabd06dbf28cf8af66af918cc6a7a29c788e89ad315e8895942cfbf68a751ff11bf1c5d2a4607ded91 AUX freetype-2.3.2-enable-valid.patch 624 SHA256 3c26cd8b92510490b4bdbdd12b078e33a4f8607eaee64a800c3ea23097d5d43b SHA512 4dd637fa77b3386cc20fff3e68c64411fdc85a09b5bd61a75647aeff294e037c22cf0b788dae1e90f4cb12b1cb2775d0ac658c82eb998603b070af5f8242cff6 WHIRLPOOL 2c25610f0ecde1d5517c780d6db96abd00bbf04fda9343a3cb1ccaddf6b3263bfb6806d198db110566df1cfd765e1c734f6e303ab81a50e60ce7697ce506162e AUX freetype-2.4.11-sizeof-types.patch 1041 SHA256 b5ed7a7a8c10f3dcfd62a14998e640aeef185b45e291e5e1ce26b77b0509f77e SHA512 0774b7b769d332cbd0e674fad545d1c2b816947188725a7528d749c6311b84bbdc7f8c1a1f2cc947c405f16e8a92e394d77094aad98a6468f154fdedacec0ecc WHIRLPOOL 28db0f881d43c83cc1628f095c24a0c27e9bea322a5973de7640a35559ceed640433da8307d1692c808638b0bce34ebe3cacc46a42f8c6c66bbb6aa675dd06ee -DIST freetype-2.5.1-infinality.patch 164325 SHA256 ff7c1760dfbc72675348810b3fd750b626f9d329b63daf7a78fb09d1ddfc4148 SHA512 d9ccc6e7143c901bc170d3d2014b7a0dae2cbc91af01795bb94fbbd56ece90dbc68cda78470e4402c89ea82d482746404d1f199acdf7b206b4129716e13ab2ef WHIRLPOOL d1550cdf2e23718e9642da7edde206b4687961c98153a3b108b1080924d3b72c23e42feffc67cf3527d9eba642c139999ec0c75e59d7ad6fd09b71f3a25b3cf5 -DIST freetype-2.5.3.tar.bz2 1703842 SHA256 c0848b29d52ef3ca27ad92e08351f023c5e24ce8cea7d8fe69fc96358e65f75e SHA512 bdd779dc11e9fdb52dfa87839ccc40293df3ea417da0232feadf0e711caa3e62ff145e9afdfd9c3d158df0bc69a805cfbf05b18af8ae7ab5a65213e9c66d242e WHIRLPOOL 01b3e7808b638c400bf101848d4ea7e5b81e8e8163fc0e6055ddb103d5f72ec88c00a84f46cee4169666307cc8714b4718085b1b806e23f4bfa81eb383385979 -DIST freetype-2.5.4-infinality-patches.tar.xz 33492 SHA256 9e8a94e5c95091866200f6c51ce787184d1b7c2a921c75b166f95ef0934d679a SHA512 b09b50d75e86846c4251be0896a197c1277bd0030144418f14c41fcfdaedf796883567347c98f9f1f13bfec699788742f8bd7861114ff256da0294ad4c8e0c39 WHIRLPOOL 086060826bd964909607650b900409e073c24e045bbe3de422c59e7f520981df7736d0425db9f2cb81db774dcd0fb1f8110dfe896af540085b15ae27d069b6a4 -DIST freetype-2.5.4.tar.bz2 1726105 SHA256 3b4e2c666b33b32ad29ff0fe5c6538e757d3c73368e5dfa88bd59b4bc95cbabb SHA512 466b9f9ba8b467b3daa09a81c19e50fd0b8d1851f80bf3cb231b731be1703abeff91fd21d00b2b61cd078ff8285be058a4a9484ef3b8f877d6dcff2148f201be WHIRLPOOL 6f1937fded32e28aa13e4b27cc45635f083364e4c15372f43908721d229a31530e3381774ce6b6765fc25d82e11529fcd589d7546bf8d33f7157fda0b6c9d22a DIST freetype-2.5.5-infinality-patches.tar.xz 24380 SHA256 6b7bc373b068c71feca2e19c3741993ee0ff787984aa0653ca66814e05ef195f SHA512 8831e3337214cc57a0381c56ef6750f85b11f1b6358adaa3dda34d449f234335bede124be9d23df817ae8c06f80c8e3ce63ed3fc32eb05586b8c8e43ce52e575 WHIRLPOOL 27b945e9524e984ef57f96415a86095d91dea8fa8e402a3eb6a3d7c38a7636d53d5e47fc37b734ca88f41a499f3398ab9d7bd147e1424c19b09f41e17f2cbe8d DIST freetype-2.5.5.tar.bz2 1714529 SHA256 387bcc4b780b12484aa2ec9f7db1a55d8286eb5639f45fbc0fbba7a4e5a1afb9 SHA512 1fc72d24da1744a6a5faf3338e49912c81ce83f30def1e80a2a15b50e7f83893a4fe24a70ef88b65ecc217bed1c15d85804c364eba221b35e25531c727fe8559 WHIRLPOOL 57cf0f020cda6a66cfe8e2a30e1e997c0fd7f97bdaed38da65cce0b360fcc60cfdf1ba0724c1745668ae3f80743052e135edb8356dff4c90365caa6262d59158 -DIST freetype-doc-2.5.3.tar.bz2 109607 SHA256 fd9cbf5f939b9a63fc04ca2b4cef721dd1cd7f047eaac2daec3dc2e1b68ff4a8 SHA512 c9424473d4427b5e8b280c53b5330b455ba033472c6e230e20ec256874b2a8c8043cb7a3d035c738c9b742aa053c005bb31974b4c9cfe12a6318f206e53c4cc4 WHIRLPOOL 49ce5be77741311a3eff5080a4e0f6b13ddf480a356aa3ae7c04116defab256bac4398a442039c73d4162bd0818f9e75eb29b2f4acffcf123e48ebde9dd0da6b -DIST freetype-doc-2.5.4.tar.bz2 109647 SHA256 9fa6fb39a324d0b6b744d3745509c51d10a68c7a4f440b23fd00c8b49de6c388 SHA512 28f47ed95ecbbf8b048d1cd99cd0125d915eec24608a0cb908fdd961d1016c00dfa39ee43f97f739a7e75f87178564ab371bcc7d7e2c5cec1b49c7034cbde4ba WHIRLPOOL 7a60f3d3ba9166bd5e93e5ddf33f04600a7820682ffb3833745011f3271a46fd26821af2c89350fa48fe4bb628b0188adc46687dae83163a6436dede2ff35eae DIST freetype-doc-2.5.5.tar.bz2 108133 SHA256 68becbae3578a8101e9f3c55f10e435fb75535011d3f7a523719371e86e368e7 SHA512 0e2455433f72766ec88275d2e53e49630457579a83ca491697bb5ce12196ee964618d1af86956651557d34e8ea1d57f75f69e0d60ef90e943509bc571370fb64 WHIRLPOOL 28d13ae3ce9bc3fb278df9a963cef3622672fa288fc0fd654e874054bedccd8510a3dcf7636ea2ec107b5299984742607d2a9436d5e473202856e27bf262655f -DIST ft2demos-2.5.3.tar.bz2 186773 SHA256 e6c9d0b344b88ff5ab25f20640cf78e2ec56bb81a89d1cd1716839357f646c8a SHA512 b239d6b7c1f4c0fa4137a97ab27834f296572a1d086247f1cb8ed01c7d1b3f54137ebfce1eea6f4a209079460ae2686d743097be5ab01e5bb108cf0d55361f4d WHIRLPOOL 0ceb42eca210814286a84cf0f066483ada3c7a9f97310051c5dfb1f1f6249608444c5d16400f5ce781073a303f70299226e9e8554882bd65ceb436b2f80ece2c -DIST ft2demos-2.5.4.tar.bz2 187225 SHA256 54621937130926235abe05ba08aeb390a983998d2d1173c5fdc9ccb5bda4d96a SHA512 8fc0dd33ce7debc40b2ca696d965df7a72797042c7963aa19a41bc82c20fbc1c1a953535c58ff804a15dddb6f4f58a5d7038abd3949c37a787288720c7712345 WHIRLPOOL 270d8ef5b8d25c7e7c6b77f303eedd85c459b23ac699961637430869f7a3d6d21ee3ce97a34aee6633b25118b1048d7fe65283a26400f2c93eda829f08202602 DIST ft2demos-2.5.5.tar.bz2 182006 SHA256 b87c7deb5d9b1fddb8520c091a5491cc63ecac4de25139e1da38aebee82195ea SHA512 c6e1855f2315665e39a894ecfcb65f8546de435c1dada0ea0a6665a1e3ef22331d6949cd9261dfb6b68e653631d4c2e74f8ea31b53b40e46f44ab4dae38e368b WHIRLPOOL 55d6add5e3fac008a39231e3805e151a5a9b7cafb6ef970e546d96d3fa338a6a4a744aeb59ea04804312164aedd5e5a21e19773dbf5c42a1acfc42d283d90930 -EBUILD freetype-2.5.3-r1.ebuild 5324 SHA256 9238160476f32980772b6cf54004b8aa20f2f226e51faf959c04adf65223d33a SHA512 ac9d9e3048e78e59a45705b933d255fbdb52ec33bfc8e7ccc24bb6e8ec63871f50c4ecb93fe5c1dda6179375a1c0f34e2bfb3ae1fd2c97bcbd33e641aa11062e WHIRLPOOL 5e0a523f2f0e4c86db6846b9c99a24e6d250ce05f699101a2e4e6a2647b5c562e0822350f01870469f19d32e7d4122a3a9326a3fb26f57195cd711d4a3f000e3 -EBUILD freetype-2.5.4-r1.ebuild 5556 SHA256 266af78729d4de0c3c1850d911d9d0ef1453b2f337a957a7413e5ecb425a38cb SHA512 b90f20274deb8f67ceaea5f749df753fdc8bc71ee292184a5e3912398904e8db672fc9d053261d8d3756ac21f873a551fbee4ffafcd89484e2521d2b10481127 WHIRLPOOL fe2c0dae754c556dc96e23d30f5807727494bed09d08898541bbba705cec6b637d459d98e6205aff55948007591a751461ddb664fad3e4d61959d59cd7ed109d -EBUILD freetype-2.5.5.ebuild 5530 SHA256 2656529caba6f389def4f116f32fa9d2e2e59ca95dd245163fbbffbbfc72bc6b SHA512 8d508558c9e848a8da5e86ba60fd5c1c337c8e5c57b2c4dd672a34a0700d3cd4c28c6c441f87a17563056ebd0c390ccfbd9ddae7adbbc80164243f309a5d9684 WHIRLPOOL d73441c893765e72053a8cbc22700249afc27a56d38604dc1936568188de511e72c95f34750c5d04748072d13f7645c401982afddade9684c89e506caece150f -MISC ChangeLog 64110 SHA256 71db2a4299371953947ad0e369df3536368076ef3afb4c2f580d0575fcbed9d7 SHA512 68e2f8e842d00723bf17dc04ab8a5bf2a33767e264455cd937b151f0ea53c390db31f5d9f7720de9b5bfac018e14686d12d1b838e0e18fae22a74f8083e1c673 WHIRLPOOL 5b44bca10a99a505209fd5946b96be539cd89497ea5a37d4cba84654af3bb48637685da1f9254fd2d85910dde92cabf26d4bbee8ee1f6b4ea06938c2ab11117c +EBUILD freetype-2.5.5.ebuild 5535 SHA256 6ce6700335c190675913be503fb4f8bc82354920cb5de174627cae52504a1507 SHA512 8dbb535fe936e4a9b7c8087acdda18289dbc9a9dad16becba3e46564b2d8e3f49a373dde8a9ae7aa3dbfd5dd21087e05c7a46e51baa7bc667200fb05ece8ccad WHIRLPOOL 009282cc04671a76f1b5197bcc0f0dbc493c81b5d8dd873a62dfa7e9f0a15192e912f34a8b0318c69f5896673e390a2404a2a7cc6b818298cf254869d839a680 +MISC ChangeLog 64418 SHA256 241b099358f80b3f31ef839fe8c03bf86c75d15802094def6d123d4385c8cc09 SHA512 fa86ea5c8513e009e8eb9cd20d385e93a6647d1e63e0152718d2cd465608e06e3a9ad8181029e2b998ec89012f9baac7487c7f7568bbb67729be532f15f05d90 WHIRLPOOL 9a0abdc4021261ffe8521ecca9633ba9070e34516625b3635d34913e87265e9b0fa4d755f7c78794745692f72fe4be2897be3a9e7dac10d32c051bcb6e94d40e MISC metadata.xml 1400 SHA256 65a92662484be603be8adae907f727219ca78e4cb042350d2741c2fa03fde8a7 SHA512 e3052be471b660ff82261b8cf055a2ae20421d51c0ecdbc31a777aabab3708578012682e01b8b7d200cdd53bf980b4515de68196aac5711a2fd4a8799c1051a9 WHIRLPOOL 3bb9331dde6579280d3b673b62d6086f142a23210f40ab2c3a0cedfed39b067c5d2bf5eed3055f03071e650822723ce919d6a938ada5276c38d05265d71dc828 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 +Version: GnuPG v2.0 -iQIcBAEBCAAGBQJU7FkTAAoJELp701BxlEWfRIoQAI003zVoReLonZxUKbFR+7cb -5zzF9VH09r2Yq1AvNRpAb65fgNrnFkC9wY/+Kn/bY7Q4tvOeARWy1N8dWQkqu9DX -WuJWG4Fr217R3kxOK9l18gJiToeqxo+J+E1QjVGwKsq4T2c6zYstLRotWLQud/YQ -1qKmsjoqQQ1PZhC/emKIBhIEnj06luWvrh0MRaW/QtHLDejuiMt592kutWVU3IXc -jPxoBFWXfDtgyBLqYET6ezU1HMvP/Ey4t055YnJzRGAI8gS+D2IjFSSPXE/M6xYL -sEkgvFLyc03AsXN1SbVnaUcxLrkpLhDBOhvRfvQNQVJH2M8Q/G6POuz+4aSVYEtn -GDM22c/9N5u0PWEpEdkpvDzBACRvX+2rB/dVE9LEapzT8mO6KYC9y4LL6TBWfcmQ -54QetochAPuyuXqRXOVxv88UIGPPxnv+i751oMocAvdZ0BObB9loTnbjZkChNe/Z -jTS90Dii9iWHQXJPr3gjkWRc53TPv5CfAc4BCDRAfN0i5082JVqgVPcoeQZTwvS+ -/tlBqE6AT/utj3BKn1EzTq0GsvpQunStasACG5kOPFRe2G5IJpwQf+c1L1GnRCw6 -dOoLm48zL3jwi6fFgl1BZEzVA0hNSJoH1pEX7Uwu4pyX8UXokj+BtujqZ+QX49Fx -iOIvy8Zx7j6wMt9CVr3M -=z/81 +iQJ8BAEBCABmBQJU7G3+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0 +RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOzmYP/2BbfnHjXwcIy4xxgnK0c4Rv +Z4/J/3nYJERDantaU0/FKdGs6wZXcAyCXb/5kyq62Ux3HsJi5Ydp5NMBUWdv0t5Z +/p19yD0ivrR8io/S0CXeFOSLVhcH0lxcbkDsdo9n0CtBu3qmQDpkzbanXbW9ial9 +5KBVTzcp0WYaDyMbH6b1L10V9+G33oB+YKHBoYOKmGuhL4iJsgrY1a0fynQ/nsY4 +aAOe//kHwE7WbxNfQpBjLYcGzeddMbCEZPUInPZGbk5fn7j3oz+GmlfGiI8MgbNG +eiTBXMYDuLDwS4iYL1NG72TyyzB/5JYQdDIpLggrcveiAaRKkcffI2zhhR4bR2GO +RfV7O1jU0Nb9wsR5+cW1KkWbSueMeYARnk1+ray0q91U9fsun4hhsazF1n9zXVU+ +bMnzsND0sbx2hFerLMtZxlb2AD5PKR3v/rXZLiC63vFKPL17g/Rv+9NQ3g3snRpU +SrZH+D5a9ePxrmpwMUVL2IRp6RMuqfh6kQzbl4DYFVQY2blesT9HHezQvbIirZ0u +0KXWzKeKt2L1oz13crgQEYT+Uc6urlMwO7cQ42rY85bcL8rPIX9FuRfzmIkdrAoF +C6ehdAnE7j5BLs6ThVcUlVYmih8FTS44ehfj/hDCoBg7EwYdB5KYGL9xJyqbOSkM +HfEQtx5xDWd1qbam0xPt +=vsyg -----END PGP SIGNATURE----- diff --git a/media-libs/freetype/files/2.5.4-0001-pcf-Fix-Savannah-bug-43774.patch b/media-libs/freetype/files/2.5.4-0001-pcf-Fix-Savannah-bug-43774.patch deleted file mode 100644 index 3c30a296ecfd..000000000000 --- a/media-libs/freetype/files/2.5.4-0001-pcf-Fix-Savannah-bug-43774.patch +++ /dev/null @@ -1,127 +0,0 @@ -From 9c5f73f7a978ec4b071e7bb7fef3e0f016322a68 Mon Sep 17 00:00:00 2001 -From: Werner Lemberg -Date: Mon, 8 Dec 2014 16:01:50 +0100 -Subject: [PATCH 1/2] [pcf] Fix Savannah bug #43774. - -Work around `features' of X11's `pcfWriteFont' and `pcfReadFont' -functions. Since the PCF format doesn't have an official -specification, we have to exactly follow these functions' behaviour. - -The problem was unveiled with a patch from 2014-11-06, fixing issue #43547. - -* src/pcf/pcfread.c (pcf_read_TOC): Don't check table size for last -element. Instead, assign real size. - -Conflicts: - ChangeLog ---- - src/pcf/pcfread.c | 54 +++++++++++++++++++++++++++++++++++++++++++----------- - 1 file changed, 43 insertions(+), 11 deletions(-) - -diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c -index 998cbed..e3caf82 100644 ---- a/src/pcf/pcfread.c -+++ b/src/pcf/pcfread.c -@@ -2,7 +2,7 @@ - - FreeType font driver for pcf fonts - -- Copyright 2000-2010, 2012, 2013 by -+ Copyright 2000-2010, 2012-2014 by - Francesco Zappa Nardelli - - Permission is hereby granted, free of charge, to any person obtaining a copy -@@ -78,7 +78,7 @@ THE SOFTWARE. - FT_FRAME_START( 16 ), - FT_FRAME_ULONG_LE( type ), - FT_FRAME_ULONG_LE( format ), -- FT_FRAME_ULONG_LE( size ), -+ FT_FRAME_ULONG_LE( size ), /* rounded up to a multiple of 4 */ - FT_FRAME_ULONG_LE( offset ), - FT_FRAME_END - }; -@@ -95,9 +95,11 @@ THE SOFTWARE. - FT_Memory memory = FT_FACE( face )->memory; - FT_UInt n; - -+ FT_ULong size; - -- if ( FT_STREAM_SEEK ( 0 ) || -- FT_STREAM_READ_FIELDS ( pcf_toc_header, toc ) ) -+ -+ if ( FT_STREAM_SEEK( 0 ) || -+ FT_STREAM_READ_FIELDS( pcf_toc_header, toc ) ) - return FT_THROW( Cannot_Open_Resource ); - - if ( toc->version != PCF_FILE_VERSION || -@@ -154,14 +156,35 @@ THE SOFTWARE. - break; - } - -- /* we now check whether the `size' and `offset' values are reasonable: */ -- /* `offset' + `size' must not exceed the stream size */ -+ /* -+ * We now check whether the `size' and `offset' values are reasonable: -+ * `offset' + `size' must not exceed the stream size. -+ * -+ * Note, however, that X11's `pcfWriteFont' routine (used by the -+ * `bdftopcf' program to create PDF font files) has two special -+ * features. -+ * -+ * - It always assigns the accelerator table a size of 100 bytes in the -+ * TOC, regardless of its real size, which can vary between 34 and 72 -+ * bytes. -+ * -+ * - Due to the way the routine is designed, it ships out the last font -+ * table with its real size, ignoring the TOC's size value. Since -+ * the TOC size values are always rounded up to a multiple of 4, the -+ * difference can be up to three bytes for all tables except the -+ * accelerator table, for which the difference can be as large as 66 -+ * bytes. -+ * -+ */ -+ - tables = face->toc.tables; -- for ( n = 0; n < toc->count; n++ ) -+ size = stream->size; -+ -+ for ( n = 0; n < toc->count - 1; n++ ) - { - /* we need two checks to avoid overflow */ -- if ( ( tables->size > stream->size ) || -- ( tables->offset > stream->size - tables->size ) ) -+ if ( ( tables->size > size ) || -+ ( tables->offset > size - tables->size ) ) - { - error = FT_THROW( Invalid_Table ); - goto Exit; -@@ -169,6 +192,15 @@ THE SOFTWARE. - tables++; - } - -+ /* no check of `tables->size' for last table element ... */ -+ if ( ( tables->offset > size ) ) -+ { -+ error = FT_THROW( Invalid_Table ); -+ goto Exit; -+ } -+ /* ... instead, we adjust `tables->size' to the real value */ -+ tables->size = size - tables->offset; -+ - #ifdef FT_DEBUG_LEVEL_TRACE - - { -@@ -733,8 +765,8 @@ THE SOFTWARE. - - FT_TRACE4(( " number of bitmaps: %d\n", nbitmaps )); - -- /* XXX: PCF_Face->nmetrics is singed FT_Long, see pcf.h */ -- if ( face->nmetrics < 0 || nbitmaps != ( FT_ULong )face->nmetrics ) -+ /* XXX: PCF_Face->nmetrics is signed FT_Long, see pcf.h */ -+ if ( face->nmetrics < 0 || nbitmaps != (FT_ULong)face->nmetrics ) - return FT_THROW( Invalid_File_Format ); - - if ( FT_NEW_ARRAY( offsets, nbitmaps ) ) --- -2.2.0 - diff --git a/media-libs/freetype/files/2.5.4-0002-src-pcf-pcfread.c-pcf_read_TOC-Improve-fix-from-2014.patch b/media-libs/freetype/files/2.5.4-0002-src-pcf-pcfread.c-pcf_read_TOC-Improve-fix-from-2014.patch deleted file mode 100644 index fb738f9b79d6..000000000000 --- a/media-libs/freetype/files/2.5.4-0002-src-pcf-pcfread.c-pcf_read_TOC-Improve-fix-from-2014.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 8d62e1a4b393c8b1f1aed189582894216cd879d8 Mon Sep 17 00:00:00 2001 -From: Werner Lemberg -Date: Sat, 13 Dec 2014 07:42:51 +0100 -Subject: [PATCH 2/2] * src/pcf/pcfread.c (pcf_read_TOC): Improve fix from - 2014-12-08. - -Conflicts: - ChangeLog ---- - src/pcf/pcfread.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c -index e3caf82..a29a9e3 100644 ---- a/src/pcf/pcfread.c -+++ b/src/pcf/pcfread.c -@@ -192,14 +192,15 @@ THE SOFTWARE. - tables++; - } - -- /* no check of `tables->size' for last table element ... */ -+ /* only check `tables->offset' for last table element ... */ - if ( ( tables->offset > size ) ) - { - error = FT_THROW( Invalid_Table ); - goto Exit; - } -- /* ... instead, we adjust `tables->size' to the real value */ -- tables->size = size - tables->offset; -+ /* ... and adjust `tables->size' to the real value if necessary */ -+ if ( tables->size > size - tables->offset ) -+ tables->size = size - tables->offset; - - #ifdef FT_DEBUG_LEVEL_TRACE - --- -2.2.0 - diff --git a/media-libs/freetype/freetype-2.5.3-r1.ebuild b/media-libs/freetype/freetype-2.5.3-r1.ebuild deleted file mode 100644 index c6f7db96a1dd..000000000000 --- a/media-libs/freetype/freetype-2.5.3-r1.ebuild +++ /dev/null @@ -1,171 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.5.3-r1.ebuild,v 1.16 2014/10/13 07:11:16 mgorny Exp $ - -EAPI=5 - -inherit autotools-multilib flag-o-matic multilib toolchain-funcs - -DESCRIPTION="A high-quality and portable font engine" -HOMEPAGE="http://www.freetype.org/" -SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2 - utils? ( mirror://sourceforge/freetype/ft2demos-${PV}.tar.bz2 ) - doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2 ) - infinality? ( https://raw.github.com/bohoomil/fontconfig-ultimate/ddda669247330d1a1b8c9473cfe5052d42e1b313/01_lib32-freetype2-iu-2.5.1-2/infinality-2.5.1.patch -> ${PN}-2.5.1-infinality.patch )" - -LICENSE="|| ( FTL GPL-2+ )" -SLOT="2" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="X +adobe-cff auto-hinter bindist bzip2 debug doc fontforge harfbuzz - infinality png static-libs utils" -REQUIRED_USE="harfbuzz? ( auto-hinter )" - -CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) - harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,${MULTILIB_USEDEP}] ) - png? ( >=media-libs/libpng-1.2.51[${MULTILIB_USEDEP}] ) - utils? ( - X? ( - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}] - >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}] - ) - )" -DEPEND="${CDEPEND} - virtual/pkgconfig" -RDEPEND="${CDEPEND} - infinality? ( media-libs/fontconfig-infinality ) - abi_x86_32? ( utils? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )" - -src_prepare() { - enable_option() { - sed -i -e "/#define $1/a #define $1" \ - include/config/ftoption.h \ - || die "unable to enable option $1" - } - - disable_option() { - sed -i -e "/#define $1/ { s:^:/*:; s:$:*/: }" \ - include/config/ftoption.h \ - || die "unable to disable option $1" - } - - if use infinality; then - epatch "${DISTDIR}/${PN}-2.5.1-infinality.patch" - - # FT_CONFIG_OPTION_SUBPIXEL_RENDERING is already enabled in - # freetype-2.4.11 - enable_option TT_CONFIG_OPTION_SUBPIXEL_HINTING - fi - - if ! use bindist; then - # See http://freetype.org/patents.html - # ClearType is covered by several Microsoft patents in the US - enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING - fi - - if use auto-hinter; then - disable_option TT_CONFIG_OPTION_BYTECODE_INTERPRETER - enable_option TT_CONFIG_OPTION_UNPATENTED_HINTING - fi - - if ! use adobe-cff; then - enable_option CFF_CONFIG_OPTION_OLD_ENGINE - fi - - if use debug; then - enable_option FT_DEBUG_LEVEL_TRACE - enable_option FT_DEBUG_MEMORY - fi - - epatch "${FILESDIR}"/${PN}-2.3.2-enable-valid.patch - - epatch "${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966 - - if use utils; then - cd "${WORKDIR}/ft2demos-${PV}" || die - # Disable tests needing X11 when USE="-X". (bug #177597) - if ! use X; then - sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die - fi - fi - - # we need non-/bin/sh to run configure - if [[ -n ${CONFIG_SHELL} ]] ; then - sed -i -e "1s:^#![[:space:]]*/bin/sh:#!$CONFIG_SHELL:" \ - "${S}"/builds/unix/configure || die - fi - - autotools-utils_src_prepare -} - -multilib_src_configure() { - append-flags -fno-strict-aliasing - type -P gmake &> /dev/null && export GNUMAKE=gmake - - local myeconfargs=( - --enable-biarch-config - $(use_with bzip2) - $(use_with harfbuzz) - $(use_with png) - - # avoid using libpng-config - LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)" - LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)" - ) - - autotools-utils_src_configure -} - -multilib_src_compile() { - default - - if multilib_is_native_abi && use utils; then - einfo "Building utils" - # fix for Prefix, bug #339334 - emake \ - X11_PATH="${EPREFIX}/usr/$(get_libdir)" \ - FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" - fi -} - -multilib_src_install() { - default - - if multilib_is_native_abi && use utils; then - einfo "Installing utils" - rm "${WORKDIR}"/ft2demos-${PV}/bin/README || die - local ft2demo - for ft2demo in ../ft2demos-${PV}/bin/*; do - ./libtool --mode=install $(type -P install) -m 755 "$ft2demo" \ - "${ED}"/usr/bin || die - done - fi -} - -multilib_src_install_all() { - if use fontforge; then - # Probably fontforge needs less but this way makes things simplier... - einfo "Installing internal headers required for fontforge" - local header - find src/truetype include/freetype/internal -name '*.h' | \ - while read header; do - mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die - cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die - done - fi - - dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO} - use doc && dohtml -r docs/* - - prune_libtool_files --all -} - -pkg_postinst() { - if use auto-hinter && ! use harfbuzz; then - elog "To improve OpenType font hinting with the auto-hinter, the harfbuzz" - elog "useflag needs to be enabled for ${CATEGORY}/${PN}." - elog "See the INSTALL.UNIX file in the doc directory of this package for" - elog "more information." - fi -} diff --git a/media-libs/freetype/freetype-2.5.4-r1.ebuild b/media-libs/freetype/freetype-2.5.4-r1.ebuild deleted file mode 100644 index aa4b80f1304c..000000000000 --- a/media-libs/freetype/freetype-2.5.4-r1.ebuild +++ /dev/null @@ -1,177 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.5.4-r1.ebuild,v 1.4 2015/02/13 20:03:59 jer Exp $ - -EAPI=5 -inherit autotools-multilib flag-o-matic multilib toolchain-funcs - -DESCRIPTION="A high-quality and portable font engine" -HOMEPAGE="http://www.freetype.org/" -SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2 - utils? ( mirror://sourceforge/freetype/ft2demos-${PV}.tar.bz2 ) - doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2 ) - infinality? ( http://dev.gentoo.org/~yngwin/distfiles/${P}-infinality-patches.tar.xz )" - -LICENSE="|| ( FTL GPL-2+ )" -SLOT="2" -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="X +adobe-cff auto-hinter bindist bzip2 debug doc fontforge harfbuzz - infinality png static-libs utils" -REQUIRED_USE="harfbuzz? ( auto-hinter )" - -CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) - harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,${MULTILIB_USEDEP}] ) - png? ( >=media-libs/libpng-1.2.51[${MULTILIB_USEDEP}] ) - utils? ( - X? ( - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}] - >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}] - ) - )" -DEPEND="${CDEPEND} - virtual/pkgconfig" -RDEPEND="${CDEPEND} - abi_x86_32? ( utils? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )" -PDEPEND="infinality? ( media-libs/fontconfig-infinality )" - -PATCHES=( - "${FILESDIR}/2.5.4-0001-pcf-Fix-Savannah-bug-43774.patch" - "${FILESDIR}/2.5.4-0002-src-pcf-pcfread.c-pcf_read_TOC-Improve-fix-from-2014.patch" -) - -src_prepare() { - enable_option() { - sed -i -e "/#define $1/a #define $1" \ - include/config/ftoption.h \ - || die "unable to enable option $1" - } - - disable_option() { - sed -i -e "/#define $1/ { s:^:/*:; s:$:*/: }" \ - include/config/ftoption.h \ - || die "unable to disable option $1" - } - - # This is the same as the 01 patch from infinality - epatch "${FILESDIR}"/${PN}-2.3.2-enable-valid.patch - - if use infinality; then - EPATCH_SOURCE="${WORKDIR}/${P}-infinality-patches" EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" epatch - - # FT_CONFIG_OPTION_SUBPIXEL_RENDERING is already enabled in freetype-2.4.11 - enable_option TT_CONFIG_OPTION_SUBPIXEL_HINTING - fi - - if ! use bindist; then - # See http://freetype.org/patents.html - # ClearType is covered by several Microsoft patents in the US - enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING - fi - - if use auto-hinter; then - disable_option TT_CONFIG_OPTION_BYTECODE_INTERPRETER - enable_option TT_CONFIG_OPTION_UNPATENTED_HINTING - fi - - if ! use adobe-cff; then - enable_option CFF_CONFIG_OPTION_OLD_ENGINE - fi - - if use debug; then - enable_option FT_DEBUG_LEVEL_TRACE - enable_option FT_DEBUG_MEMORY - fi - - epatch "${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966 - - if use utils; then - cd "${WORKDIR}/ft2demos-${PV}" || die - # Disable tests needing X11 when USE="-X". (bug #177597) - if ! use X; then - sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die - fi - cd "${S}" || die - fi - - # we need non-/bin/sh to run configure - if [[ -n ${CONFIG_SHELL} ]] ; then - sed -i -e "1s:^#![[:space:]]*/bin/sh:#!$CONFIG_SHELL:" \ - "${S}"/builds/unix/configure || die - fi - - autotools-utils_src_prepare -} - -multilib_src_configure() { - append-flags -fno-strict-aliasing - type -P gmake &> /dev/null && export GNUMAKE=gmake - - local myeconfargs=( - --enable-biarch-config - $(use_with bzip2) - $(use_with harfbuzz) - $(use_with png) - - # avoid using libpng-config - LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)" - LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)" - ) - - autotools-utils_src_configure -} - -multilib_src_compile() { - default - - if multilib_is_native_abi && use utils; then - einfo "Building utils" - # fix for Prefix, bug #339334 - emake \ - X11_PATH="${EPREFIX}/usr/$(get_libdir)" \ - FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" - fi -} - -multilib_src_install() { - default - - if multilib_is_native_abi && use utils; then - einfo "Installing utils" - rm "${WORKDIR}"/ft2demos-${PV}/bin/README || die - local ft2demo - for ft2demo in ../ft2demos-${PV}/bin/*; do - ./libtool --mode=install $(type -P install) -m 755 "$ft2demo" \ - "${ED}"/usr/bin || die - done - fi -} - -multilib_src_install_all() { - if use fontforge; then - # Probably fontforge needs less but this way makes things simplier... - einfo "Installing internal headers required for fontforge" - local header - find src/truetype include/freetype/internal -name '*.h' | \ - while read header; do - mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die - cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die - done - fi - - dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO} - use doc && dohtml -r docs/* - - prune_libtool_files --all -} - -pkg_postinst() { - if use auto-hinter && ! use harfbuzz; then - elog "To improve OpenType font hinting with the auto-hinter, the harfbuzz" - elog "useflag needs to be enabled for ${CATEGORY}/${PN}." - elog "See the INSTALL.UNIX file in the doc directory of this package for" - elog "more information. But it is recommended not to use the auto-hinter." - fi -} diff --git a/media-libs/freetype/freetype-2.5.5.ebuild b/media-libs/freetype/freetype-2.5.5.ebuild index cef80374119a..8ae9a6c40957 100644 --- a/media-libs/freetype/freetype-2.5.5.ebuild +++ b/media-libs/freetype/freetype-2.5.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.5.5.ebuild,v 1.10 2015/02/24 10:57:22 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.5.5.ebuild,v 1.11 2015/02/24 12:26:29 yngwin Exp $ EAPI=5 inherit autotools-multilib flag-o-matic multilib toolchain-funcs @@ -25,7 +25,7 @@ REQUIRED_USE="harfbuzz? ( auto-hinter )" CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,${MULTILIB_USEDEP}] ) - png? ( >=media-libs/libpng-1.2.51[${MULTILIB_USEDEP}] ) + png? ( >=media-libs/libpng-1.2.51:=[${MULTILIB_USEDEP}] ) utils? ( X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]