Remove old vulnerable versions.
authorDiego Elio Pettenò <flameeyes@gentoo.org>
Thu, 8 Feb 2007 14:15:13 +0000 (14:15 +0000)
committerDiego Elio Pettenò <flameeyes@gentoo.org>
Thu, 8 Feb 2007 14:15:13 +0000 (14:15 +0000)
Package-Manager: portage-2.1.2-r9

media-libs/freetype/ChangeLog
media-libs/freetype/Manifest
media-libs/freetype/files/digest-freetype-2.1.10 [deleted file]
media-libs/freetype/files/digest-freetype-2.1.10-r1 [deleted file]
media-libs/freetype/files/freetype-2.1.10-security_batch.patch [deleted file]
media-libs/freetype/freetype-2.1.10-r1.ebuild [deleted file]
media-libs/freetype/freetype-2.1.10.ebuild [deleted file]

index e1db10af821dd307ce3ec2ecf60a56661a2ad3fa..59cfdc7e5871aec418e1407718c0765d7ff746f1 100644 (file)
@@ -1,6 +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.94 2007/02/08 14:04:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.95 2007/02/08 14:15:13 flameeyes Exp $
+
+  08 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/freetype-2.1.10-security_batch.patch, -freetype-2.1.10.ebuild,
+  -freetype-2.1.10-r1.ebuild:
+  Remove old vulnerable versions.
 
 *freetype-2.2.1-r1 (08 Feb 2007)
 
index 3d363c6fb6ec4985783657ac607ca80d9906f7e3..daf593c598f13a2f3d988991be0ab771929ff358 100644 (file)
@@ -25,10 +25,6 @@ AUX freetype-2.1.10-revert_pointer.patch 544 RMD160 7295ee885d3377cf8d76df1aa85d
 MD5 31df68fae64e5aaecce6e739c699e75e files/freetype-2.1.10-revert_pointer.patch 544
 RMD160 7295ee885d3377cf8d76df1aa85d9d8c2dba3e51 files/freetype-2.1.10-revert_pointer.patch 544
 SHA256 47805b36c85b9d63b161757c0a7fa399c2320182b423db88909056712f426838 files/freetype-2.1.10-revert_pointer.patch 544
-AUX freetype-2.1.10-security_batch.patch 10667 RMD160 f75237e77ed09db16c19756e7d80de0fa73d30e4 SHA1 6bdb351eeb90289282502c971dbcdd7cd36736b1 SHA256 3f863c67176ca0a4348d5e6d838e06522c40f3ca72ad07e68616f2dc4361b1bc
-MD5 79c82a44790efd65aa57b462d9cc8f39 files/freetype-2.1.10-security_batch.patch 10667
-RMD160 f75237e77ed09db16c19756e7d80de0fa73d30e4 files/freetype-2.1.10-security_batch.patch 10667
-SHA256 3f863c67176ca0a4348d5e6d838e06522c40f3ca72ad07e68616f2dc4361b1bc files/freetype-2.1.10-security_batch.patch 10667
 AUX freetype-2.1.9-fix_bci.patch 643 RMD160 cf09457bc1f385b04f5013ed568886f854c33847 SHA1 7ea4f9a5f503e1e240ae895811d3c226f500255f SHA256 401d6db5446f80d086a6dbc89c8e7578d1e84a4fec8a691513f4a47447616b73
 MD5 6c404648e3cb8f86b329f7dac5d70cc8 files/freetype-2.1.9-fix_bci.patch 643
 RMD160 cf09457bc1f385b04f5013ed568886f854c33847 files/freetype-2.1.9-fix_bci.patch 643
@@ -54,18 +50,10 @@ EBUILD freetype-1.3.1-r5.ebuild 3198 RMD160 ad1fd38646ca2f925f4abb847aa1efc2435f
 MD5 4eaf61511f2b2c2520aeffadbe33b182 freetype-1.3.1-r5.ebuild 3198
 RMD160 ad1fd38646ca2f925f4abb847aa1efc2435fe7f3 freetype-1.3.1-r5.ebuild 3198
 SHA256 2553b7aa7c483faaaab77596203cdbdd5acb55fd35bf3f2dc5552162e15132b4 freetype-1.3.1-r5.ebuild 3198
