Update to KOffice 1.3.5

4 files changed, 3 insertions, 107 deletions

diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index eb58f1b..73501ed 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	koffice
-PORTVERSION=	1.3.4
+PORTVERSION=	1.3.5
 PORTEPOCH=	1
 CATEGORIES=	editors kde
 MASTER_SITES=	${MASTER_SITE_KDE}
diff --git a/editors/calligra/distinfo b/editors/calligra/distinfo
index 9ac0963..7d8379f 100644
--- a/editors/calligra/distinfo
+++ b/editors/calligra/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/koffice/koffice-1.3.4.tar.bz2) = 79896426542b0cf07e2e15f84946905a
-SIZE (KDE/koffice/koffice-1.3.4.tar.bz2) = 10765924
+MD5 (KDE/koffice/koffice-1.3.5.tar.bz2) = dbc7e76c86647709a3e74f57c0fcf7f5
+SIZE (KDE/koffice/koffice-1.3.5.tar.bz2) = 10778584
diff --git a/editors/calligra/files/patch-koffice_1_3_4_xpdf_security_integer_overflow b/editors/calligra/files/patch-koffice_1_3_4_xpdf_security_integer_overflow
deleted file mode 100644
index 449806b..0000000
--- a/editors/calligra/files/patch-koffice_1_3_4_xpdf_security_integer_overflow
+++ /dev/null
@@ -1,90 +0,0 @@
-Index: Catalog.cc
-===================================================================
-RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/Catalog.cc,v
-retrieving revision 1.1.2.1
-retrieving revision 1.1.2.4
-diff -u -p -r1.1.2.1 -r1.1.2.4
---- filters/kword/pdf/xpdf/xpdf/Catalog.cc	22 Oct 2004 12:13:56 -0000	1.1.2.1
-+++ filters/kword/pdf/xpdf/xpdf/Catalog.cc	30 Oct 2004 16:43:47 -0000	1.1.2.4
-@@ -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;
-         }
-Index: XRef.cc
-===================================================================
-RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/XRef.cc,v
-retrieving revision 1.1.2.1
-retrieving revision 1.1.2.4
-diff -u -p -r1.1.2.1 -r1.1.2.4
---- filters/kword/pdf/xpdf/xpdf/XRef.cc	22 Oct 2004 12:13:56 -0000	1.1.2.1
-+++ filters/kword/pdf/xpdf/xpdf/XRef.cc	30 Oct 2004 16:43:47 -0000	1.1.2.4
-@@ -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;
-         }
diff --git a/editors/calligra/pkg-plist b/editors/calligra/pkg-plist
index 695143c..ad77bd5 100644
--- a/editors/calligra/pkg-plist
+++ b/editors/calligra/pkg-plist
@@ -3093,16 +3093,6 @@ share/templates/TextDocument.desktop
 @exec /bin/mkdir -p %D/share/doc/HTML/en/koffice-apidocs/lib/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/koffice-apidocs/lib/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/koffice-apidocs/lib/html
-@dirrm share/templates/.source
-@dirrm share/templates
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/22x22/apps
-@dirrm share/icons/locolor/22x22
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/crystalsvg/22x22/apps
 @dirrm share/doc/HTML/en/thesaurus
 @dirrm share/doc/HTML/en/kword
 @dirrm share/doc/HTML/en/kugar
@@ -3208,8 +3198,6 @@ share/templates/TextDocument.desktop
 @dirrm share/apps/kpresenter/autoforms
 @dirrm share/apps/kpresenter
 @dirrm share/apps/koshell
-@dirrm share/apps/konqueror/servicemenus
-@dirrm share/apps/konqueror
 @dirrm share/apps/koffice/pics
 @dirrm share/apps/koffice/icons/crystalsvg/48x48/apps
 @dirrm share/apps/koffice/icons/crystalsvg/48x48
@@ -3311,6 +3299,4 @@ share/templates/TextDocument.desktop
 @dirrm share/apps/karbon/icons
 @dirrm share/apps/karbon/gradients
 @dirrm share/apps/karbon
-@dirrm share/applnk/Office
-@dirrm share/applnk
 @dirrm include/kword