diff options
author | markd <markd> | 2004-11-23 20:24:08 +0000 |
---|---|---|
committer | markd <markd> | 2004-11-23 20:24:08 +0000 |
commit | 45a9a2db1e1a89911f4553f31c2c9cd86c7d03bf (patch) | |
tree | 251c3c34535db3889a4d04d02c48458197ad7feb /misc | |
parent | 1d1a25448d5247c196391a4b9d091de11af774eb (diff) | |
download | pkgsrc-45a9a2db1e1a89911f4553f31c2c9cd86c7d03bf.tar.gz |
Update to koffice 1.3.5
Changes:
KWord
* Fix image inserting
* Fixes when changing properties of multiple frames at once. Also allow
changing "protect-size" for multiple frames.
KPresenter
* Ignore sticky objects when duplicating a page
KSpread
* Fix un-merging of cells
Filters
KWord's PDF Import Filter
* SECURITY: more robust fix for the integer overflow vulnerability
[was already in pkgsrc pkg]
KPresenter's OpenOffice.org Impress Export Filter
* Export Group object
* Export Text Vertical Alignment
* Export Text Margins
* Fix "KPresenter export bad horizontal lines in Open Office"
* Fix export vertical line
Diffstat (limited to 'misc')
-rw-r--r-- | misc/koffice/Makefile | 11 | ||||
-rw-r--r-- | misc/koffice/distinfo | 8 | ||||
-rw-r--r-- | misc/koffice/patches/patch-ac | 34 | ||||
-rw-r--r-- | misc/koffice/patches/patch-ad | 48 |
4 files changed, 8 insertions, 93 deletions
diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile index fd4162d1743..d0430b898ed 100644 --- a/misc/koffice/Makefile +++ b/misc/koffice/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.47 2004/11/02 23:32:18 markd Exp $ +# $NetBSD: Makefile,v 1.48 2004/11/23 20:24:08 markd Exp $ -DISTNAME= koffice-1.3.4 -PKGREVISION= 1 +DISTNAME= koffice-1.3.5 CATEGORIES= misc kde -MASTER_SITES= ftp://ftp.kde.org/pub/kde/stable/koffice-1.3.4/src/ \ - ftp://ftp.us.kde.org/pub/kde/stable/koffice-1.3.4/src/ \ - ftp://ftp.de.kde.org/pub/kde/stable/koffice-1.3.4/src/ +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/ \ + ftp://ftp.de.kde.org/pub/kde/stable/koffice-1.3.5/src/ EXTRACT_SUFX= .tar.bz2 MAINTAINER= tech-pkg@NetBSD.org diff --git a/misc/koffice/distinfo b/misc/koffice/distinfo index 7e3ac34efb3..f9aa17a355a 100644 --- a/misc/koffice/distinfo +++ b/misc/koffice/distinfo @@ -1,8 +1,6 @@ -$NetBSD: distinfo,v 1.17 2004/11/02 23:32:18 markd Exp $ +$NetBSD: distinfo,v 1.18 2004/11/23 20:24:08 markd Exp $ -SHA1 (koffice-1.3.4.tar.bz2) = 1848f37320833eddae0732aeaabfeddd3e0e35d4 -Size (koffice-1.3.4.tar.bz2) = 10765924 bytes +SHA1 (koffice-1.3.5.tar.bz2) = feccb391be8039514f23f0f9cde9b01e22625769 +Size (koffice-1.3.5.tar.bz2) = 10778584 bytes SHA1 (patch-aa) = 64f32eaaa0f6e29f6ec3c9b92ecf4599cd11f178 SHA1 (patch-ab) = 6f253484f6c09877cca6b1d1d7610725c895e13a -SHA1 (patch-ac) = e686a889c9c5c2d17482301227139218ad58ba94 -SHA1 (patch-ad) = a1c30be30cbf80828b10a808bb02fe55835cf2cd diff --git a/misc/koffice/patches/patch-ac b/misc/koffice/patches/patch-ac deleted file mode 100644 index 92f1b0ed46f..00000000000 --- a/misc/koffice/patches/patch-ac +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-ac,v 1.6 2004/11/02 23:32:19 markd Exp $ - ---- filters/kword/pdf/xpdf/xpdf/Catalog.cc.orig 2004-10-23 20:01:23.000000000 +1300 -+++ filters/kword/pdf/xpdf/xpdf/Catalog.cc -@@ -12,6 +12,7 @@ - #pragma implementation - #endif - -+#include <limits.h> - #include <stddef.h> - #include "gmem.h" - #include "Object.h" -@@ -63,8 +64,8 @@ Catalog::Catalog(XRef *xrefA) { - } - pagesSize = numPages0 = obj.getInt(); - obj.free(); -- if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize || -- pagesSize*sizeof(Ref)/sizeof(Ref) != pagesSize) { -+ if ((unsigned) pagesSize >= INT_MAX / sizeof(Page *) || -+ (unsigned) pagesSize >= INT_MAX / sizeof(Ref)) { - error(-1, "Invalid 'pagesSize'"); - ok = gFalse; - return; -@@ -196,8 +197,8 @@ int Catalog::readPageTree(Dict *pagesDic - } - if (start >= pagesSize) { - pagesSize += 32; -- if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize || -- pagesSize*sizeof(Ref)/sizeof(Ref) != pagesSize) { -+ if ((unsigned) pagesSize >= INT_MAX / sizeof(Page *) || -+ (unsigned) pagesSize >= INT_MAX / sizeof(Ref)) { - error(-1, "Invalid 'pagesSize' parameter."); - goto err3; - } diff --git a/misc/koffice/patches/patch-ad b/misc/koffice/patches/patch-ad deleted file mode 100644 index 6c995845dc7..00000000000 --- a/misc/koffice/patches/patch-ad +++ /dev/null @@ -1,48 +0,0 @@ -$NetBSD: patch-ad,v 1.7 2004/11/02 23:32:19 markd Exp $ - ---- filters/kword/pdf/xpdf/xpdf/XRef.cc.orig 2004-10-23 20:01:23.000000000 +1300 -+++ filters/kword/pdf/xpdf/xpdf/XRef.cc -@@ -12,6 +12,7 @@ - #pragma implementation - #endif - -+#include <limits.h> - #include <stdlib.h> - #include <stddef.h> - #include <string.h> -@@ -76,7 +77,7 @@ XRef::XRef(BaseStream *strA, GString *ow - - // trailer is ok - read the xref table - } else { -- if (size*sizeof(XRefEntry)/sizeof(XRefEntry) != size) { -+ if ((unsigned) size >= INT_MAX / sizeof(XRefEntry)) { - error(-1, "Invalid 'size' inside xref table."); - ok = gFalse; - errCode = errDamaged; -@@ -273,7 +274,7 @@ GBool XRef::readXRef(Guint *pos) { - // table size - if (first + n > size) { - newSize = size + 256; -- if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) { -+ if ((unsigned) newSize >= INT_MAX / sizeof(XRefEntry)) { - error(-1, "Invalid 'newSize'"); - goto err2; - } -@@ -420,7 +421,7 @@ GBool XRef::constructXRef() { - if (!strncmp(p, "obj", 3)) { - if (num >= size) { - newSize = (num + 1 + 255) & ~255; -- if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) { -+ if ((unsigned) newSize >= INT_MAX / sizeof(XRefEntry)) { - error(-1, "Invalid 'obj' parameters."); - return gFalse; - } -@@ -445,7 +446,7 @@ GBool XRef::constructXRef() { - } else if (!strncmp(p, "endstream", 9)) { - if (streamEndsLen == streamEndsSize) { - streamEndsSize += 64; -- if (streamEndsSize*sizeof(int)/sizeof(int) != streamEndsSize) { -+ if ((unsigned) streamEndsSize >= INT_MAX / sizeof(int)) { - error(-1, "Invalid 'endstream' parameter."); - return gFalse; - } |