From 6adcd18d0bee7a8f4120a81923c0aba52c38b422 Mon Sep 17 00:00:00 2001
From: Alejandro Mery <amery@opensde.org>
Date: Sun, 15 Nov 2009 21:51:41 +0100
Subject: [PATCH] koffice: Updated (1.6.2 -> 1.6.3)

---
 kde/koffice/koffice-xpdf-CVE-2007-3387.patch | 38 ++++++++++++++++++++
 kde/koffice/koffice.desc                     |  8 ++---
 2 files changed, 41 insertions(+), 5 deletions(-)
 create mode 100644 kde/koffice/koffice-xpdf-CVE-2007-3387.patch

diff --git a/kde/koffice/koffice-xpdf-CVE-2007-3387.patch b/kde/koffice/koffice-xpdf-CVE-2007-3387.patch
new file mode 100644
index 000000000..8f8e717ff
--- /dev/null
+++ b/kde/koffice/koffice-xpdf-CVE-2007-3387.patch
@@ -0,0 +1,38 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+#
+# Filename: package/.../koffice/koffice-xpdf-CVE-2007-3387.patch
+# Copyright (C) 2009 The OpenSDE Project
+#
+# More information can be found in the files COPYING and README.
+#
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
+http://mirrors.ibiblio.org/pub/mirrors/kde/security_patches/koffice-xpdf-CVE-2007-3387.diff
+
+--- ./filters/kword/pdf/xpdf/xpdf/Stream.cc
++++ ./filters/kword/pdf/xpdf/xpdf/Stream.cc
+@@ -413,13 +413,11 @@ StreamPredictor::StreamPredictor(Stream 
+   predLine = NULL;
+   ok = gFalse;
+ 
+-  if (width <= 0 || nComps <= 0 || nBits <= 0 ||
+-     nComps >= INT_MAX / nBits ||
+-      width >= INT_MAX / nComps / nBits)
+-    return;
+-
+   nVals = width * nComps;
+-  if (nVals * nBits + 7 <= 0)
++  if (width <= 0 || nComps <= 0 || nBits <= 0 ||
++     nComps >= 4 || nBits > 16 ||
++      width >= INT_MAX / nComps ||
++      nVals >= (INT_MAX - 7) / nBits)
+     return;
+ 
+   pixBytes = (nComps * nBits + 7) >> 3;
diff --git a/kde/koffice/koffice.desc b/kde/koffice/koffice.desc
index 97daf54b9..a4187540f 100644
--- a/kde/koffice/koffice.desc
+++ b/kde/koffice/koffice.desc
@@ -1,9 +1,8 @@
-
 [COPY] --- SDE-COPYRIGHT-NOTE-BEGIN ---
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY]
 [COPY] Filename: package/.../koffice/koffice.desc
-[COPY] Copyright (C) 2006 - 2007 The OpenSDE Project
+[COPY] Copyright (C) 2006 - 2009 The OpenSDE Project
 [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
 [COPY] Copyright (C) 1998 - 2004 Clifford Wolf
 [COPY]
@@ -34,11 +33,10 @@
 
 [C] extra/office extra/desktop/kde
 [F] KDE
-[F] NOPARALLEL
 
 [L] GPL
 [S] Stable
-[V] 1.6.2
+[V] 1.6.3
 [P] X -----5---9 167.000
 
-[D] 2347493225 koffice-1.6.2.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.2/src/
+[D] 3296970379 koffice-1.6.3.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.3/src/