diff --git a/.gitignore b/.gitignore index 88bbed9..69f6ea9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /libstaroffice-0.0.1.tar.xz /libstaroffice-0.0.2.tar.xz /libstaroffice-0.0.3.tar.xz +/libstaroffice-0.0.4.tar.xz diff --git a/0001-ofz-1029-use-correct-loop-index.patch b/0001-ofz-1029-use-correct-loop-index.patch deleted file mode 100644 index f004e56..0000000 --- a/0001-ofz-1029-use-correct-loop-index.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 2d6253c7a692a3d92785dd990fce7256ea05e794 Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Fri, 7 Apr 2017 19:28:55 +0200 -Subject: [PATCH] ofz#1029 use correct loop index - -To be honest, I think this would be clearer as two separate reads to two -separate vars... ---- - src/lib/StarWriterStruct.cxx | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/lib/StarWriterStruct.cxx b/src/lib/StarWriterStruct.cxx -index 5893302..d1ad366 100644 ---- a/src/lib/StarWriterStruct.cxx -+++ b/src/lib/StarWriterStruct.cxx -@@ -327,7 +327,7 @@ bool DatabaseName::read(StarZone &zone) - } - data.m_name=libstoff::getString(text); - int positions[2]; -- for (int j=0; j<2; ++j) positions[i]=int(input->readULong(4)); -+ for (int j=0; j<2; ++j) positions[j]=int(input->readULong(4)); - data.m_selection=STOFFVec2i(positions[0],positions[1]); - m_dataList.push_back(data); - } --- -2.13.0 - diff --git a/libstaroffice.spec b/libstaroffice.spec index 09e6566..a12c3da 100644 --- a/libstaroffice.spec +++ b/libstaroffice.spec @@ -1,16 +1,14 @@ %global apiversion 0.0 Name: libstaroffice -Version: 0.0.3 -Release: 3%{?dist} +Version: 0.0.4 +Release: 1%{?dist} Summary: A library for import of binary StarOffice documents License: MPLv2.0 or LGPLv2+ URL: https://github.com/fosnola/libstaroffice/wiki Source: https://github.com/fosnola/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz -Patch0: 0001-ofz-1029-use-correct-loop-index.patch - BuildRequires: doxygen BuildRequires: help2man BuildRequires: pkgconfig(librevenge-0.0) @@ -43,7 +41,7 @@ Tools to transform StarOffice documents into other formats. Currently supported: CSV, HTML, plain text, SVG, raw. %prep -%setup -q +%autosetup -p1 %build %configure --disable-static --disable-werror --disable-silent-rules \ @@ -99,6 +97,9 @@ install -m 0644 sd2*.1 sd?2*.1 %{buildroot}/%{_mandir}/man1 %{_mandir}/man1/sdc2csv.1* %changelog +* Sun Jul 16 2017 David Tardon - 0.0.4-1 +- new upstream release + * Tue Jun 06 2017 David Tardon - 0.0.3-3 - Resolves: rhbz#1458800 CVE-2017-9432 Stack-buffer overflow in the StarWriterStruct::DatabaseName::read diff --git a/sources b/sources index ef2ae0e..03ec0c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libstaroffice-0.0.3.tar.xz) = ea60576537761a5b969a861ac43c8d4a9da5e5261d0a31f3d7743f8507e6979ccd4cba1784e8c3d909c08b692349ae11e87428834fd3df5b8d56e423caa7bcd8 +SHA512 (libstaroffice-0.0.4.tar.xz) = d591e554ce108165f1952ae82835241df0f986ce51f1a4fe43d282733358bb8d72418621f91f431367a5c09f9a40a9784666ffa2da303c5543ee000b1d6abf38