-EBUILD freetype-2.1.10-r1.ebuild 1996 RMD160 15a766208ffb527ce150593087c0b3d7a2861244 SHA1 d980369ff1a3dbc8d1398034747eb35d96ece96e SHA256 000b023cb37c993b9b3274fd0e5e913585d5392d03d6651bd3cb477ae4d0aebb
-MD5 df7c7fb5087252ba89718fe4d86598f5 freetype-2.1.10-r1.ebuild 1996
-RMD160 15a766208ffb527ce150593087c0b3d7a2861244 freetype-2.1.10-r1.ebuild 1996
-SHA256 000b023cb37c993b9b3274fd0e5e913585d5392d03d6651bd3cb477ae4d0aebb freetype-2.1.10-r1.ebuild 1996
 EBUILD freetype-2.1.10-r2.ebuild 2231 RMD160 c76f9cf5cffd73abf04802a3bc371bfabccb7cdd SHA1 cc10da635c63d19e9e0f8ce2f9d1e9bcbc3ced3e SHA256 c09b15b670b4777e7e46faae8dea7c284ad8e1816a5bf6e6520e43d1f150c89d
 MD5 5aebb2c6db4b259326a785afcabda3cd freetype-2.1.10-r2.ebuild 2231
 RMD160 c76f9cf5cffd73abf04802a3bc371bfabccb7cdd freetype-2.1.10-r2.ebuild 2231
 SHA256 c09b15b670b4777e7e46faae8dea7c284ad8e1816a5bf6e6520e43d1f150c89d freetype-2.1.10-r2.ebuild 2231
-EBUILD freetype-2.1.10.ebuild 1782 RMD160 00068f30a1b8b97af515668cc10588a330a2dff1 SHA1 8e46866b1e4fb50254ebe4fb1b5cea468ac3369c SHA256 fc31f1016f590303355025b1534ec0d08b07dcc9b5042cdb27a5cf822333ccfa
-MD5 78ce5c0bf768c783f4228b3d1b0a8234 freetype-2.1.10.ebuild 1782
-RMD160 00068f30a1b8b97af515668cc10588a330a2dff1 freetype-2.1.10.ebuild 1782
-SHA256 fc31f1016f590303355025b1534ec0d08b07dcc9b5042cdb27a5cf822333ccfa freetype-2.1.10.ebuild 1782
 EBUILD freetype-2.1.9-r1.ebuild 2135 RMD160 f84be5afdadf4b0a6f53bfd52b14adb1f57cd1fc SHA1 c4e22e5e9b29bfae21d70cee0241caf404ea93e1 SHA256 c5f8580f778ed6350c0b1d1cbf6fe5afdf1b7ae767d5b91be2c6f50f460719ff
 MD5 f2eebfac062f3ecc881902a28d941cf2 freetype-2.1.9-r1.ebuild 2135
 RMD160 f84be5afdadf4b0a6f53bfd52b14adb1f57cd1fc freetype-2.1.9-r1.ebuild 2135
@@ -74,10 +62,10 @@ EBUILD freetype-2.2.1-r1.ebuild 1725 RMD160 bbb843256ac81e0f11b3c9187ebba4497096
 MD5 5f04813789f82fad08567d6ae0473d1f freetype-2.2.1-r1.ebuild 1725
 RMD160 bbb843256ac81e0f11b3c9187ebba44970964903 freetype-2.2.1-r1.ebuild 1725
 SHA256 1d2fa895ceb469f599a6096b3819b3880a50db8ed9368a7ea6df3c276a45f289 freetype-2.2.1-r1.ebuild 1725
