[pkgsrc/pkgsrc-2006Q4]: pkgsrc/misc/koffice Pullup ticket 1996 - requested by...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4332041e8927
branches:  pkgsrc-2006Q4
changeset: 522976:4332041e8927
user:      ghen <ghen%pkgsrc.org@localhost>
date:      Wed Jan 17 21:07:11 2007 +0000

description:
Pullup ticket 1996 - requested by markd
security fix for koffice

- pkgsrc/misc/koffice/Makefile                          1.88-1.89
- pkgsrc/misc/koffice/distinfo                          1.37-1.38
- pkgsrc/misc/koffice/patches/patch-ac                  1.10

   Module Name: pkgsrc
   Committed By:        markd
   Date:                Sun Jan 14 11:31:44 UTC 2007

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

   Log Message:
   Fix path in a #include in kdchart_export.h so that it works when installed.
   From Gary Duzan in private email.  Bump PKGREVISION.
---
   Module Name: pkgsrc
   Committed By:        markd
   Date:                Wed Jan 17 10:35:40 UTC 2007

   Modified Files:
        pkgsrc/misc/koffice: Makefile distinfo

   Log Message:
   Fix for kword/xpdf denial of service vulnerability from
   http://www.kde.org/info/security/advisory-20070115-1.txt.
   Bump PKGREVISION.

diffstat:

 misc/koffice/Makefile |  6 +++++-
 misc/koffice/distinfo |  6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diffs (38 lines):

diff -r d7aa2ee87965 -r 4332041e8927 misc/koffice/Makefile
--- a/misc/koffice/Makefile     Wed Jan 17 19:29:57 2007 +0000
+++ b/misc/koffice/Makefile     Wed Jan 17 21:07:11 2007 +0000
@@ -1,10 +1,14 @@
-# $NetBSD: Makefile,v 1.87 2006/12/03 04:03:06 markd Exp $
+# $NetBSD: Makefile,v 1.87.2.1 2007/01/17 21:07:11 ghen Exp $
 
 DISTNAME=      koffice-1.6.1
+PKGREVISION=   2
 CATEGORIES=    misc kde
 MASTER_SITES=  ${MASTER_SITE_KDE:=koffice-1.6.1/src/}
 EXTRACT_SUFX=  .tar.bz2
 
+PATCH_SITES=   ftp://ftp.kde.org/pub/kde/security_patches/
+PATCHFILES=    koffce-xpdf-CVE-2007-0104.diff
+
 MAINTAINER=    markd%NetBSD.org@localhost
 HOMEPAGE=      http://www.koffice.org/
 COMMENT=       KDE Office Suite
diff -r d7aa2ee87965 -r 4332041e8927 misc/koffice/distinfo
--- a/misc/koffice/distinfo     Wed Jan 17 19:29:57 2007 +0000
+++ b/misc/koffice/distinfo     Wed Jan 17 21:07:11 2007 +0000
@@ -1,10 +1,14 @@
-$NetBSD: distinfo,v 1.36 2006/12/10 10:11:01 markd Exp $
+$NetBSD: distinfo,v 1.36.2.1 2007/01/17 21:07:11 ghen Exp $
 
+SHA1 (koffce-xpdf-CVE-2007-0104.diff) = bef37ffafbae9a509363f7bc63806ab7162576b9
+RMD160 (koffce-xpdf-CVE-2007-0104.diff) = 1ea990a06dfdc709362a6cb0fbb69851da86a3d6
+Size (koffce-xpdf-CVE-2007-0104.diff) = 3185 bytes
 SHA1 (koffice-1.6.1.tar.bz2) = 891fb0a28ec3c4b070c4d6c2eae7fee1d2e37761
 RMD160 (koffice-1.6.1.tar.bz2) = ee4fa84a53f92035c0ab9427e0acb18feca701db
 Size (koffice-1.6.1.tar.bz2) = 56999028 bytes
 SHA1 (patch-aa) = b2067b1feaade8850440e49443791c365f37d91a
 SHA1 (patch-ab) = f2e9067f24d1de2e3c9f139727c33ecaf6dc8503
+SHA1 (patch-ac) = 9681410530872d5389f00567f50c4baab9eb8ff2
 SHA1 (patch-af) = a79564e57f2ef8eb43e8c1e23bb6a8e3d2a1d110
 SHA1 (patch-ag) = f0ad29395bbf52f70dd96f65c291fdb2ff0c6083
 SHA1 (patch-ah) = 094eaa1ff9a5f38adc2bf2f74965b0e47ccd2843