Update to version 5.1.2. Patches removed above are no longer needed,

as they appear to have been incorporated upstream.  Additionally, the
following changes apply:

December 2006: t1lib-5.1.1:
---------------------------
- DESTDIR support was missing and has been addded in install-target i
  for type1afm.
- A bug fix in Anti-Aliasing subsampling code, which could make t1lib crash
  under certain conditions.
- Small number of further fixes, in particular with respect to the build
  mechanism.

December 2007: t1lib-5.1.2:
---------------------------
- Small number of fixes reported by users. The fixes pertain to a
  vulnerability issue, memory access issues.
- More decent handling if Encoding and / or FontBBox specification are
  missing (which is invalid with respect to the specification,
  but recoverable).

5 files changed, 6 insertions, 53 deletions

diff --git a/fonts/t1lib/Makefile b/fonts/t1lib/Makefile
index 44b7fed903c..afd119b1017 100644
--- a/fonts/t1lib/Makefile
+++ b/fonts/t1lib/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2007/11/02 00:41:04 uebayasi Exp $
+# $NetBSD: Makefile,v 1.36 2008/02/11 18:53:38 bjs Exp $
 
-DISTNAME=	t1lib-5.1.0
-PKGREVISION=	6
+DISTNAME=	t1lib-5.1.2
 CATEGORIES=	fonts devel graphics
 MASTER_SITES=	${MASTER_SITE_SUNSITE:=libs/graphics/}
 
diff --git a/fonts/t1lib/distinfo b/fonts/t1lib/distinfo
index b56b5a6a8ac..31bc4777bc9 100644
--- a/fonts/t1lib/distinfo
+++ b/fonts/t1lib/distinfo
@@ -1,13 +1,10 @@
-$NetBSD: distinfo,v 1.18 2007/09/28 08:42:07 drochner Exp $
+$NetBSD: distinfo,v 1.19 2008/02/11 18:53:38 bjs Exp $
 
-SHA1 (t1lib-5.1.0.tar.gz) = 6866561027aa32b0efb1a1aad0aa38cb5e01a299
-RMD160 (t1lib-5.1.0.tar.gz) = f12710159aa8a92e8feb5d934dc45875d198bb58
-Size (t1lib-5.1.0.tar.gz) = 1838635 bytes
+SHA1 (t1lib-5.1.2.tar.gz) = 4b4fc22c8688eefaaa8cfc990f0039f95f4287de
+RMD160 (t1lib-5.1.2.tar.gz) = ab22aea390356750d743c0f4b08762aa76ca2a82
+Size (t1lib-5.1.2.tar.gz) = 1872534 bytes
 SHA1 (patch-aa) = 068c25f733c3037faa5051b527b1e1637d706a20
-SHA1 (patch-ab) = ccc3d498cfd94f1ebe54be8f10384cdd94c6ebf8
 SHA1 (patch-ac) = 14201794e29a2eeba22a9144726ed3e00322aa1d
 SHA1 (patch-ad) = 29c530f6d363de31777ad45823b55e72208c4ccb
 SHA1 (patch-af) = e89df0d94e0748e468c7c3d40ce2fc0ccdb0116c
-SHA1 (patch-ag) = de43462ab574f557627ff3e35cde4ca574d23396
 SHA1 (patch-ah) = 60ead43eeb6327cd3fd94755364633b6bf5d5d0d
-SHA1 (patch-ai) = 52e99f7d71f64e46a87531289fc3e2fce76443c7
diff --git a/fonts/t1lib/patches/patch-ab b/fonts/t1lib/patches/patch-ab
deleted file mode 100644
index 045647ce935..00000000000
--- a/fonts/t1lib/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2006/11/06 11:25:24 joerg Exp $
-
---- type1afm/Makefile.in.orig	2006-11-04 01:08:30.000000000 +0000
-+++ type1afm/Makefile.in
-@@ -89,7 +89,7 @@ clean: dummy
- install: dummy
- 	$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
- 	$(LIBTOOL) --mode=install \
--		$(INSTALL_PROGRAM) type1afm $(bindir)/type1afm
-+		$(INSTALL_PROGRAM) type1afm $(DESTDIR)$(bindir)/type1afm
- 
- 
- uninstall: dummy
diff --git a/fonts/t1lib/patches/patch-ag b/fonts/t1lib/patches/patch-ag
deleted file mode 100644
index af1315c3f05..00000000000
--- a/fonts/t1lib/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2005/09/09 16:59:55 tonio Exp $
-
---- lib/Makefile.in.orig	2005-05-02 00:01:57.000000000 +0200
-+++ lib/Makefile.in
-@@ -135,7 +135,7 @@ libt1.la: $(TYPE1_OBJS) $(T1LIB_OBJS)
- 
- libt1x.la: $(T1LIBX_OBJS)
- 	$(LIBTOOL) --mode=link \
--		$(CC) -o $@ $(T1LIBX_OBJS) \
-+		$(CC) -o $@ $(T1LIBX_OBJS) $(LDFLAGS) libt1.la $(XLIB) \
- 	         -version-info @T1LIB_LT_CURRENT@:@T1LIB_LT_REVISION@:@T1LIB_LT_AGE@ \
- 		 -no-undefined -rpath $(libdir)
- 	cp t1lib/t1libx.h .
diff --git a/fonts/t1lib/patches/patch-ai b/fonts/t1lib/patches/patch-ai
deleted file mode 100644
index ec76de470af..00000000000
--- a/fonts/t1lib/patches/patch-ai
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2007/09/28 08:42:08 drochner Exp $
-
---- lib/t1lib/t1env.c.orig	2007-09-28 10:35:07.000000000 +0200
-+++ lib/t1lib/t1env.c
-@@ -611,6 +611,12 @@ char *intT1_Env_GetCompletePath( char *F
- #endif 
-     strcat( pathbuf, DIRECTORY_SEP);
-     /* And finally the filename: */
-+    /* If current pathbuf + StrippedName + 1 byte for NULL is bigger than pathbuf
-+       let's try next pathbuf */
-+    if( strlen(pathbuf) + strlen(StrippedName) + 1 > sizeof(pathbuf) ) {
-+       i++;
-+       continue;
-+    }
-     strcat( pathbuf, StrippedName);
-     
-     /* Check for existence of the path: */