-MISC ChangeLog 13911 RMD160 5035b8114b16934452003fbef858c83861fec665 SHA1 a9da0d6c6e0b955b877061980b095a65a0043473 SHA256 1458064d70d46377faab50d0d50be92a8e9bffafea3ba559db80d39805742995
-MD5 03087c1ba6419e50da8db1a1bbb2264c ChangeLog 13911
-RMD160 5035b8114b16934452003fbef858c83861fec665 ChangeLog 13911
-SHA256 1458064d70d46377faab50d0d50be92a8e9bffafea3ba559db80d39805742995 ChangeLog 13911
+MISC ChangeLog 14101 RMD160 51814a41d101d768b64b9b63afe04f747117c0f6 SHA1 b6a302022e1c69b93dc3d8727fea6941b2a5922b SHA256 7b100e42b9105557a3628d0a145608a65e4a70eefa34679c3130e8d971e8847e
+MD5 561e6587cfdca9a16e1ab6b00fff8c5b ChangeLog 14101
+RMD160 51814a41d101d768b64b9b63afe04f747117c0f6 ChangeLog 14101
+SHA256 7b100e42b9105557a3628d0a145608a65e4a70eefa34679c3130e8d971e8847e ChangeLog 14101
 MISC metadata.xml 430 RMD160 fd4493b55b7373e6e7d76ad81e532335b326c249 SHA1 8a8498ffe7c5cac2994a94ac2372892331a07f7e SHA256 3e903a4e9693fcc3affd735969b90c9e199697f02009ca43882a3d3a75607341
 MD5 23a07d4f778d5c58a736240cfd21c722 metadata.xml 430
 RMD160 fd4493b55b7373e6e7d76ad81e532335b326c249 metadata.xml 430
@@ -88,12 +76,6 @@ SHA256 a246ee2bcd4f324ce902f48e815880d7352c85388cffa2ed2afa255410ccc796 files/di
 MD5 10918fc5aac4314bd2e5c68ba12bddb2 files/digest-freetype-1.3.1-r5 500
 RMD160 6aea5fc9334cbb19738b9e764dca8b58f0030197 files/digest-freetype-1.3.1-r5 500
 SHA256 a246ee2bcd4f324ce902f48e815880d7352c85388cffa2ed2afa255410ccc796 files/digest-freetype-1.3.1-r5 500
-MD5 d33781f3adf344a639640e0844d04648 files/digest-freetype-2.1.10 515
-RMD160 546b1215dc36b35c4a77ad14177f009eac7821f2 files/digest-freetype-2.1.10 515
-SHA256 f1f2333b7e69d3f6dc43053862bdae95e1684129d208f8dca3dc33a083c55516 files/digest-freetype-2.1.10 515
-MD5 d33781f3adf344a639640e0844d04648 files/digest-freetype-2.1.10-r1 515
-RMD160 546b1215dc36b35c4a77ad14177f009eac7821f2 files/digest-freetype-2.1.10-r1 515
-SHA256 f1f2333b7e69d3f6dc43053862bdae95e1684129d208f8dca3dc33a083c55516 files/digest-freetype-2.1.10-r1 515
 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
@@ -106,7 +88,7 @@ SHA256 ba210855afe97ebccdc658a1d2ab68c385ce05567abbfc0963a31ce53dd6f475 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFyy36AiZjviIA2XgRAgFiAJ9HAH+mr6Ndri1jJXjc1ONg2xH3pQCgwYD5
-rSxz4lI6ipe1+XlKfj/C4lE=
-=Z1yO
+iD8DBQFFyzB3AiZjviIA2XgRAubAAKC1ViXFX9qb6XHJbItp+miat4fCBgCgrNp+
+JjJt4wt064sSybRcLtiDQW0=
+=2Pp8
 -----END PGP SIGNATURE-----
