diff options
| author | drochner <drochner@pkgsrc.org> | 2012-01-16 12:42:56 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2012-01-16 12:42:56 +0000 |
| commit | 1c8118ef2a236a1c2b444836349d0a7c623ec3eb (patch) | |
| tree | d67f4fbd891677d3eeb50b250e01ba502a9bdb1b /fonts/t1lib | |
| parent | 8f6ef90ff17f75159959244f51976673011dcd53 (diff) | |
| download | pkgsrc-1c8118ef2a236a1c2b444836349d0a7c623ec3eb.tar.gz | |
fix an off-by-one in an earlier fix, from gnome bug #643882
Diffstat (limited to 'fonts/t1lib')
| -rw-r--r-- | fonts/t1lib/Makefile | 4 | ||||
| -rw-r--r-- | fonts/t1lib/distinfo | 4 | ||||
| -rw-r--r-- | fonts/t1lib/patches/patch-ai | 6 |
3 files changed, 7 insertions, 7 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); |