diff --git a/libwpd-0.10.1.tar.xz b/libwpd-0.10.1.tar.xz deleted file mode 100644 index 58b62f5..0000000 --- a/libwpd-0.10.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:09d3410bc770f9d9eedc8544b5c211771ea3322de3fee19b58ad7d40fb2984f6 -size 524004 diff --git a/libwpd-0.10.2.tar.xz b/libwpd-0.10.2.tar.xz new file mode 100644 index 0000000..9dc0f9a --- /dev/null +++ b/libwpd-0.10.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:323f68beaf4f35e5a4d7daffb4703d0566698280109210fa4eaa90dea27d6610 +size 536400 diff --git a/libwpd.changes b/libwpd.changes index 2a2515e..6fe09c3 100644 --- a/libwpd.changes +++ b/libwpd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Sep 13 10:49:05 UTC 2017 - tchvatal@suse.com + +- Upgrade to 0.10.2 bsc#1058025 CVE-2017-14226: + * Require C++11 for build. + * Fix various crashes, leaks and hangs when reading damaged files found + by oss-fuzz. + ------------------------------------------------------------------- Thu Feb 11 20:04:39 UTC 2016 - tchvatal@suse.com diff --git a/libwpd.spec b/libwpd.spec index 13bc459..12d0e22 100644 --- a/libwpd.spec +++ b/libwpd.spec @@ -1,7 +1,7 @@ # # spec file for package libwpd # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,24 +16,28 @@ # +%define libname libwpd-0_10-10 Name: libwpd -Version: 0.10.1 +Version: 0.10.2 Release: 0 Summary: Library for Importing WordPerfect (tm) Documents -License: LGPL-2.1+ and MPL-2.0+ +License: LGPL-2.1+ AND MPL-2.0+ Group: Productivity/Publishing/Word Url: http://libwpd.sourceforge.net Source: http://downloads.sourceforge.net/project/%{name}/%{name}/%{name}-%{version}/%{name}-%{version}.tar.xz -# note: the main package is empty, it only sets a sane name for the source rpm BuildRequires: doxygen BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: help2man -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: xz BuildRequires: pkgconfig(librevenge-0.0) BuildRequires: pkgconfig(librevenge-stream-0.0) -BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} >= 1330 +BuildRequires: libboost_headers-devel +%else +BuildRequires: boost-devel +%endif %description libwpd is a general purpose library for reading or interpreting data @@ -41,8 +45,6 @@ from WordPerfect files. The library is not a stand-alone utility: it is designed to be used by another program (for example, a word processor) as an in-process component. -%define libname libwpd-0_10-10 - %package -n %{libname} Summary: Library for Importing WordPerfect (tm) Documents Group: System/Libraries @@ -95,7 +97,7 @@ export CXXFLAGS="%{optflags} -fvisibility-inlines-hidden" make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%make_install find %{buildroot} -type f -name "*.la" -delete -print mkdir -p %{buildroot}%{_mandir}/man1 for i in %{buildroot}%{_bindir}/*; do @@ -105,27 +107,22 @@ done %fdupes -s %{buildroot}%{_docdir}/%{name}/html %post -n %{libname} -p /sbin/ldconfig - %postun -n %{libname} -p /sbin/ldconfig %files -n %{libname} -%defattr(-,root,root) %{_libdir}/*.so.* %files devel -%defattr(-,root,root) %{_libdir}/*.so %{_libdir}/pkgconfig/libwpd*.pc %{_includedir}/libwpd-* %files devel-doc -%defattr(-,root,root) %doc %dir %{_docdir}/%{name} %doc %{_docdir}/%{name}/html %doc %{_docdir}/%{name}/libwpd.* %files tools -%defattr(-,root,root) %{_bindir}/* %{_mandir}/man1/*.1* %doc ChangeLog