[pkgsrc/trunk]: pkgsrc/misc/koffice latest xpdf vulnerability as it occurs in...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7b96637e25e0
branches:  trunk
changeset: 487864:7b96637e25e0
user:      markd <markd%pkgsrc.org@localhost>
date:      Fri Jan 21 11:32:12 2005 +0000

description:
latest xpdf vulnerability as it occurs in kword pdf import filter.
http://www.kde.org/info/security/advisory-20050120-1.txt
Bump PKGREVISION.

diffstat:

 misc/koffice/Makefile         |   4 ++--
 misc/koffice/distinfo         |   3 ++-
 misc/koffice/patches/patch-ae |  17 +++++++++++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)

diffs (48 lines):

diff -r e14c34be18cd -r 7b96637e25e0 misc/koffice/Makefile
--- a/misc/koffice/Makefile     Fri Jan 21 11:09:48 2005 +0000
+++ b/misc/koffice/Makefile     Fri Jan 21 11:32:12 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.52 2005/01/09 10:56:14 darcy Exp $
+# $NetBSD: Makefile,v 1.53 2005/01/21 11:32:12 markd Exp $
 
 DISTNAME=      koffice-1.3.5
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    misc kde
 MASTER_SITES=  ftp://ftp.kde.org/pub/kde/stable/koffice-1.3.5/src/ \
                ftp://ftp.us.kde.org/pub/kde/stable/koffice-1.3.5/src/ \
diff -r e14c34be18cd -r 7b96637e25e0 misc/koffice/distinfo
--- a/misc/koffice/distinfo     Fri Jan 21 11:09:48 2005 +0000
+++ b/misc/koffice/distinfo     Fri Jan 21 11:32:12 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2004/12/30 21:49:14 markd Exp $
+$NetBSD: distinfo,v 1.20 2005/01/21 11:32:12 markd Exp $
 
 SHA1 (koffice-1.3.5.tar.bz2) = feccb391be8039514f23f0f9cde9b01e22625769
 Size (koffice-1.3.5.tar.bz2) = 10778584 bytes
@@ -6,3 +6,4 @@
 SHA1 (patch-ab) = 6f253484f6c09877cca6b1d1d7610725c895e13a
 SHA1 (patch-ac) = bd83be082e58c09630d97e26f21eacbc0ae028f9
 SHA1 (patch-ad) = 83f18c3d073027df62614f7e60035c13100682cf
+SHA1 (patch-ae) = a25219a719a69624a7cf803f0efa51be7372ea74
diff -r e14c34be18cd -r 7b96637e25e0 misc/koffice/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/koffice/patches/patch-ae     Fri Jan 21 11:32:12 2005 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-ae,v 1.6 2005/01/21 11:32:12 markd Exp $
+
+--- filters/kword/pdf/xpdf/xpdf/XRef.cc.orig   2004-10-31 05:43:18.000000000 +1300
++++ filters/kword/pdf/xpdf/xpdf/XRef.cc
+@@ -501,6 +501,12 @@ GBool XRef::checkEncrypted(GString *owne
+       } else {
+         keyLength = 5;
+       }
++      if (keyLength < 1) {
++        keyLength = 1;
++      }
++      if (keyLength > 16) {
++        keyLength = 16;
++      }
+       permFlags = permissions.getInt();
+       if (encVersion >= 1 && encVersion <= 2 &&
+           encRevision >= 2 && encRevision <= 3) {