[libreoffice] 01/01: fix the tests...

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-jessie-4.3.3
in repository libreoffice.

commit 448a4432436baf5173562f93aa473798e11e8c83
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Nov 6 07:15:47 2017 +0100

    fix the tests...
---
 changelog                   |  7 +++++++
 patches/CVE-2017-12607.diff |  4 ----
 patches/CVE-2017-12608.diff | 28 ----------------------------
 3 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/changelog b/changelog
index 9e6c3de..2b1ff62 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:4.3.3-2+deb8u9) jessie-security; urgency=medium
+
+  * debian/patches/CVE-2017-1260{6,7}.diff: don't create empty test files
+  * debian/patches/CVE-2017-12608.diff: remove filters-test.cxx hunk
+
+ -- Rene Engelhard <rene at debina.org>  Mon, 06 Nov 2017 07:07:31 +0100
+
 libreoffice (1:4.3.3-2+deb8u8) jessie-security; urgency=medium
 
   * debian/rules:
diff --git a/patches/CVE-2017-12607.diff b/patches/CVE-2017-12607.diff
index 1ce488d..79220e5 100644
--- a/patches/CVE-2017-12607.diff
+++ b/patches/CVE-2017-12607.diff
@@ -77,10 +77,6 @@ index def0fd1..bfcea45 100644
          PPTTabEntry*        pTab;
          sal_uInt16          nTabCount;
  
-diff --git a/sd/qa/unit/data/ppt/pass/crash-1.ppt b/sd/qa/unit/data/ppt/pass/crash-1.ppt
-new file mode 100644
-index 0000000..5d1a04b
-Binary files /dev/null and b/sd/qa/unit/data/ppt/pass/crash-1.ppt differ
 -- 
 cgit v0.10.2
 
diff --git a/patches/CVE-2017-12608.diff b/patches/CVE-2017-12608.diff
index a1a44c7..7198b80 100644
--- a/patches/CVE-2017-12608.diff
+++ b/patches/CVE-2017-12608.diff
@@ -9,34 +9,6 @@ add ww6 test dir and fix a crash
 Change-Id: Id08176640672095c03e0b124cd65a9dce26ac2db
 ---
 
-diff --git a/sw/qa/core/data/ww6/fail/.gitignore b/sw/qa/core/data/ww6/fail/.gitignore
-new file mode 100644
-index 0000000..e69de29
-diff --git a/sw/qa/core/data/ww6/indeterminate/.gitignore b/sw/qa/core/data/ww6/indeterminate/.gitignore
-new file mode 100644
-index 0000000..e69de29
-diff --git a/sw/qa/core/data/ww6/pass/.gitignore b/sw/qa/core/data/ww6/pass/.gitignore
-new file mode 100644
-index 0000000..e69de29
-diff --git a/sw/qa/core/data/ww6/pass/crash-1.doc b/sw/qa/core/data/ww6/pass/crash-1.doc
-new file mode 100644
-index 0000000..3c6f684
-Binary files /dev/null and b/sw/qa/core/data/ww6/pass/crash-1.doc differ
-diff --git a/sw/qa/core/filters-test.cxx b/sw/qa/core/filters-test.cxx
-index 023b50d9a..077a95e 100644
---- a/sw/qa/core/filters-test.cxx
-+++ b/sw/qa/core/filters-test.cxx
-@@ -151,6 +151,10 @@ void SwFiltersTest::testCVEs()
-             getURLFromSrc("/sw/qa/core/data/ww8/"),
-             OUString(FILTER_WW8));
- 
-+    testDir(OUString("MS WinWord 6.0"),
-+            getURLFromSrc("/sw/qa/core/data/ww6/"),
-+            OUString(sWW6));
-+
-     testDir(OUString("MS WinWord 5"),
-             getURLFromSrc("/sw/qa/core/data/ww5/"),
-             OUString(sWW5));
 diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
 index 4885286..a58cf9f 100644
 --- a/sw/source/filter/ww8/ww8par2.cxx

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git