From e03d623234378e8d8bd2999a0e31d394abfc7a18 Mon Sep 17 00:00:00 2001
From: kei <kei@pkgsrc.org>
Date: Mon, 24 Jan 2005 15:22:16 +0000
Subject: 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.
---
 print/teTeX-bin/Makefile         |  4 ++--
 print/teTeX-bin/distinfo         |  4 ++--
 print/teTeX-bin/patches/patch-ak | 16 +++++++++++++---
 3 files changed, 17 insertions(+), 7 deletions(-)

(limited to 'print/teTeX-bin')

diff --git a/print/teTeX-bin/Makefile b/print/teTeX-bin/Makefile
index 532ec6129d6..aa6ae15ee23 100644
--- a/print/teTeX-bin/Makefile
+++ b/print/teTeX-bin/Makefile
@@ -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 --git a/print/teTeX-bin/distinfo b/print/teTeX-bin/distinfo
index caf64969c68..0aceaacfa59 100644
--- a/print/teTeX-bin/distinfo
+++ b/print/teTeX-bin/distinfo
@@ -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-ag) = a6fd35e0cfbe4041abebb3e64ae825dcc4ec1dda
 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 --git a/print/teTeX-bin/patches/patch-ak b/print/teTeX-bin/patches/patch-ak
index 0ccffa4a2e7..a1fbbe3303c 100644
--- a/print/teTeX-bin/patches/patch-ak
+++ b/print/teTeX-bin/patches/patch-ak
@@ -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 @@ $NetBSD: patch-ak,v 1.3 2005/01/17 12:19:13 kei Exp $
  	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) {
-- 
cgit v1.2.3