summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeve Jelbert2007-11-08 12:36:27 +0100
committerJaka Kranjc2007-11-14 09:17:11 +0000
commitcfbf720130f9d4a8c99bbd4238056db010bde6b6 (patch)
tree2ad31e4b41e814800f55b3da06350c68cc459a41
parent560568d6c9fb32714a6a61f2ceb4ade74e66bbb2 (diff)
koffice - security update
(cherry picked from commit f6e59095654134f506789badf9662ae497f99f67)
-rwxr-xr-xkde-apps/koffice/DETAILS2
-rw-r--r--kde-apps/koffice/HISTORY6
-rwxr-xr-xkde-apps/koffice/PRE_BUILD4
-rw-r--r--kde-apps/koffice/koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff.bz2bin0 -> 3575 bytes
4 files changed, 10 insertions, 2 deletions
diff --git a/kde-apps/koffice/DETAILS b/kde-apps/koffice/DETAILS
index 4aca1972b3..e59396d377 100755
--- a/kde-apps/koffice/DETAILS
+++ b/kde-apps/koffice/DETAILS
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$KDE_URL/stable/$SPELL-$VERSION/src/$SOURCE
WEB_SITE=http://www.koffice.org
ENTERED=20020405
- SECURITY_PATCH=2
+ SECURITY_PATCH=3
LICENSE[0]=GPL
KEYWORDS="kde office"
SHORT="Full office suite"
diff --git a/kde-apps/koffice/HISTORY b/kde-apps/koffice/HISTORY
index 864ef762d1..e47d8b3851 100644
--- a/kde-apps/koffice/HISTORY
+++ b/kde-apps/koffice/HISTORY
@@ -1,3 +1,9 @@
+2007-11-08 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: SECURITY_PATCH++
+ * PRE_BUILD: apply patch
+ * koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff.bz2: added
+ fix bug #14089
+
2007-10-25 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
* DEPENDS: added which, needed for kexi docs script #14063
diff --git a/kde-apps/koffice/PRE_BUILD b/kde-apps/koffice/PRE_BUILD
index 4faa2a05d5..281e6881b6 100755
--- a/kde-apps/koffice/PRE_BUILD
+++ b/kde-apps/koffice/PRE_BUILD
@@ -1,3 +1,5 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p0 < $SPELL_DIRECTORY/koffice-xpdf-CVE-2007-3387.diff
+patch -p0 < $SPELL_DIRECTORY/koffice-xpdf-CVE-2007-3387.diff &&
+bzcat $SPELL_DIRECTORY/koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff.bz2| \
+ patch -p0
diff --git a/kde-apps/koffice/koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff.bz2 b/kde-apps/koffice/koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff.bz2
new file mode 100644
index 0000000000..97dfaf5199
--- /dev/null
+++ b/kde-apps/koffice/koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff.bz2
Binary files differ