update to 1.2.8

changes:
-the integer overflow fixes went in (was patched in pkgsrc)
-build fixes

4 files changed, 6 insertions, 60 deletions

diff --git a/x11/libXfont/Makefile b/x11/libXfont/Makefile
index 3331edb0ecb..b10a8e3b19e 100644
--- a/x11/libXfont/Makefile
+++ b/x11/libXfont/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2007/04/03 20:27:20 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2007/04/10 17:43:13 drochner Exp $
 #
 
-DISTNAME=		libXfont-1.2.7
-PKGREVISION=		1
+DISTNAME=		libXfont-1.2.8
 CATEGORIES=		x11 devel fonts
 MASTER_SITES=		http://xorg.freedesktop.org/releases/individual/lib/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/libXfont/distinfo b/x11/libXfont/distinfo
index 07a0c768b8a..86d5fa272f1 100644
--- a/x11/libXfont/distinfo
+++ b/x11/libXfont/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.3 2007/04/03 20:27:20 drochner Exp $
+$NetBSD: distinfo,v 1.4 2007/04/10 17:43:25 drochner Exp $
 
-SHA1 (libXfont-1.2.7.tar.bz2) = 60deba746e544785ca05c7c68ccfbd5d71370a29
-RMD160 (libXfont-1.2.7.tar.bz2) = 33e2688d1e3490d8b588ca2304b3d4068568dcae
-Size (libXfont-1.2.7.tar.bz2) = 573915 bytes
-SHA1 (patch-aa) = c5914dee0f48eee37e7c389bfcd5cbe2e4f0b015
-SHA1 (patch-ab) = cebfd94e8f12c24e65c912b31652265ff798402f
+SHA1 (libXfont-1.2.8.tar.bz2) = 4d8801450d2a9282a84f55ea78a7d184bc8a6411
+RMD160 (libXfont-1.2.8.tar.bz2) = da08bf640890b630072fba768a8a64fc2ae94d0b
+Size (libXfont-1.2.8.tar.bz2) = 583236 bytes
diff --git a/x11/libXfont/patches/patch-aa b/x11/libXfont/patches/patch-aa
deleted file mode 100644
index 515eafd385c..00000000000
--- a/x11/libXfont/patches/patch-aa
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2007/04/03 20:27:21 drochner Exp $
-
---- src/bitmap/bdfread.c.orig	2007-04-03 19:01:20.000000000 +0200
-+++ src/bitmap/bdfread.c
-@@ -65,6 +65,12 @@ from The Open Group.
- #include <X11/fonts/bitmap.h>
- #include <X11/fonts/bdfint.h>
- 
-+#if HAVE_STDINT_H
-+#include <stdint.h>
-+#elif !defined(INT32_MAX)
-+#define INT32_MAX 0x7fffffff
-+#endif
-+
- #define INDICES 256
- #define MAXENCODING 0xFFFF
- #define BDFLINELEN  1024
-@@ -288,6 +294,11 @@ bdfReadCharacters(FontFilePtr file, Font
- 	bdfError("invalid number of CHARS in BDF file\n");
- 	return (FALSE);
-     }
-+    if (nchars > INT32_MAX / sizeof(CharInfoRec)) {
-+	bdfError("Couldn't allocate pCI (%d*%d)\n", nchars,
-+		 sizeof(CharInfoRec));
-+	goto BAILOUT;
-+    }
-     ci = (CharInfoPtr) xalloc(nchars * sizeof(CharInfoRec));
-     if (!ci) {
- 	bdfError("Couldn't allocate pCI (%d*%d)\n", nchars,
diff --git a/x11/libXfont/patches/patch-ab b/x11/libXfont/patches/patch-ab
deleted file mode 100644
index 84065b279fe..00000000000
--- a/x11/libXfont/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2007/04/03 20:27:21 drochner Exp $
-
---- src/fontfile/fontdir.c.orig	2007-04-03 19:04:16.000000000 +0200
-+++ src/fontfile/fontdir.c
-@@ -38,9 +38,17 @@ in this Software without prior written a
- #include    <X11/fonts/fntfilst.h>
- #include    <X11/keysym.h>
- 
-+#if HAVE_STDINT_H
-+#include <stdint.h>
-+#elif !defined(INT32_MAX)
-+#define INT32_MAX 0x7fffffff
-+#endif
-+
- Bool
- FontFileInitTable (FontTablePtr table, int size)
- {
-+    if (size < 0 || (size > INT32_MAX/sizeof(FontEntryRec)))
-+	return FALSE;
-     if (size)
-     {
- 	table->entries = (FontEntryPtr) xalloc(sizeof(FontEntryRec) * size);