[pkgsrc/pkgsrc-2004Q4]: pkgsrc/graphics/kdegraphics3 Pullup ticket 234 - requ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1a6b467435c6
branches:  pkgsrc-2004Q4
changeset: 485835:1a6b467435c6
user:      snj <snj%pkgsrc.org@localhost>
date:      Fri Jan 21 01:44:05 2005 +0000

description:
Pullup ticket 234 - requested by Mark Davies
security fix for kdegraphics3

Revisions pulled up:
- pkgsrc/graphics/kdegraphics3/Makefile 1.45
- pkgsrc/graphics/kdegraphics3/distinfo 1.25
- pkgsrc/graphics/kdegraphics3/patches/patch-ac 1.4

    Module Name: pkgsrc
    Committed By: markd
    Date:  Thu Jan 20 12:36:58 UTC 2005

    Modified Files:
     pkgsrc/graphics/kdegraphics3: Makefile distinfo

    Log Message:
    Latest xpdf vulnerability
    http://www.kde.org/info/security/advisory-20050119-1.txt
    Bump PKGREVISION.
---
    Module Name:    pkgsrc
    Committed By:   markd
    Date:           Thu Jan 20 12:39:56 UTC 2005

    Added Files:
            pkgsrc/graphics/kdegraphics3/patches: patch-ac

    Log Message:
    add patch that was supposed to be in last commit.

diffstat:

 graphics/kdegraphics3/Makefile         |   4 ++--
 graphics/kdegraphics3/distinfo         |   3 ++-
 graphics/kdegraphics3/patches/patch-ac |  16 ++++++++++++++++
 3 files changed, 20 insertions(+), 3 deletions(-)

diffs (45 lines):

diff -r 2662c8a7104a -r 1a6b467435c6 graphics/kdegraphics3/Makefile
--- a/graphics/kdegraphics3/Makefile    Fri Jan 21 01:18:50 2005 +0000
+++ b/graphics/kdegraphics3/Makefile    Fri Jan 21 01:44:05 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.42.2.1 2004/12/23 18:53:39 snj Exp $
+# $NetBSD: Makefile,v 1.42.2.2 2005/01/21 01:44:05 snj Exp $
 
 DISTNAME=      kdegraphics-${_KDE_VERSION}
-PKGREVISION=   1
+PKGREVISION=   3
 CATEGORIES=    graphics
 COMMENT=       Graphics programs for the KDE integrated X11 desktop
 
diff -r 2662c8a7104a -r 1a6b467435c6 graphics/kdegraphics3/distinfo
--- a/graphics/kdegraphics3/distinfo    Fri Jan 21 01:18:50 2005 +0000
+++ b/graphics/kdegraphics3/distinfo    Fri Jan 21 01:44:05 2005 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.23.2.1 2004/12/23 18:53:39 snj Exp $
+$NetBSD: distinfo,v 1.23.2.2 2005/01/21 01:44:05 snj Exp $
 
 SHA1 (kdegraphics-3.3.2.tar.bz2) = 66193a69d3cf1dc332987f52e6f00ac2e9a3152e
 Size (kdegraphics-3.3.2.tar.bz2) = 6234394 bytes
 SHA1 (patch-aa) = e47443fdb5c737eb7f06fb2ee3bfac2b5602a9dd
 SHA1 (patch-ab) = c8067b0dd514cd7376d6f02ffe3be2d2e705e439
+SHA1 (patch-ac) = 8b4b38f700d7ace1b191866c60c89b3224103a1b
diff -r 2662c8a7104a -r 1a6b467435c6 graphics/kdegraphics3/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/kdegraphics3/patches/patch-ac    Fri Jan 21 01:44:05 2005 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-ac,v 1.3.8.1 2005/01/21 01:44:05 snj Exp $
+
+*** kpdf/xpdf/XRef.cc.orig     Wed Jan 12 17:10:53 2005
+--- kpdf/xpdf/XRef.cc  Wed Jan 12 17:11:22 2005
+***************
+*** 793,798 ****
+--- 793,801 ----
+       } else {
+         keyLength = 5;
+       }
++      if (keyLength > 16) {
++        keyLength = 16;
++      }
+       permFlags = permissions.getInt();
+       if (encVersion >= 1 && encVersion <= 2 &&
+           encRevision >= 2 && encRevision <= 3) {