[pkgsrc/trunk]: pkgsrc/x11/libXfont update to 1.4.5

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/56ad92d36072
branches:  trunk
changeset: 604537:56ad92d36072
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Fri Jun 01 20:19:16 2012 +0000

description:
update to 1.4.5
changes: misc fixes, most notably the fix for the LZW decompression
security issue was integrated

diffstat:

 x11/libXfont/Makefile                                |   4 +-
 x11/libXfont/distinfo                                |   9 +-
 x11/libXfont/patches/patch-src-fontfile-decompress.c |  84 --------------------
 3 files changed, 6 insertions(+), 91 deletions(-)

diffs (115 lines):

diff -r 525f7d11addf -r 56ad92d36072 x11/libXfont/Makefile
--- a/x11/libXfont/Makefile     Fri Jun 01 20:16:06 2012 +0000
+++ b/x11/libXfont/Makefile     Fri Jun 01 20:19:16 2012 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2011/11/14 14:24:14 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2012/06/01 20:19:16 drochner Exp $
 #
 
-DISTNAME=              libXfont-1.4.4
+DISTNAME=              libXfont-1.4.5
 CATEGORIES=            x11 devel fonts
 MASTER_SITES=          ${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=          .tar.bz2
diff -r 525f7d11addf -r 56ad92d36072 x11/libXfont/distinfo
--- a/x11/libXfont/distinfo     Fri Jun 01 20:16:06 2012 +0000
+++ b/x11/libXfont/distinfo     Fri Jun 01 20:19:16 2012 +0000
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.17 2011/11/14 13:34:10 cheusov Exp $
+$NetBSD: distinfo,v 1.18 2012/06/01 20:19:16 drochner Exp $
 
-SHA1 (libXfont-1.4.4.tar.bz2) = 189dd7a3756cb80bcf41b779bf05ec3c366e3041
-RMD160 (libXfont-1.4.4.tar.bz2) = 0241b2505ed65b0bd66d8bd3c80330a4db6eea6d
-Size (libXfont-1.4.4.tar.bz2) = 440022 bytes
-SHA1 (patch-src-fontfile-decompress.c) = 9a51f6be0a40e3d785d6cf7d14f09c165be09f0b
+SHA1 (libXfont-1.4.5.tar.bz2) = 0bf3cb8aa192ab96bbaf384d1a4a00d15a40171e
+RMD160 (libXfont-1.4.5.tar.bz2) = f7749eb4fb7f8e73921c45c5bdcb48fc5f9a0645
+Size (libXfont-1.4.5.tar.bz2) = 470879 bytes
diff -r 525f7d11addf -r 56ad92d36072 x11/libXfont/patches/patch-src-fontfile-decompress.c
--- a/x11/libXfont/patches/patch-src-fontfile-decompress.c      Fri Jun 01 20:16:06 2012 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-$NetBSD: patch-src-fontfile-decompress.c,v 1.1 2011/08/18 22:58:24 joerg Exp $
-
-Fix buffer overflow in LZW handler.
-
---- src/fontfile/decompress.c.orig     2010-06-23 11:18:18.000000000 +0000
-+++ src/fontfile/decompress.c
-@@ -99,7 +99,7 @@ static char_type magic_header[] = { "\03
- #define FIRST 257     /* first free entry */
- #define       CLEAR   256     /* table clear output code */
- 
--#define STACK_SIZE  8192
-+#define STACK_SIZE  65300
- 
- typedef struct _compressedFILE {
-     BufFilePtr            file;
-@@ -180,14 +180,12 @@ BufFilePushCompressed (BufFilePtr f)
-       file->tab_suffix[code] = (char_type) code;
-     }
-     file->free_ent = ((file->block_compress) ? FIRST : 256 );
-+    file->oldcode = -1;
-     file->clear_flg = 0;
-     file->offset = 0;
-     file->size = 0;
-     file->stackp = file->de_stack;
-     bzero(file->buf, BITS);
--    file->finchar = file->oldcode = getcode (file);
--    if (file->oldcode != -1)
--      *file->stackp++ = file->finchar;
-     return BufFileCreate ((char *) file,
-                         BufCompressedFill,
-                         0,
-@@ -232,9 +230,6 @@ BufCompressedFill (BufFilePtr f)
-       if (buf == bufend)
-           break;
- 
--      if (oldcode == -1)
--          break;
--
-       code = getcode (file);
-       if (code == -1)
-           break;
-@@ -243,19 +238,29 @@ BufCompressedFill (BufFilePtr f)
-           for ( code = 255; code >= 0; code-- )
-               file->tab_prefix[code] = 0;
-           file->clear_flg = 1;
--          file->free_ent = FIRST - 1;
--          if ( (code = getcode (file)) == -1 )        /* O, untimely death! */
--              break;
-+          file->free_ent = FIRST;
-+          oldcode = -1;
-+          continue;
-       }
-       incode = code;
-       /*
-        * Special case for KwKwK string.
-        */
-       if ( code >= file->free_ent ) {
-+          if ( code > file->free_ent || oldcode == -1 ) {
-+              /* Bad stream. */
-+              return BUFFILEEOF;
-+          }
-           *stackp++ = finchar;
-           code = oldcode;
-       }
--    
-+      /*
-+       * The above condition ensures that code < free_ent.
-+       * The construction of tab_prefixof in turn guarantees that
-+       * each iteration decreases code and therefore stack usage is
-+       * bound by 1 << BITS - 256.
-+       */
-+
-       /*
-        * Generate output characters in reverse order
-        */
-@@ -270,7 +275,7 @@ BufCompressedFill (BufFilePtr f)
-       /*
-        * Generate the new entry.
-        */
--      if ( (code=file->free_ent) < file->maxmaxcode ) {
-+      if ( (code=file->free_ent) < file->maxmaxcode && oldcode != -1) {
-           file->tab_prefix[code] = (unsigned short)oldcode;
-           file->tab_suffix[code] = finchar;
-           file->free_ent = code+1;