Update to 1.3.2:

Adam Jackson (1):
libXfont 1.3.2

Jens Granseuer (1):
fix build with gcc 2.95.

Matthieu Herrb (3):
catalogue.c: prevent a one character overflow
ftsystem.c is not needed anymore.
Fix for CVE-2008-0006 - PCF Font parser buffer overflow.

Tilman Sauerbeck (1):
Replaced one instance of bcopy() with memcpy().

4 files changed, 6 insertions, 46 deletions

diff --git a/x11/libXfont/Makefile b/x11/libXfont/Makefile
index 345e54f39f5..926f2315a13 100644
--- a/x11/libXfont/Makefile
+++ b/x11/libXfont/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2008/01/20 18:24:51 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2008/03/07 20:16:19 wiz Exp $
 #
 
-DISTNAME=		libXfont-1.3.1
-PKGREVISION=		2
+DISTNAME=		libXfont-1.3.2
 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 7ad7599a202..a0fe2648f52 100644
--- a/x11/libXfont/distinfo
+++ b/x11/libXfont/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.9 2008/01/21 13:56:28 tnn Exp $
+$NetBSD: distinfo,v 1.10 2008/03/07 20:16:19 wiz Exp $
 
-SHA1 (libXfont-1.3.1.tar.bz2) = 90153414cd3580d92cad6469166c099749cddd29
-RMD160 (libXfont-1.3.1.tar.bz2) = 13c8ed7b33ec0c4f08c032d74958e49d3c177464
-Size (libXfont-1.3.1.tar.bz2) = 564235 bytes
-SHA1 (patch-aa) = e421de2c9b67b46c2dab651ba1bab13fd08df914
-SHA1 (patch-ab) = 56339bd99f714be3d9a7d697c39eab1b13794c3b
+SHA1 (libXfont-1.3.2.tar.bz2) = 3723147f97dd77d12da4a69c7ce4ebd1040e1a42
+RMD160 (libXfont-1.3.2.tar.bz2) = e27e4d14357c56044994a4c757891a3b7ca2e695
+Size (libXfont-1.3.2.tar.bz2) = 584023 bytes
 SHA1 (patch-ac) = de3952fb43533b3f325096e330bd0bf996bb4a47
diff --git a/x11/libXfont/patches/patch-aa b/x11/libXfont/patches/patch-aa
deleted file mode 100644
index c0509f80809..00000000000
--- a/x11/libXfont/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2007/09/24 16:24:48 joerg Exp $
-
---- src/fontfile/catalogue.c.orig	2007-09-24 18:18:59.000000000 +0200
-+++ src/fontfile/catalogue.c
-@@ -156,7 +156,7 @@ CatalogueRescan (FontPathElementPtr fpe)
-     while (entry = readdir(dir), entry != NULL)
-     {
- 	snprintf(link, sizeof link, "%s/%s", path, entry->d_name);
--	len = readlink(link, dest, sizeof dest);
-+	len = readlink(link, dest, sizeof dest - 1);
- 	if (len < 0)
- 	    continue;
- 
diff --git a/x11/libXfont/patches/patch-ab b/x11/libXfont/patches/patch-ab
deleted file mode 100644
index 8fb87af94eb..00000000000
--- a/x11/libXfont/patches/patch-ab
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2008/01/20 18:24:51 joerg Exp $
-
---- src/bitmap/pcfread.c.orig	2007-09-05 02:18:23.000000000 +0200
-+++ src/bitmap/pcfread.c
-@@ -588,6 +588,9 @@ pcfReadFont(FontPtr pFont, FontFilePtr f
-     pFont->info.lastRow = pcfGetINT16(file, format);
-     pFont->info.defaultCh = pcfGetINT16(file, format);
-     if (IS_EOF(file)) goto Bail;
-+    if (pFont->info.firstCol > pFont->info.lastCol ||
-+       pFont->info.firstRow > pFont->info.lastRow ||
-+       pFont->info.lastCol-pFont->info.firstCol > 255) goto Bail;
- 
-     nencoding = (pFont->info.lastCol - pFont->info.firstCol + 1) *
- 	(pFont->info.lastRow - pFont->info.firstRow + 1);
-@@ -726,6 +729,9 @@ pcfReadFontInfo(FontInfoPtr pFontInfo, F
-     pFontInfo->lastRow = pcfGetINT16(file, format);
-     pFontInfo->defaultCh = pcfGetINT16(file, format);
-     if (IS_EOF(file)) goto Bail;
-+    if (pFontInfo->firstCol > pFontInfo->lastCol ||
-+       pFontInfo->firstRow > pFontInfo->lastRow ||
-+       pFontInfo->lastCol-pFontInfo->firstCol > 255) goto Bail;
- 
-     nencoding = (pFontInfo->lastCol - pFontInfo->firstCol + 1) *
- 	(pFontInfo->lastRow - pFontInfo->firstRow + 1);