fix an off-by-one in an earlier fix, from gnome bug #643882

6 files changed, 14 insertions, 14 deletions

diff --git a/fonts/t1lib/Makefile b/fonts/t1lib/Makefile
index 677377a07a9..a024aacbc50 100644
--- a/fonts/t1lib/Makefile
+++ b/fonts/t1lib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2012/01/10 19:21:15 drochner Exp $
+# $NetBSD: Makefile,v 1.47 2012/01/16 12:42:56 drochner Exp $
 
 DISTNAME=	t1lib-5.1.2
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	fonts devel graphics
 MASTER_SITES=	${MASTER_SITE_SUNSITE:=libs/graphics/}
 
diff --git a/fonts/t1lib/distinfo b/fonts/t1lib/distinfo
index da4fcdc847b..82cbcb3dcda 100644
--- a/fonts/t1lib/distinfo
+++ b/fonts/t1lib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2012/01/10 19:21:15 drochner Exp $
+$NetBSD: distinfo,v 1.23 2012/01/16 12:42:56 drochner Exp $
 
 SHA1 (t1lib-5.1.2.tar.gz) = 4b4fc22c8688eefaaa8cfc990f0039f95f4287de
 RMD160 (t1lib-5.1.2.tar.gz) = ab22aea390356750d743c0f4b08762aa76ca2a82
@@ -8,7 +8,7 @@ SHA1 (patch-ac) = 14201794e29a2eeba22a9144726ed3e00322aa1d
 SHA1 (patch-ad) = 29c530f6d363de31777ad45823b55e72208c4ccb
 SHA1 (patch-af) = e89df0d94e0748e468c7c3d40ce2fc0ccdb0116c
 SHA1 (patch-ah) = 60ead43eeb6327cd3fd94755364633b6bf5d5d0d
-SHA1 (patch-ai) = 176ed28f114f64c5e97e7c00c684a74895de2df3
+SHA1 (patch-ai) = 372740d7166ebb999a3c280d7de13df0901d9eb9
 SHA1 (patch-aj) = bb915405fc5d64a74de09d7e4daba8822a08fbe1
 SHA1 (patch-ak) = abfbdb17c60b2068e95c5fe8e61ecfadbd85eea1
 SHA1 (patch-al) = b0f0ab9398ce7e3f3bc3e8e54097fd4dbb566bc8
diff --git a/fonts/t1lib/patches/patch-ai b/fonts/t1lib/patches/patch-ai
index e2a7efce5fa..24312a341ef 100644
--- a/fonts/t1lib/patches/patch-ai
+++ b/fonts/t1lib/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.3 2011/03/08 17:13:33 drochner Exp $
+$NetBSD: patch-ai,v 1.4 2012/01/16 12:42:56 drochner Exp $
 
 --- lib/t1lib/parseAFM.c.orig	2007-12-23 15:49:42.000000000 +0000
 +++ lib/t1lib/parseAFM.c
@@ -7,7 +7,7 @@ $NetBSD: patch-ai,v 1.3 2011/03/08 17:13:33 drochner Exp $
      
      while (ch != EOF && ch != ' ' && ch != CR  && ch != LF &&
 -	   ch != CTRL_Z && ch != '\t' && ch != ':' && ch != ';'){
-+	   ch != CTRL_Z && ch != '\t' && ch != ':' && ch != ';' && idx < MAX_NAME){
++	   ch != CTRL_Z && ch != '\t' && ch != ':' && ch != ';' && idx < (MAX_NAME - 1)){
        ident[idx++] = ch;
        ch = fgetc(stream);
      } /* while */
@@ -16,7 +16,7 @@ $NetBSD: patch-ai,v 1.3 2011/03/08 17:13:33 drochner Exp $
      
      idx = 0;
 -    while (ch != EOF && ch != CR  && ch != LF && ch != CTRL_Z) 
-+    while (ch != EOF && ch != CR  && ch != LF && ch != CTRL_Z && idx < MAX_NAME) 
++    while (ch != EOF && ch != CR  && ch != LF && ch != CTRL_Z && idx < (MAX_NAME - 1)) 
      {
          ident[idx++] = ch;
          ch = fgetc(stream);
diff --git a/print/evince/Makefile b/print/evince/Makefile
index c990caa54c5..7959da24529 100644
--- a/print/evince/Makefile
+++ b/print/evince/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.75 2012/01/14 07:44:34 obache Exp $
+# $NetBSD: Makefile,v 1.76 2012/01/16 12:42:56 drochner Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../print/evince/Makefile.common"
-PKGREVISION=	7
+PKGREVISION=	8
 
 COMMENT=		Document viewer
 
diff --git a/print/evince/distinfo b/print/evince/distinfo
index 126697d8b2a..359360e2f19 100644
--- a/print/evince/distinfo
+++ b/print/evince/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.33 2011/02/19 14:42:21 drochner Exp $
+$NetBSD: distinfo,v 1.34 2012/01/16 12:42:56 drochner Exp $
 
 SHA1 (evince-2.32.0.tar.bz2) = 2f06a2b9dfd8667f4b4c6e90be3c49f6fe026fc8
 RMD160 (evince-2.32.0.tar.bz2) = a2d52685ac119b70cf40f320de457b3dfbac2587
 Size (evince-2.32.0.tar.bz2) = 2295272 bytes
 SHA1 (patch-aa) = e42418b7431329767e95d81bf7493b5e3a85cc8b
-SHA1 (patch-ba) = 6d2dfc1cdba6a4ea205cdb34422636d87d10d835
+SHA1 (patch-ba) = 47419b8dd4b3347e84ffa8d57eae8ee471cc8948
 SHA1 (patch-bb) = e4ef54ccb32414e335110167b4bc0363969aa612
 SHA1 (patch-bc) = 36bcaf9ecb6ac88f18272926b8fbb410f981edd9
 SHA1 (patch-bd) = 0922d241c81a9f4bb1c7056e97921299a9705160
diff --git a/print/evince/patches/patch-ba b/print/evince/patches/patch-ba
index 33f1c5b12ca..8ea0a420672 100644
--- a/print/evince/patches/patch-ba
+++ b/print/evince/patches/patch-ba
@@ -1,4 +1,4 @@
-$NetBSD: patch-ba,v 1.2 2011/02/19 14:42:21 drochner Exp $
+$NetBSD: patch-ba,v 1.3 2012/01/16 12:42:56 drochner Exp $
 
 --- backend/dvi/mdvi-lib/afmparse.c.orig	2009-04-24 07:24:16.000000000 +0000
 +++ backend/dvi/mdvi-lib/afmparse.c
@@ -7,7 +7,7 @@ $NetBSD: patch-ba,v 1.2 2011/02/19 14:42:21 drochner Exp $
      idx = 0;
      while (ch != EOF && ch != ' ' && ch != lineterm 
 -           && ch != '\t' && ch != ':' && ch != ';') 
-+           && ch != '\t' && ch != ':' && ch != ';' && idx < MAX_NAME)
++           && ch != '\t' && ch != ':' && ch != ';' && idx < (MAX_NAME - 1))
      {
          ident[idx++] = ch;
          ch = fgetc(stream);
@@ -16,7 +16,7 @@ $NetBSD: patch-ba,v 1.2 2011/02/19 14:42:21 drochner Exp $
      
      idx = 0;
 -    while (ch != EOF && ch != lineterm) 
-+    while (ch != EOF && ch != lineterm && idx < MAX_NAME) 
++    while (ch != EOF && ch != lineterm && idx < (MAX_NAME - 1)) 
      {
          ident[idx++] = ch;
          ch = fgetc(stream);