diff options
| author | salo <salo@pkgsrc.org> | 2005-01-23 16:06:36 +0000 |
|---|---|---|
| committer | salo <salo@pkgsrc.org> | 2005-01-23 16:06:36 +0000 |
| commit | 49bd5161e1d6bbe51a49fee9f02ba4450c54959e (patch) | |
| tree | b77389f5dd6d76e1c2fb0b136ddf3b5d26b11e03 | |
| parent | f85bb27d1f71a3924f334a0058413467e055c1b1 (diff) | |
| download | pkgsrc-49bd5161e1d6bbe51a49fee9f02ba4450c54959e.tar.gz | |
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.
| -rw-r--r-- | misc/koffice/Makefile | 6 | ||||
| -rw-r--r-- | misc/koffice/distinfo | 3 | ||||
| -rw-r--r-- | misc/koffice/patches/patch-ae | 17 |
3 files changed, 22 insertions, 4 deletions
diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile index 636495cc3d2..43bf7f0b1a9 100644 --- a/misc/koffice/Makefile +++ b/misc/koffice/Makefile @@ -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 @@ GCC_REQD+= 2.95.3 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 --git a/misc/koffice/distinfo b/misc/koffice/distinfo index 5352e9d44b1..c097b39eed2 100644 --- a/misc/koffice/distinfo +++ b/misc/koffice/distinfo @@ -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-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..59b6f3f27e0 --- /dev/null +++ b/misc/koffice/patches/patch-ae @@ -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) { |