diff --git a/.gitignore b/.gitignore index e24e17b..ab5328b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /librevenge-0.0.0.tar.xz /librevenge-0.0.1.tar.xz /librevenge-0.0.2.tar.xz +/librevenge-0.0.3.tar.xz diff --git a/0001-rhbz-1248443-unbounded-heap-allocation.patch b/0001-rhbz-1248443-unbounded-heap-allocation.patch deleted file mode 100644 index b5f037d..0000000 --- a/0001-rhbz-1248443-unbounded-heap-allocation.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 111c0f374ae8f9c4d2183fb9e826d7084c85488f Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Fri, 31 Jul 2015 17:58:29 +0200 -Subject: [PATCH] rhbz#1248443 unbounded heap allocation - ---- - src/lib/RVNGOLEStream.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/lib/RVNGOLEStream.cpp b/src/lib/RVNGOLEStream.cpp -index 89055f7..c75b135 100644 ---- a/src/lib/RVNGOLEStream.cpp -+++ b/src/lib/RVNGOLEStream.cpp -@@ -755,6 +755,8 @@ bool librevenge::Header::valid(const unsigned long fileSize) - if (m_threshold != 4096) return false; - // there must be at least the header, one bat sector and one dirent sector in the file - if ((fileSize / m_size_bbat) < 3) return false; -+ // sectors must fit into the file -+ if ((fileSize / m_size_bbat) < m_num_mbat) return false; - if (m_num_bat == 0) return false; - if ((m_num_bat > 109) && (m_num_bat > (m_num_mbat * (m_size_bbat/4-1)) + 109)) return false; - if ((m_num_bat < 109) && (m_num_mbat != 0)) return false; --- -2.1.0 - diff --git a/librevenge.spec b/librevenge.spec index f39edb5..76ef096 100644 --- a/librevenge.spec +++ b/librevenge.spec @@ -1,8 +1,8 @@ %global apiversion 0.0 Name: librevenge -Version: 0.0.2 -Release: 8%{?dist} +Version: 0.0.3 +Release: 1%{?dist} Summary: A base library for writing document import filters # src/lib/RVNGOLEStream.{h,cpp} are BSD @@ -15,8 +15,6 @@ BuildRequires: doxygen BuildRequires: pkgconfig(cppunit) BuildRequires: pkgconfig(zlib) -Patch0: 0001-rhbz-1248443-unbounded-heap-allocation.patch - %description %{name} is a base library for writing document import filters. It has interfaces for text documents, vector graphics, spreadsheets and @@ -41,8 +39,6 @@ The %{name}-doc package contains documentation files for %{name}. %autosetup -p1 %build -# rhbz#1258128 fix build with boost 1.59 -export CPPFLAGS=-DBOOST_ERROR_CODE_HEADER_ONLY %configure --disable-silent-rules --disable-static --disable-werror --enable-pretty-printers sed -i \ -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ @@ -88,6 +84,9 @@ make %{?_smp_mflags} check %doc docs/doxygen/html %changelog +* Fri Dec 25 2015 David Tardon - 0.0.3-1 +- new upstream release + * Sun Aug 30 2015 Jonathan Wakely - 0.0.2-8 - Rebuilt for Boost 1.59 diff --git a/sources b/sources index 7bd9e2e..bd3ab9e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4ee55a80ee32af6752dd8c56eb1b1b5e librevenge-0.0.2.tar.xz +b777d64bbe13830627c7bda69e5f3e31 librevenge-0.0.3.tar.xz