update to 2.3.4

changes:
-includes security fixes for bdf font handling (was patched in pkgsrc)
-fixes for truetype butecode interpreter

5 files changed, 6 insertions, 91 deletions

diff --git a/graphics/freetype2/Makefile b/graphics/freetype2/Makefile
index 324aa05b86b..38af5681ad5 100644
--- a/graphics/freetype2/Makefile
+++ b/graphics/freetype2/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.58 2007/04/05 16:29:38 drochner Exp $
+# $NetBSD: Makefile,v 1.59 2007/04/10 16:55:31 drochner Exp $
 
-DISTNAME=	freetype-2.3.2
-PKGREVISION=	1
+DISTNAME=	freetype-2.3.4
 PKGNAME=	${DISTNAME:S/-/2-/}
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=freetype/} \
diff --git a/graphics/freetype2/distinfo b/graphics/freetype2/distinfo
index d462e45f845..694adb4c3d2 100644
--- a/graphics/freetype2/distinfo
+++ b/graphics/freetype2/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.22 2007/04/05 16:29:38 drochner Exp $
+$NetBSD: distinfo,v 1.23 2007/04/10 16:55:31 drochner Exp $
 
-SHA1 (freetype-2.3.2.tar.bz2) = 4188a2ed344ddf89bdb1a054fb441019aa4b143d
-RMD160 (freetype-2.3.2.tar.bz2) = e4da77b6f8956d69e57269c5681560beda0ddb27
-Size (freetype-2.3.2.tar.bz2) = 1252007 bytes
-SHA1 (patch-aa) = 0682e65e006c7b02535034c3e247be676af3b98f
-SHA1 (patch-ab) = 257118397011eb68197008842e98b8ef6c96e48d
-SHA1 (patch-ac) = b00c86bf322e2ac6a71a24e27916ca1fa312009b
+SHA1 (freetype-2.3.4.tar.bz2) = 09b8f5ecbb3e06a14cc1c2f2dc7c04fe34c48eca
+RMD160 (freetype-2.3.4.tar.bz2) = 23b641c0b6e6102449e6f2512a131743d8836321
+Size (freetype-2.3.4.tar.bz2) = 1277929 bytes
diff --git a/graphics/freetype2/patches/patch-aa b/graphics/freetype2/patches/patch-aa
deleted file mode 100644
index 4823ddcb1be..00000000000
--- a/graphics/freetype2/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2007/03/23 22:09:18 joerg Exp $
-
---- builds/unix/configure.ac.orig	2007-03-23 21:59:42.000000000 +0000
-+++ builds/unix/configure.ac
-@@ -218,7 +218,7 @@ if test x$with_old_mac_fonts = xyes; the
-        ],
-        [
- 
--         /* OSHostByteOrder() is typed as `OS_INLINE' */
-+         /* OSHostByteOrder() is typed as'OS_INLINE' */
-          int32_t  os_byte_order = OSHostByteOrder();
- 
- 
diff --git a/graphics/freetype2/patches/patch-ab b/graphics/freetype2/patches/patch-ab
deleted file mode 100644
index 45bcc1a724f..00000000000
--- a/graphics/freetype2/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.10 2007/03/23 22:09:18 joerg Exp $
-
---- builds/unix/configure.orig	2007-03-23 22:01:14.000000000 +0000
-+++ builds/unix/configure
-@@ -6059,7 +6059,7 @@ main ()
- {
- 
- 
--         /* OSHostByteOrder() is typed as `OS_INLINE' */
-+         /* OSHostByteOrder() is typed as 'OS_INLINE' */
-          int32_t  os_byte_order = OSHostByteOrder();
- 
- 
diff --git a/graphics/freetype2/patches/patch-ac b/graphics/freetype2/patches/patch-ac
deleted file mode 100644
index 74ee4b8532e..00000000000
--- a/graphics/freetype2/patches/patch-ac
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2007/04/05 16:29:38 drochner Exp $
-
---- src/bdf/bdflib.c.orig	2007-02-12 22:29:20.000000000 +0100
-+++ src/bdf/bdflib.c
-@@ -385,8 +385,10 @@
-   } _bdf_parse_t;
- 
- 
--#define setsbit( m, cc )  ( m[(cc) >> 3] |= (FT_Byte)( 1 << ( (cc) & 7 ) ) )
--#define sbitset( m, cc )  ( m[(cc) >> 3]  & ( 1 << ( (cc) & 7 ) ) )
-+#define setsbit( m, cc ) \
-+          ( m[(FT_Byte)(cc) >> 3] |= (FT_Byte)( 1 << ( (cc) & 7 ) ) )
-+#define sbitset( m, cc ) \
-+          ( m[(FT_Byte)(cc) >> 3]  & ( 1 << ( (cc) & 7 ) ) )
- 
- 
-   static void
-@@ -1130,7 +1132,7 @@
-                             bdf_options_t*  opts )
-   {
-     unsigned long  len;
--    char           name[128];
-+    char           name[256];
-     _bdf_list_t    list;
-     FT_Memory      memory;
-     FT_Error       error = BDF_Err_Ok;
-@@ -1149,6 +1151,13 @@
-     font->spacing = opts->font_spacing;
- 
-     len = (unsigned long)( ft_strlen( font->name ) + 1 );
-+    /* Limit ourselves to 256 characters in the font name. */
-+    if ( len >= 256 )
-+    {
-+      error = BDF_Err_Invalid_Argument;
-+      goto Exit;
-+    }
-+
-     FT_MEM_COPY( name, font->name, len );
- 
-     error = _bdf_list_split( &list, (char *)"-", name, len );
-@@ -1467,6 +1476,14 @@
-       if ( p->cnt == 0 )
-         font->glyphs_size = 64;
- 
-+      /* Limit ourselves to 1,114,112 glyphs in the font (this is the */
-+      /* number of code points available in Unicode).                 */
-+      if ( p->cnt >= 1114112UL )
-+      {
-+        error = BDF_Err_Invalid_Argument;
-+        goto Exit;
-+      }
-+
-       if ( FT_NEW_ARRAY( font->glyphs, font->glyphs_size ) )
-         goto Exit;
-