summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authormarkd <markd@pkgsrc.org>2005-01-21 11:32:12 +0000
committermarkd <markd@pkgsrc.org>2005-01-21 11:32:12 +0000
commitc05a4ba719bc83657d9e19ab5e9d2698dc2a0f70 (patch)
tree29396af5c77b328c1a56be36a0803860e6d04ae3 /misc
parent917563eb6cab95d16e9685272f1799e9ac477417 (diff)
downloadpkgsrc-c05a4ba719bc83657d9e19ab5e9d2698dc2a0f70.tar.gz
latest xpdf vulnerability as it occurs in kword pdf import filter.
http://www.kde.org/info/security/advisory-20050120-1.txt Bump PKGREVISION.
Diffstat (limited to 'misc')
-rw-r--r--misc/koffice/Makefile4
-rw-r--r--misc/koffice/distinfo3
-rw-r--r--misc/koffice/patches/patch-ae17
3 files changed, 21 insertions, 3 deletions
diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile
index f06d34dd7d7..bb0a5c68da8 100644
--- a/misc/koffice/Makefile
+++ b/misc/koffice/Makefile
@@ -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 --git a/misc/koffice/distinfo b/misc/koffice/distinfo
index 6ba9408e770..b44dadfe93a 100644
--- a/misc/koffice/distinfo
+++ b/misc/koffice/distinfo
@@ -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-aa) = 64f32eaaa0f6e29f6ec3c9b92ecf4599cd11f178
SHA1 (patch-ab) = 6f253484f6c09877cca6b1d1d7610725c895e13a
SHA1 (patch-ac) = bd83be082e58c09630d97e26f21eacbc0ae028f9
SHA1 (patch-ad) = 83f18c3d073027df62614f7e60035c13100682cf
+SHA1 (patch-ae) = a25219a719a69624a7cf803f0efa51be7372ea74
diff --git a/misc/koffice/patches/patch-ae b/misc/koffice/patches/patch-ae
new file mode 100644
index 00000000000..c04df30f38b
--- /dev/null
+++ b/misc/koffice/patches/patch-ae
@@ -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) {