[pkgsrc/trunk]: pkgsrc/print/teTeX-bin Apply xpdf-3.00pl3.patch also to fix a...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0c237084babb
branches:  trunk
changeset: 488056:0c237084babb
user:      kei <kei%pkgsrc.org@localhost>
date:      Mon Jan 24 15:22:16 2005 +0000

description:
Apply xpdf-3.00pl3.patch also to fix a security problem which is discribed in
http://www.idefense.com/application/poi/display?id=186&type=vulnerabilities
(CAN-2005-0064).  Noticed by Hiroki Sato.  Thanks!

Bump PKGREVISION to 5.

diffstat:

 print/teTeX-bin/Makefile         |   4 ++--
 print/teTeX-bin/distinfo         |   4 ++--
 print/teTeX-bin/patches/patch-ak |  16 +++++++++++++---
 3 files changed, 17 insertions(+), 7 deletions(-)

diffs (59 lines):

diff -r f3e72683e160 -r 0c237084babb print/teTeX-bin/Makefile
--- a/print/teTeX-bin/Makefile  Mon Jan 24 15:07:35 2005 +0000
+++ b/print/teTeX-bin/Makefile  Mon Jan 24 15:22:16 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.59 2005/01/17 12:23:15 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2005/01/24 15:22:16 kei Exp $
 
 DISTNAME=      tetex-src-${TETEX_BIN_VERS}
 PKGNAME=       teTeX-bin-${TETEX_BIN_VERS}
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    print
 MASTER_SITES=  ${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/2.0/distrib/}
 
diff -r f3e72683e160 -r 0c237084babb print/teTeX-bin/distinfo
--- a/print/teTeX-bin/distinfo  Mon Jan 24 15:07:35 2005 +0000
+++ b/print/teTeX-bin/distinfo  Mon Jan 24 15:22:16 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2005/01/17 12:19:13 kei Exp $
+$NetBSD: distinfo,v 1.10 2005/01/24 15:22:16 kei Exp $
 
 SHA1 (teTeX/tetex-src-2.0.2.tar.gz) = 6445206b14d659458ee352df78d2c2daf8e88ab3
 Size (teTeX/tetex-src-2.0.2.tar.gz) = 11745933 bytes
@@ -12,6 +12,6 @@
 SHA1 (patch-ah) = b028d996fcbf602f94b93b51a04578d893dd972c
 SHA1 (patch-ai) = b8c34c089b1c3730f57915fddd63762dea2f3435
 SHA1 (patch-aj) = 933ce880af54f2049c7f795621c2c237742026da
-SHA1 (patch-ak) = ef7f151fb786e6fe288d904bb0804fe2d9bfce40
+SHA1 (patch-ak) = 2ddc2195b58a77444826cf393a0edf470f2aac21
 SHA1 (patch-ap) = 40543e9a2fb87d296557f3a8bd9a7207b2331a8e
 SHA1 (patch-aq) = f90ed07b2de340c55c6d987fdaa59d7ed6d46e0f
diff -r f3e72683e160 -r 0c237084babb print/teTeX-bin/patches/patch-ak
--- a/print/teTeX-bin/patches/patch-ak  Mon Jan 24 15:07:35 2005 +0000
+++ b/print/teTeX-bin/patches/patch-ak  Mon Jan 24 15:22:16 2005 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ak,v 1.3 2005/01/17 12:19:13 kei Exp $
+$NetBSD: patch-ak,v 1.4 2005/01/24 15:22:16 kei Exp $
 
---- libs/xpdf/xpdf/XRef.cc.orig        Mon Nov  4 07:15:37 2002
-+++ libs/xpdf/xpdf/XRef.cc     Fri Oct 29 09:18:17 2004
+--- libs/xpdf/xpdf/XRef.cc.original    2005-01-24 23:15:21.000000000 +0900
++++ libs/xpdf/xpdf/XRef.cc     2005-01-24 23:15:57.000000000 +0900
 @@ -28,6 +28,7 @@
  #include "Error.h"
  #include "ErrorCodes.h"
@@ -55,3 +55,13 @@
        streamEnds = (Guint *)grealloc(streamEnds,
                                       streamEndsSize * sizeof(int));
        }
+@@ -481,6 +499,9 @@
+       } else {
+         keyLength = 5;
+       }
++      if (keyLength > 16) {
++        keyLength = 16;
++      }
+       permFlags = permissions.getInt();
+       if (encVersion >= 1 && encVersion <= 2 &&
+           encRevision >= 2 && encRevision <= 3) {