diff --git a/media-libs/freetype/files/digest-freetype-2.1.10 b/media-libs/freetype/files/digest-freetype-2.1.10
deleted file mode 100644 (file)
index a7c77ab..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-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/files/digest-freetype-2.1.10-r1 b/media-libs/freetype/files/digest-freetype-2.1.10-r1
deleted file mode 100644 (file)
index a7c77ab..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-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/files/freetype-2.1.10-security_batch.patch b/media-libs/freetype/files/freetype-2.1.10-security_batch.patch
deleted file mode 100644 (file)
index 1dbb548..0000000
+++ /dev/null
@@ -1,304 +0,0 @@
-diff -uNr -x '*.orig' freetype-2.1.10/include/freetype/fterrdef.h freetype-2.1.10.patched/include/freetype/fterrdef.h
---- freetype-2.1.10/include/freetype/fterrdef.h        2004-02-12 09:33:20.000000000 +0100
-+++ freetype-2.1.10.patched/include/freetype/fterrdef.h        2006-06-19 19:16:07.000000000 +0200
-@@ -52,6 +52,8 @@
-                 "broken table" )
-   FT_ERRORDEF_( Invalid_Offset,                              0x09, \
-                 "broken offset within table" )
-+  FT_ERRORDEF_( Array_Too_Large,                             0x0A, \
-+                "array allocation size too large" )
- 
-   /* glyph/character errors */
- 
-@@ -226,6 +228,8 @@
-                 "`ENCODING' field missing" )
-   FT_ERRORDEF_( Missing_Bbx_Field,                           0xB6, \
-                 "`BBX' field missing" )
-+  FT_ERRORDEF_( Bbx_Too_Big,                                 0xB7, \
-+                "`BBX' too big" )
- 
- 
- /* END */
-diff -uNr -x '*.orig' freetype-2.1.10/src/base/ftmac.c freetype-2.1.10.patched/src/base/ftmac.c
---- freetype-2.1.10/src/base/ftmac.c   2004-08-28 10:02:46.000000000 +0200
-+++ freetype-2.1.10.patched/src/base/ftmac.c   2006-06-19 19:16:07.000000000 +0200
-@@ -430,6 +430,7 @@
-     short          res_id;
-     unsigned char  *buffer, *p, *size_p = NULL;
-     FT_ULong       total_size = 0;
-+    FT_ULong       old_total_size = 0;
-     FT_ULong       post_size, pfb_chunk_size;
-     Handle         post_data;
-     char           code, last_code;
-@@ -460,6 +461,15 @@
- 
-       total_size += GetHandleSize( post_data ) - 2;
-       last_code = code;
-+
-+      /* detect integer overflows */
-+      if ( total_size < old_total_size )
-+      {
-+        error = FT_Err_Array_Too_Large;
-+        goto Error;
-+      }
-+
-+      old_total_size = total_size;
-     }
- 
-     if ( FT_ALLOC( buffer, (FT_Long)total_size ) )
-diff -uNr -x '*.orig' freetype-2.1.10/src/base/ftstream.c freetype-2.1.10.patched/src/base/ftstream.c
---- freetype-2.1.10/src/base/ftstream.c        2005-03-16 02:15:07.000000000 +0100
-+++ freetype-2.1.10.patched/src/base/ftstream.c        2006-06-19 19:16:07.000000000 +0200
-@@ -213,7 +213,12 @@
-       FT_Memory  memory = stream->memory;
- 
- 
-+#ifdef FT_DEBUG_MEMORY
-+      ft_mem_free( memory, *pbytes );
-+      *pbytes = NULL;
-+#else
-       FT_FREE( *pbytes );
-+#endif
-     }
-     *pbytes = 0;
-   }
-@@ -299,7 +304,12 @@
-       FT_Memory  memory = stream->memory;
- 
- 
-+#ifdef FT_DEBUG_MEMORY
-+      ft_mem_free( memory, stream->base );
-+      stream->base = NULL;
-+#else
-       FT_FREE( stream->base );
-+#endif
-     }
-     stream->cursor = 0;
-     stream->limit  = 0;
-diff -uNr -x '*.orig' freetype-2.1.10/src/base/ftutil.c freetype-2.1.10.patched/src/base/ftutil.c
---- freetype-2.1.10/src/base/ftutil.c  2005-03-03 23:59:06.000000000 +0100
-+++ freetype-2.1.10.patched/src/base/ftutil.c  2006-06-19 19:15:53.000000000 +0200
-@@ -52,6 +52,8 @@
-             FT_Long    size,
-             void*     *P )
-   {
-+    FT_Error  error = FT_Err_Ok;
-+
-     FT_ASSERT( P != 0 );
- 
-     if ( size > 0 )
-@@ -68,13 +70,17 @@
-       FT_MEM_ZERO( *P, size );
-     }
-     else
-+    {
-       *P = NULL;
-+      if ( size < 0 )
-+      error = FT_Err_Invalid_Argument;
-+    }
- 
-     FT_TRACE7(( "FT_Alloc:" ));
-     FT_TRACE7(( " size = %ld, block = 0x%08p, ref = 0x%08p\n",
-                 size, *P, P ));
- 
--    return FT_Err_Ok;
-+    return error;
-   }
- 
- 
-@@ -128,12 +134,15 @@
-       return FT_Alloc( memory, size, P );
- 
-     /* if the new block if zero-sized, clear the current one */
--    if ( size <= 0 )
-+    if ( size == 0 )
-     {
-       FT_Free( memory, P );
-       return FT_Err_Ok;
-     }
- 
-+    if ( size < 0 || current < 0 )
-+      return FT_Err_Invalid_Argument;
-+
-     Q = memory->realloc( memory, current, size, *P );
-     if ( !Q )
-       goto Fail;
-diff -uNr -x '*.orig' freetype-2.1.10/src/bdf/bdflib.c freetype-2.1.10.patched/src/bdf/bdflib.c
---- freetype-2.1.10/src/bdf/bdflib.c   2005-05-21 19:19:52.000000000 +0200
-+++ freetype-2.1.10.patched/src/bdf/bdflib.c   2006-06-19 19:16:01.000000000 +0200
-@@ -1092,6 +1092,7 @@
- #define ERRMSG1  "[line %ld] Missing \"%s\" line.\n"
- #define ERRMSG2  "[line %ld] Font header corrupted or missing fields.\n"
- #define ERRMSG3  "[line %ld] Font glyphs corrupted or missing fields.\n"
-+#define ERRMSG4  "[line %ld] BBX too big.\n"
- 
- 
-   static FT_Error
-@@ -1561,6 +1562,14 @@
- 
-       p->glyph_enc = _bdf_atol( p->list.field[1], 0, 10 );
- 
-+      /* Check that the encoding is in the range [0,65536] because        */
-+      /* otherwise p->have (a bitmap with static size) overflows.         */
-+      if ( p->glyph_enc >= sizeof(p->have)*8 )
-+      {
-+        error = BDF_Err_Invalid_File_Format;
-+        goto Exit;
-+      }
-+
-       /* Check to see whether this encoding has already been encountered. */
-       /* If it has then change it to unencoded so it gets added if        */
-       /* indicated.                                                       */
-@@ -1805,6 +1814,8 @@
-     /* And finally, gather up the bitmap. */
-     if ( ft_memcmp( line, "BITMAP", 6 ) == 0 )
-     {
-+      unsigned long  bitmap_size;
-+
-       if ( !( p->flags & _BDF_BBX ) )
-       {
-         /* Missing BBX field. */
-@@ -1815,7 +1826,16 @@
- 
-       /* Allocate enough space for the bitmap. */
-       glyph->bpr   = ( glyph->bbx.width * p->font->bpp + 7 ) >> 3;
--      glyph->bytes = (unsigned short)( glyph->bpr * glyph->bbx.height );
-+
-+      bitmap_size = glyph->bpr * glyph->bbx.height;
-+      if ( bitmap_size > 0xFFFFU )
-+      {
-+        FT_ERROR(( "_bdf_parse_glyphs: " ERRMSG4, lineno ));
-+        error = BDF_Err_Bbx_Too_Big;
-+        goto Exit;
-+      }
-+      else
-+        glyph->bytes = (unsigned short)bitmap_size;
- 
-       if ( FT_NEW_ARRAY( glyph->bitmap, glyph->bytes ) )
-         goto Exit;
-diff -uNr -x '*.orig' freetype-2.1.10/src/cff/cffgload.c freetype-2.1.10.patched/src/cff/cffgload.c
---- freetype-2.1.10/src/cff/cffgload.c 2005-04-18 06:53:05.000000000 +0200
-+++ freetype-2.1.10.patched/src/cff/cffgload.c 2006-06-19 19:16:01.000000000 +0200
-@@ -2284,7 +2284,7 @@
-   FT_LOCAL_DEF( FT_Error )
-   cff_slot_load( CFF_GlyphSlot  glyph,
-                  CFF_Size       size,
--                 FT_Int         glyph_index,
-+                 FT_UInt        glyph_index,
-                  FT_Int32       load_flags )
-   {
-     FT_Error      error;
-diff -uNr -x '*.orig' freetype-2.1.10/src/cff/cffgload.h freetype-2.1.10.patched/src/cff/cffgload.h
---- freetype-2.1.10/src/cff/cffgload.h 2004-05-13 23:59:17.000000000 +0200
-+++ freetype-2.1.10.patched/src/cff/cffgload.h 2006-06-19 19:16:01.000000000 +0200
-@@ -196,7 +196,7 @@
-   FT_LOCAL( FT_Error )
-   cff_slot_load( CFF_GlyphSlot  glyph,
-                  CFF_Size       size,
--                 FT_Int         glyph_index,
-+                 FT_UInt        glyph_index,
-                  FT_Int32       load_flags );
- 
- 
-diff -uNr -x '*.orig' freetype-2.1.10/src/cff/cffload.c freetype-2.1.10.patched/src/cff/cffload.c
---- freetype-2.1.10/src/cff/cffload.c  2005-05-06 07:49:46.000000000 +0200
-+++ freetype-2.1.10.patched/src/cff/cffload.c  2006-06-19 19:15:46.000000000 +0200
-@@ -1235,7 +1235,7 @@
-       }
- 
-       /* access element */
--      if ( off1 )
-+      if ( off1 && off2 > off1 )
-       {
-         *pbyte_len = off2 - off1;
- 
-@@ -2011,7 +2011,7 @@
- 
-     if ( error )
-       goto Exit;
--
-+ 
-     /* if it is a CID font, we stop there */
-     if ( top->cid_registry != 0xFFFFU )
-       goto Exit;
-diff -uNr -x '*.orig' freetype-2.1.10/src/pshinter/pshglob.c freetype-2.1.10.patched/src/pshinter/pshglob.c
---- freetype-2.1.10/src/pshinter/pshglob.c     2004-04-02 09:13:53.000000000 +0200
-+++ freetype-2.1.10.patched/src/pshinter/pshglob.c     2006-06-19 19:15:46.000000000 +0200
-@@ -150,7 +150,7 @@
-     FT_UNUSED( target );
- 
- 
--    for ( ; read_count > 0; read_count -= 2 )
-+    for ( ; read_count > 1; read_count -= 2 )
-     {
-       FT_Int         reference, delta;
-       FT_UInt        count;
-diff -uNr -x '*.orig' freetype-2.1.10/src/raster/ftrend1.c freetype-2.1.10.patched/src/raster/ftrend1.c
---- freetype-2.1.10/src/raster/ftrend1.c       2005-05-11 17:01:49.000000000 +0200
-+++ freetype-2.1.10.patched/src/raster/ftrend1.c       2006-06-19 19:16:07.000000000 +0200
-@@ -21,6 +21,7 @@
- #include FT_OUTLINE_H
- #include "ftrend1.h"
- #include "ftraster.h"
-+#include <limits.h>
- 
- #include "rasterrs.h"
- 
-@@ -175,6 +176,9 @@
-     bitmap->rows  = height;
-     bitmap->pitch = pitch;
- 
-+    if ((FT_ULong)pitch > LONG_MAX/height)
-+      goto Exit;
-+
-     if ( FT_ALLOC( bitmap->buffer, (FT_ULong)pitch * height ) )
-       goto Exit;
- 
-diff -uNr -x '*.orig' freetype-2.1.10/src/sfnt/ttcmap.c freetype-2.1.10.patched/src/sfnt/ttcmap.c
---- freetype-2.1.10/src/sfnt/ttcmap.c  2005-05-11 16:37:40.000000000 +0200
-+++ freetype-2.1.10.patched/src/sfnt/ttcmap.c  2006-06-19 19:16:01.000000000 +0200
-@@ -2144,9 +2144,7 @@
-       charmap.encoding    = FT_ENCODING_NONE;  /* will be filled later */
-       offset              = TT_NEXT_ULONG( p );
- 
--      if ( offset                     &&
--           table + offset + 2 < limit &&
--           table + offset >= table    )
-+      if ( offset && offset <= face->cmap_size - 2 )
-       {
-         FT_Byte*                       cmap   = table + offset;
-         volatile FT_UInt               format = TT_PEEK_USHORT( cmap );
-diff -uNr -x '*.orig' freetype-2.1.10/src/sfnt/ttpost.c freetype-2.1.10.patched/src/sfnt/ttpost.c
---- freetype-2.1.10/src/sfnt/ttpost.c  2003-10-29 22:43:51.000000000 +0100
-+++ freetype-2.1.10.patched/src/sfnt/ttpost.c  2006-06-19 19:16:07.000000000 +0200
-@@ -292,7 +292,7 @@
-       goto Exit;
-     }
- 
--    if ( FT_ALLOC( offset_table, num_glyphs )       ||
-+    if ( FT_NEW_ARRAY( offset_table, num_glyphs )   ||
-          FT_STREAM_READ( offset_table, num_glyphs ) )
-       goto Fail;
- 
-diff -uNr -x '*.orig' freetype-2.1.10/src/winfonts/winfnt.c freetype-2.1.10.patched/src/winfonts/winfnt.c
---- freetype-2.1.10/src/winfonts/winfnt.c      2004-06-15 16:13:10.000000000 +0200
-+++ freetype-2.1.10.patched/src/winfonts/winfnt.c      2006-06-19 19:16:07.000000000 +0200
-@@ -27,6 +27,8 @@
- #include FT_SERVICE_WINFNT_H
- #include FT_SERVICE_XFREE86_NAME_H
- 
-+#include <limits.h>
-+
-   /*************************************************************************/
-   /*                                                                       */
-   /* The macro FT_COMPONENT is used in trace mode.  It is an implicit      */
-@@ -633,6 +635,9 @@
- 
-       /* note: since glyphs are stored in columns and not in rows we */
-       /*       can't use ft_glyphslot_set_bitmap                     */
-+      if (pitch > LONG_MAX/bitmap->rows)
-+      goto Exit;
-+
-       if ( FT_ALLOC( bitmap->buffer, pitch * bitmap->rows ) )
-         goto Exit;
- 
diff --git a/media-libs/freetype/freetype-2.1.10-r1.ebuild b/media-libs/freetype/freetype-2.1.10-r1.ebuild
deleted file mode 100644 (file)
index ff1c25f..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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-r1.ebuild,v 1.2 2007/01/05 08:06:37 flameeyes 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
-       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 ${FILESDIR}/${P}-security_batch.patch
-       # revert pointer
-       epatch ${FILESDIR}/${P}-revert_pointer.patch
-       # fix artificial bold bug (#127872)
-       cd ${S}/src/base
-       epatch ${FILESDIR}/${P}-fix_synth.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
-
-       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/*
-
-}
diff --git a/media-libs/freetype/freetype-2.1.10.ebuild b/media-libs/freetype/freetype-2.1.10.ebuild
deleted file mode 100644 (file)
index 03c2443..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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.ebuild,v 1.7 2007/01/05 08:06:37 flameeyes Exp $
-
-inherit eutils flag-o-matic libtool
-
-SPV="`echo ${PV} | cut -d. -f1,2`"
-
-DESCRIPTION="A high-quality and portable font engine"
-HOMEPAGE="http://www.freetype.org/"
-SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.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
-
-       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
-
-       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/*
-
-}