summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Timo Gurr <tgurr@exherbo.org> 2017-07-28 11:22:19 +0200
committerAvatar Timo Gurr <tgurr@exherbo.org> 2017-07-28 11:36:50 +0200
commitc868f210ccd7d43f9cb96ba2b5fd470cf918e823 (patch)
treeda6ae3110856351ba3ca0932dc7b067a533658ac
parent790020bb012f9db7a5b08828abdd81d68f495c7c (diff)
downloadoffice-c868f210ccd7d43f9cb96ba2b5fd470cf918e823.tar.gz
office-c868f210ccd7d43f9cb96ba2b5fd470cf918e823.tar.xz
libmwaw: version bump to 0.3.12
Change-Id: I50fa40fccaaa7c9639d6ae3f74cce21fe83229aa Reviewed-on: https://galileo.mailstation.de/gerrit/9670 Reviewed-by: Jenkins <wk@mailstation.de> Reviewed-by: Timo Gurr <tgurr@exherbo.org>
-rw-r--r--packages/office-libs/libmwaw/files/libmwaw-0.3.11-ofz-1037-resize-vector-correctly.patch28
-rw-r--r--packages/office-libs/libmwaw/libmwaw-0.3.12.exheres-0 (renamed from packages/office-libs/libmwaw/libmwaw-0.3.11.exheres-0)4
-rw-r--r--packages/office-libs/libmwaw/libmwaw.exlib1
3 files changed, 1 insertions, 32 deletions
diff --git a/packages/office-libs/libmwaw/files/libmwaw-0.3.11-ofz-1037-resize-vector-correctly.patch b/packages/office-libs/libmwaw/files/libmwaw-0.3.11-ofz-1037-resize-vector-correctly.patch
deleted file mode 100644
index 38132bb..0000000
--- a/packages/office-libs/libmwaw/files/libmwaw-0.3.11-ofz-1037-resize-vector-correctly.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Upstream: yes
-Reason: CVE-2017-9433
-
-From 68b3b74569881248bfb6cbb4266177cc253b292f Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Sat, 8 Apr 2017 14:03:29 +0200
-Subject: [PATCH] ofz#1037 resize vector correctly
-
----
- src/lib/MsWrd1Parser.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/lib/MsWrd1Parser.cxx b/src/lib/MsWrd1Parser.cxx
-index 63547e6..3626064 100644
---- a/src/lib/MsWrd1Parser.cxx
-+++ b/src/lib/MsWrd1Parser.cxx
-@@ -902,7 +902,7 @@ bool MsWrd1Parser::readFootnoteCorrespondance(MWAWVec2i limits)
- int id = fIt++->second;
- fPos[1] = fIt==footnoteMap.end() ? m_state->m_eot : fIt->first;
- if (id >= int(m_state->m_footnotesList.size()))
-- m_state->m_footnotesList.resize(size_t(id),MWAWVec2l(0,0));
-+ m_state->m_footnotesList.resize(size_t(id)+1,MWAWVec2l(0,0));
- m_state->m_footnotesList[size_t(id)]=fPos;
- }
- ascii().addDelimiter(input->tell(),'|');
---
-2.13.1
-
diff --git a/packages/office-libs/libmwaw/libmwaw-0.3.11.exheres-0 b/packages/office-libs/libmwaw/libmwaw-0.3.12.exheres-0
index 8d7aa1a..609cced 100644
--- a/packages/office-libs/libmwaw/libmwaw-0.3.11.exheres-0
+++ b/packages/office-libs/libmwaw/libmwaw-0.3.12.exheres-0
@@ -6,7 +6,3 @@ require libmwaw
SLOT="0.3"
PLATFORMS="~amd64 ~x86"
-DEFAULT_SRC_PREPARE_PATCHES+=(
- "${FILES}"/${PNV}-ofz-1037-resize-vector-correctly.patch
-)
-
diff --git a/packages/office-libs/libmwaw/libmwaw.exlib b/packages/office-libs/libmwaw/libmwaw.exlib
index f5c479a..26be1e1 100644
--- a/packages/office-libs/libmwaw/libmwaw.exlib
+++ b/packages/office-libs/libmwaw/libmwaw.exlib
@@ -30,6 +30,7 @@ DEPENDENCIES="
DEFAULT_SRC_CONFIGURE_PARAMS=(
--enable-tools
--enable-zip
+ --disable-fuzzers
--disable-werror
--with-sharedptr=c++11
)