7 files changed, 115 insertions, 84 deletions

diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile
index 32351cfe58f7..eb58f1bcf16c 100644
--- a/editors/koffice-kde4/Makefile
+++ b/editors/koffice-kde4/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	koffice
-PORTVERSION=	1.3.2
-PORTREVISION=	1
+PORTVERSION=	1.3.4
 PORTEPOCH=	1
 CATEGORIES=	editors kde
 MASTER_SITES=	${MASTER_SITE_KDE}
@@ -38,7 +37,7 @@ USE_GMAKE=		yes
 USE_ICONV=		yes
 USE_PYTHON=		yes
 GNU_CONFIGURE=		yes
-_NO_KDE_CLOSURE=	yes
+_NO_KDE_FIXPTHREAD=	yes
 
 INSTALLS_SHLIB=		yes
 LDCONFIG_DIRS+=		%%PREFIX%%/lib %%PREFIX%%/lib/kde3
diff --git a/editors/koffice-kde4/distinfo b/editors/koffice-kde4/distinfo
index 820fe1879077..9ac09634c272 100644
--- a/editors/koffice-kde4/distinfo
+++ b/editors/koffice-kde4/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/koffice/koffice-1.3.2.tar.bz2) = 078a371f6768bea53b84ea342ac0b34b
-SIZE (KDE/koffice/koffice-1.3.2.tar.bz2) = 10736662
+MD5 (KDE/koffice/koffice-1.3.4.tar.bz2) = 79896426542b0cf07e2e15f84946905a
+SIZE (KDE/koffice/koffice-1.3.4.tar.bz2) = 10765924
diff --git a/editors/koffice-kde4/files/patch-configure b/editors/koffice-kde4/files/patch-configure
new file mode 100644
index 000000000000..5147ed156f26
--- /dev/null
+++ b/editors/koffice-kde4/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Sat Oct 30 03:46:09 2004
++++ configure	Sat Oct 30 03:46:54 2004
+@@ -26335,7 +26335,7 @@
+     PTHREAD_LIBS="$PTHREAD_LIBS_save"
+   fi
+ 
+-  if test -z "$LIBPTHREAD"; then
++  if test -z "$LIBPTHREAD" && test "$PTHREAD_LIBS" != "-pthread" ; then
+     echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+ echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
+ if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
diff --git a/editors/koffice-kde4/files/patch-filters_kword_pdf_xpdf_xpdf_Catalog.cc b/editors/koffice-kde4/files/patch-filters_kword_pdf_xpdf_xpdf_Catalog.cc
deleted file mode 100644
index 1e54fc9cb30e..000000000000
--- a/editors/koffice-kde4/files/patch-filters_kword_pdf_xpdf_xpdf_Catalog.cc
+++ /dev/null
@@ -1,27 +0,0 @@
---- filters/kword/pdf/xpdf/xpdf/Catalog.cc.orig	2004-10-18 16:26:39.388666476 +0200
-+++ filters/kword/pdf/xpdf/xpdf/Catalog.cc	2004-10-18 16:27:28.004749073 +0200
-@@ -62,6 +62,12 @@
-   }
-   pagesSize = numPages0 = obj.getInt();
-   obj.free();
-+  if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize ||
-+      pagesSize*sizeof(Ref)/sizeof(Ref) != pagesSize) {
-+    error(-1, "Invalid 'pagesSize'");
-+    ok = gFalse;
-+    return;
-+  }
-   pages = (Page **)gmalloc(pagesSize * sizeof(Page *));
-   pageRefs = (Ref *)gmalloc(pagesSize * sizeof(Ref));
-   for (i = 0; i < pagesSize; ++i) {
-@@ -186,6 +192,11 @@
-       }
-       if (start >= pagesSize) {
- 	pagesSize += 32;
-+        if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize ||
-+            pagesSize*sizeof(Ref)/sizeof(Ref) != pagesSize) {
-+          error(-1, "Invalid 'pagesSize' parameter.");
-+          goto err3;
-+        }
- 	pages = (Page **)grealloc(pages, pagesSize * sizeof(Page *));
- 	pageRefs = (Ref *)grealloc(pageRefs, pagesSize * sizeof(Ref));
- 	for (j = pagesSize - 32; j < pagesSize; ++j) {
diff --git a/editors/koffice-kde4/files/patch-filters_kword_pdf_xpdf_xpdf_XRef.cc b/editors/koffice-kde4/files/patch-filters_kword_pdf_xpdf_xpdf_XRef.cc
deleted file mode 100644
index 935e7b56c6e6..000000000000
--- a/editors/koffice-kde4/files/patch-filters_kword_pdf_xpdf_xpdf_XRef.cc
+++ /dev/null
@@ -1,49 +0,0 @@
---- filters/kword/pdf/xpdf/xpdf/XRef.cc.orig	2004-09-17 23:54:38.000000000 -0700
-+++ filters/kword/pdf/xpdf/xpdf/XRef.cc	2004-09-25 17:59:36.000000000 -0700
-@@ -76,6 +76,12 @@
- 
-   // trailer is ok - read the xref table
-   } else {
-+    if (size*sizeof(XRefEntry)/sizeof(XRefEntry) != size) {
-+      error(-1, "Invalid 'size' inside xref table.");
-+      ok = gFalse;
-+      errCode = errDamaged;
-+      return;
-+    }
-     entries = (XRefEntry *)gmalloc(size * sizeof(XRefEntry));
-     for (i = 0; i < size; ++i) {
-       entries[i].offset = 0xffffffff;
-@@ -267,6 +273,10 @@
-     // table size
-     if (first + n > size) {
-       newSize = size + 256;
-+      if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) {
-+        error(-1, "Invalid 'newSize'");
-+        goto err2;
-+      }
-       entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry));
-       for (i = size; i < newSize; ++i) {
- 	entries[i].offset = 0xffffffff;
-@@ -410,6 +420,10 @@
- 	    if (!strncmp(p, "obj", 3)) {
- 	      if (num >= size) {
- 		newSize = (num + 1 + 255) & ~255;
-+	        if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) {
-+	          error(-1, "Invalid 'obj' parameters.");
-+	          return gFalse;
-+	        }
- 		entries = (XRefEntry *)
- 		            grealloc(entries, newSize * sizeof(XRefEntry));
- 		for (i = size; i < newSize; ++i) {
-@@ -431,6 +445,11 @@
-     } else if (!strncmp(p, "endstream", 9)) {
-       if (streamEndsLen == streamEndsSize) {
- 	streamEndsSize += 64;
-+        if (streamEndsSize*sizeof(int)/sizeof(int) != streamEndsSize) {
-+          error(-1, "Invalid 'endstream' parameter.");
-+          return gFalse;
-+        }
-+
- 	streamEnds = (Guint *)grealloc(streamEnds,
- 				       streamEndsSize * sizeof(int));
-       }
diff --git a/editors/koffice-kde4/files/patch-koffice_1_3_4_xpdf_security_integer_overflow b/editors/koffice-kde4/files/patch-koffice_1_3_4_xpdf_security_integer_overflow
new file mode 100644
index 000000000000..449806bd4fdb
--- /dev/null
+++ b/editors/koffice-kde4/files/patch-koffice_1_3_4_xpdf_security_integer_overflow
@@ -0,0 +1,90 @@
+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/koffice-kde4/pkg-plist b/editors/koffice-kde4/pkg-plist
index fef180be29a4..695143c3b098 100644
--- a/editors/koffice-kde4/pkg-plist
+++ b/editors/koffice-kde4/pkg-plist
@@ -1902,6 +1902,14 @@ share/apps/koffice/pics/koPortrait.png
 share/apps/koffice/pics/koRulerFirst.png
 share/apps/koffice/pics/koRulerLeft.png
 share/apps/koffice/pics/koffice-logo.png
+share/apps/konqueror/servicemenus/karbon_konqi.desktop
+share/apps/konqueror/servicemenus/kexi_konqi.desktop
+share/apps/konqueror/servicemenus/kformula_konqi.desktop
+share/apps/konqueror/servicemenus/kivio_konqi.desktop
+share/apps/konqueror/servicemenus/kpresenter_konqi.desktop
+share/apps/konqueror/servicemenus/krita_konqi.desktop
+share/apps/konqueror/servicemenus/kspread_konqi.desktop
+share/apps/konqueror/servicemenus/kword_konqi.desktop
 share/apps/koshell/koshellui.rc
 share/apps/kpresenter/autoforms/.autoforms
 share/apps/kpresenter/autoforms/Arrows/.directory
@@ -3094,10 +3102,7 @@ share/templates/TextDocument.desktop
 @dirrm share/icons/locolor/16x16/apps
 @dirrm share/icons/locolor/16x16
 @dirrm share/icons/locolor
-@dirrm share/icons/crystalsvg/48x48/apps
-@dirrm share/icons/crystalsvg/32x32/apps
 @dirrm share/icons/crystalsvg/22x22/apps
-@dirrm share/icons/crystalsvg/16x16/apps
 @dirrm share/doc/HTML/en/thesaurus
 @dirrm share/doc/HTML/en/kword
 @dirrm share/doc/HTML/en/kugar
@@ -3203,6 +3208,8 @@ 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