[pkgsrc/pkgsrc-2004Q4]: pkgsrc/misc/koffice Pullup ticket 238 - requested by ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/730b14f60fb5
branches:  pkgsrc-2004Q4
changeset: 485845:730b14f60fb5
user:      salo <salo%pkgsrc.org@localhost>
date:      Sun Jan 23 16:06:36 2005 +0000

description:
Pullup ticket 238 - requested by Mark Davies
security fix for koffice

Revisions pulled up:
- pkgsrc/misc/koffice/Makefile         1.52-1.53
- pkgsrc/misc/koffice/distinfo         1.20
- pkgsrc/misc/koffice/patches/patch-ae 1.6

   Module Name: pkgsrc
   Committed By:        darcy
   Date:                Sun Jan  9 10:56:14 UTC 2005

   Modified Files:
        pkgsrc/misc/koffice: Makefile

   Log Message:
   Package builds with latest version of Python.
---
   Module Name: pkgsrc
   Committed By: markd
   Date:  Fri Jan 21 11:32:12 UTC 2005

   Modified Files:
    pkgsrc/misc/koffice: Makefile distinfo
   Added Files:
    pkgsrc/misc/koffice/patches: patch-ae

   Log Message:
   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         |   6 +++---
 misc/koffice/distinfo         |   3 ++-
 misc/koffice/patches/patch-ae |  17 +++++++++++++++++
 3 files changed, 22 insertions(+), 4 deletions(-)

diffs (57 lines):

diff -r 29d1006734a8 -r 730b14f60fb5 misc/koffice/Makefile
--- a/misc/koffice/Makefile     Fri Jan 21 15:35:48 2005 +0000
+++ b/misc/koffice/Makefile     Sun Jan 23 16:06:36 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.48.2.1 2004/12/30 22:24:47 snj Exp $
+# $NetBSD: Makefile,v 1.48.2.2 2005/01/23 16:06:36 salo 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/ \
@@ -23,7 +23,7 @@
 
 PTHREAD_OPTS+=         require
 
-PYTHON_VERSIONS_ACCEPTED=      23 23pth # needs shared library
+PYTHON_VERSIONS_ACCEPTED=      24pth 24 23pth 23 # needs shared library
 CONFIGURE_ENV+=                        PYTHONDIR="${LOCALBASE}"
 CONFIGURE_ENV+=                        PYVERSSUFFIX="${PYVERSSUFFIX}"
 
diff -r 29d1006734a8 -r 730b14f60fb5 misc/koffice/distinfo
--- a/misc/koffice/distinfo     Fri Jan 21 15:35:48 2005 +0000
+++ b/misc/koffice/distinfo     Sun Jan 23 16:06:36 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18.2.1 2004/12/30 22:24:47 snj Exp $
+$NetBSD: distinfo,v 1.18.2.2 2005/01/23 16:06:36 salo 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 29d1006734a8 -r 730b14f60fb5 misc/koffice/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/koffice/patches/patch-ae     Sun Jan 23 16:06:36 2005 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-ae,v 1.5.8.1 2005/01/23 16:06:36 salo 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) {