Hello community, here is the log from the commit of package libabw for openSUSE:Factory checked in at 2019-08-27 15:19:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libabw (Old) and /work/SRC/openSUSE:Factory/.libabw.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libabw" Tue Aug 27 15:19:42 2019 rev:14 rq:724358 version:0.1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/libabw/libabw.changes 2018-01-09 14:48:33.100858930 +0100 +++ /work/SRC/openSUSE:Factory/.libabw.new.7948/libabw.changes 2019-08-27 15:19:43.408891078 +0200 @@ -1,0 +2,10 @@ +Sun Aug 18 07:22:38 UTC 2019 - Tomáš Chvátal <[email protected]> + +- Update to 0.1.3: + - Fix a memory access error found by oss-fuzz. + - Configure with --disable-werror by default. + - Disable expanding entities by XML parser as a vulnerability + prevention measure. Abiword-saved documents do not contain entities, + so there is no difference in behavior. + +------------------------------------------------------------------- Old: ---- libabw-0.1.2.tar.xz New: ---- libabw-0.1.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libabw.spec ++++++ --- /var/tmp/diff_new_pack.NjEIph/_old 2019-08-27 15:19:43.840890861 +0200 +++ /var/tmp/diff_new_pack.NjEIph/_new 2019-08-27 15:19:43.840890861 +0200 @@ -1,7 +1,7 @@ # # spec file for package libabw # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,18 +12,18 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define libname libabw-0_1-1 Name: libabw -Version: 0.1.2 +Version: 0.1.3 Release: 0 Summary: Library for parsing the Abiword file format structure License: MPL-2.0 Group: Productivity/Publishing/Word -Url: https://wiki.documentfoundation.org/DLP/Libraries/libabw +URL: https://wiki.documentfoundation.org/DLP/Libraries/libabw Source0: http://dev-www.libreoffice.org/src/%{name}/%{name}-%{version}.tar.xz BuildRequires: doxygen BuildRequires: fdupes @@ -105,7 +105,8 @@ %postun -n %{libname} -p /sbin/ldconfig %files -n %{libname} -%doc COPYING.* ChangeLog +%license COPYING.* +%doc ChangeLog %{_libdir}/*.so.* %files devel @@ -119,7 +120,8 @@ %doc %{_docdir}/%{name}-devel/html/ %files tools -%doc COPYING.* ChangeLog +%license COPYING.* +%doc ChangeLog %{_bindir}/* %changelog ++++++ libabw-0.1.2.tar.xz -> libabw-0.1.3.tar.xz ++++++ ++++ 2211 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libabw-0.1.2/ChangeLog new/libabw-0.1.3/ChangeLog --- old/libabw-0.1.2/ChangeLog 2017-12-31 14:16:41.000000000 +0100 +++ new/libabw-0.1.3/ChangeLog 2019-08-17 15:56:40.000000000 +0200 @@ -1,3 +1,66 @@ +2019-08-17 David Tardon <[email protected]> [5b6dfeb2ad6d66ae7b91f54eef6e1f170cc4d1ec] + + cid#1452381 avoid use of invalid iterator + + Change-Id: I91e3f2e5a191b4b476b8b0626b4ab7401dd5ab92 + +2019-08-17 David Tardon <[email protected]> [2daca538adca1e9dad25b9f9bfa1fdac5fa8908f] + + prepare for a release + + Change-Id: I22d587ce4ac93169e1faa5dff35defb6e4fb4873 + +2019-08-12 David Tardon <[email protected]> [d62fd44a364ec0dcf7baf7f9a8f0fb966df12679] + + do not parse entities + + Change-Id: I367e3e45cb38b8e863da753900ce5f79a840e171 + +2019-08-07 David Tardon <[email protected]> [0c8e6f4e0f4381f0cf528bfead4816ce90bafa8a] + + WaE: implicitly declared ABWData::operator= is deprecated + + Change-Id: If2167cb3914c3f5a8ee865bfbb241eed9e95bce4 + +2018-05-05 David Tardon <[email protected]> [0eb2512fd9b81bafcb8bcf23ef02a6818d0c4b81] + + disable werror by default + + Change-Id: Ib4cf1b4bc9b266d6662e5c78112a7f42a8a9d60c + +2018-02-02 David Tardon <[email protected]> [e76aa017b09ac7ddc870df9a53e542a751c22e83] + + iwyu: reduce includes + + Change-Id: Icb9643c23f2c628a81d6570ca304473cd04137f7 + +2018-01-22 David Tardon <[email protected]> [9deed7ef402d924a24eb7e2442cc23cb3301eb0a] + + ofz#4681 propagate read error up + + Change-Id: I8e271410d717bc1d53323d624a3a46cf3812fca9 + +2018-01-18 David Tardon <[email protected]> [30a0e048c4bc7cb81b308e00f823ad5513adb3a9] + + move dict from oss-fuzz + + Change-Id: I95ad30e3b82d4ea4dbce5632e20b5b85bac7630d + +2018-01-04 Miklos Vajna <[email protected]> [efb38995c8467214f6ee6424aab182bc8c4f15ed] + + m4: MSVC defines __cplusplus as 199711L still + + See e.g. + <https://stackoverflow.com/questions/37503029/cplusplus-is-equal-to-199711-in-msvc-does-it-support-c11>, + on MSVC we can't depend on the value of __cplusplus, since that one is a + too low value, even if everything else works fine. + +2017-12-31 David Tardon <[email protected]> [5f5376e84c1b714542dd97aaa120334b977dcf82] + + bump version + + Change-Id: If2763f473abb3662500c56645bfe82165b2817d1 + 2017-12-31 David Tardon <[email protected]> [de7974e8a50fc840106dc8ebc38f915e95e88f36] add another fixed bug to release notes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libabw-0.1.2/NEWS new/libabw-0.1.3/NEWS --- old/libabw-0.1.2/NEWS 2017-12-31 14:08:24.000000000 +0100 +++ new/libabw-0.1.3/NEWS 2019-08-17 15:20:49.000000000 +0200 @@ -1,3 +1,11 @@ +libabw 0.1.3 + +- Fix a memory access error found by oss-fuzz. +- Configure with --disable-werror by default. +- Disable expanding entities by XML parser as a vulnerability + prevention measure. Abiword-saved documents do not contain entities, + so there is no difference in behavior. + libabw 0.1.2 - Fix several issues identified by Coverity. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libabw-0.1.2/compile new/libabw-0.1.3/compile --- old/libabw-0.1.2/compile 2017-12-28 15:41:20.000000000 +0100 +++ new/libabw-0.1.3/compile 2019-08-07 20:41:34.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -340,7 +340,7 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libabw-0.1.2/configure.ac new/libabw-0.1.3/configure.ac --- old/libabw-0.1.2/configure.ac 2017-12-31 14:06:00.000000000 +0100 +++ new/libabw-0.1.3/configure.ac 2019-08-17 15:56:21.000000000 +0200 @@ -7,7 +7,7 @@ # ==================== m4_define([libabw_version_major],[0]) m4_define([libabw_version_minor],[1]) -m4_define([libabw_version_micro],[2]) +m4_define([libabw_version_micro],[3]) m4_define([libabw_version],[libabw_version_major.libabw_version_minor.libabw_version_micro]) # ============= @@ -120,9 +120,9 @@ # Check for cflags # ================ AC_ARG_ENABLE([werror], - [AS_HELP_STRING([--disable-werror], [Treat all warnings as errors, useful for development])], + [AS_HELP_STRING([--enable-werror], [Treat all warnings as errors, useful for development])], [enable_werror="$enableval"], - [enable_werror=yes] + [enable_werror=no] ) AS_IF([test x"$enable_werror" != "xno"], [ CFLAGS="$CFLAGS -Werror" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libabw-0.1.2/m4/ax_cxx_compile_stdcxx.m4 new/libabw-0.1.3/m4/ax_cxx_compile_stdcxx.m4 --- old/libabw-0.1.2/m4/ax_cxx_compile_stdcxx.m4 2017-12-31 10:02:50.000000000 +0100 +++ new/libabw-0.1.3/m4/ax_cxx_compile_stdcxx.m4 2018-01-04 14:45:27.000000000 +0100 @@ -174,7 +174,7 @@ #error "This is not a C++ compiler" -#elif __cplusplus < 201103L +#elif __cplusplus < 201103L && !(defined _MSC_VER) #error "This is not a C++11 compiler" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libabw-0.1.2/missing new/libabw-0.1.3/missing --- old/libabw-0.1.2/missing 2017-12-28 15:41:20.000000000 +0100 +++ new/libabw-0.1.3/missing 2019-08-07 20:41:34.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -101,9 +101,9 @@ exit $st fi -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software +perl_URL=https://www.perl.org/ +flex_URL=https://github.com/westes/flex +gnu_software_URL=https://www.gnu.org/software program_details () { @@ -207,7 +207,7 @@ exit $st # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libabw-0.1.2/src/lib/ABWCollector.h new/libabw-0.1.3/src/lib/ABWCollector.h --- old/libabw-0.1.2/src/lib/ABWCollector.h 2017-12-31 14:06:00.000000000 +0100 +++ new/libabw-0.1.3/src/lib/ABWCollector.h 2019-08-07 20:40:32.000000000 +0200 @@ -51,6 +51,7 @@ ABWData(const librevenge::RVNGString &mimeType, const librevenge::RVNGBinaryData binaryData) : m_mimeType(mimeType), m_binaryData(binaryData) {} ~ABWData() {} + ABWData &operator=(const ABWData &data) = default; librevenge::RVNGString m_mimeType; librevenge::RVNGBinaryData m_binaryData; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libabw-0.1.2/src/lib/ABWContentCollector.cpp new/libabw-0.1.3/src/lib/ABWContentCollector.cpp --- old/libabw-0.1.2/src/lib/ABWContentCollector.cpp 2017-12-31 14:06:00.000000000 +0100 +++ new/libabw-0.1.3/src/lib/ABWContentCollector.cpp 2019-08-17 15:54:38.000000000 +0200 @@ -2197,8 +2197,11 @@ m_outputElements.addOpenTextBox(propList); return; } - m_ps->m_parsingContext=ABW_FRAME_UNKNOWN; - ABW_DEBUG_MSG(("libabw::ABWContentCollector::openFrame: sorry, unknown frame type: %s\n", iter->second.c_str())); + else + { + m_ps->m_parsingContext=ABW_FRAME_UNKNOWN; + ABW_DEBUG_MSG(("libabw::ABWContentCollector::openFrame: sorry, unknown frame type: %s\n", iter->second.c_str())); + } } void libabw::ABWContentCollector::closeFrame(libabw::ABWOutputElements *(&elements), bool &pageFrame) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libabw-0.1.2/src/lib/ABWOutputElements.cpp new/libabw-0.1.3/src/lib/ABWOutputElements.cpp --- old/libabw-0.1.2/src/lib/ABWOutputElements.cpp 2017-12-31 14:06:00.000000000 +0100 +++ new/libabw-0.1.3/src/lib/ABWOutputElements.cpp 2018-03-24 16:12:45.000000000 +0100 @@ -8,7 +8,6 @@ */ #include "ABWOutputElements.h" -#include "libabw_internal.h" namespace { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libabw-0.1.2/src/lib/ABWParser.cpp new/libabw-0.1.3/src/lib/ABWParser.cpp --- old/libabw-0.1.2/src/lib/ABWParser.cpp 2017-12-31 14:06:00.000000000 +0100 +++ new/libabw-0.1.3/src/lib/ABWParser.cpp 2018-03-24 16:12:45.000000000 +0100 @@ -173,8 +173,9 @@ int ret = xmlTextReaderRead(reader.get()); while (1 == ret && !watcher.isStuck()) { - processXmlNode(reader.get()); - ret = xmlTextReaderRead(reader.get()); + ret = processXmlNode(reader.get()); + if (ret == 1) + ret = xmlTextReaderRead(reader.get()); } if (m_collector) @@ -182,10 +183,10 @@ return ret == 0 && !watcher.isStuck(); } -void libabw::ABWParser::processXmlNode(xmlTextReaderPtr reader) +int libabw::ABWParser::processXmlNode(xmlTextReaderPtr reader) { if (!reader) - return; + return -1; int tokenId = getElementToken(reader); int tokenType = xmlTextReaderNodeType(reader); int emptyToken = xmlTextReaderIsEmptyElement(reader); @@ -194,7 +195,7 @@ const auto *text = (const char *)xmlTextReaderConstValue(reader); if (!m_state->m_inMetadata && text && text[0]==' ' && text[1]==0) m_collector->insertText(text); - return; + return 1; } else if (XML_READER_TYPE_TEXT == tokenType) { @@ -217,6 +218,9 @@ m_collector->insertText(text); } } + + int ret = 1; + switch (tokenId) { case XML_ABIWORD: @@ -235,15 +239,15 @@ break; case XML_HISTORY: if (XML_READER_TYPE_ELEMENT == tokenType) - readHistory(reader); + ret = readHistory(reader); break; case XML_REVISIONS: if (XML_READER_TYPE_ELEMENT == tokenType) - readRevisions(reader); + ret = readRevisions(reader); break; case XML_IGNOREDWORDS: if (XML_READER_TYPE_ELEMENT == tokenType) - readIgnoredWords(reader); + ret = readIgnoredWords(reader); break; case XML_S: if (XML_READER_TYPE_ELEMENT == tokenType) @@ -266,7 +270,7 @@ break; case XML_D: if (XML_READER_TYPE_ELEMENT == tokenType) - readD(reader); + ret = readD(reader); break; case XML_P: if (XML_READER_TYPE_ELEMENT == tokenType) @@ -367,6 +371,8 @@ ABW_DEBUG_MSG((" %s\n", value)); } #endif + + return ret; } int libabw::ABWParser::getElementToken(xmlTextReaderPtr reader) @@ -388,7 +394,7 @@ m_state->m_currentMetadataKey = static_cast<const char *>(key); } -void libabw::ABWParser::readHistory(xmlTextReaderPtr reader) +int libabw::ABWParser::readHistory(xmlTextReaderPtr reader) { int ret = 1; int tokenId = XML_TOKEN_INVALID; @@ -409,9 +415,10 @@ } } while ((XML_HISTORY != tokenId || XML_READER_TYPE_END_ELEMENT != tokenType) && 1 == ret); + return ret; } -void libabw::ABWParser::readRevisions(xmlTextReaderPtr reader) +int libabw::ABWParser::readRevisions(xmlTextReaderPtr reader) { int ret = 1; int tokenId = XML_TOKEN_INVALID; @@ -433,9 +440,10 @@ } } while ((XML_REVISIONS != tokenId || XML_READER_TYPE_END_ELEMENT != tokenType) && 1 == ret); + return ret; } -void libabw::ABWParser::readIgnoredWords(xmlTextReaderPtr reader) +int libabw::ABWParser::readIgnoredWords(xmlTextReaderPtr reader) { int ret = 1; int tokenId = XML_TOKEN_INVALID; @@ -456,6 +464,7 @@ } } while ((XML_IGNOREDWORDS != tokenId || XML_READER_TYPE_END_ELEMENT != tokenType) && 1 == ret); + return ret; } void libabw::ABWParser::readPageSize(xmlTextReaderPtr reader) @@ -498,7 +507,7 @@ } } -void libabw::ABWParser::readD(xmlTextReaderPtr reader) +int libabw::ABWParser::readD(xmlTextReaderPtr reader) { ABWXMLString name = xmlTextReaderGetAttribute(reader, call_BAD_CAST_OnConst("name")); ABWXMLString mimeType = xmlTextReaderGetAttribute(reader, call_BAD_CAST_OnConst("mime-type")); @@ -545,6 +554,7 @@ } } while ((XML_D != tokenId || XML_READER_TYPE_END_ELEMENT != tokenType) && 1 == ret); + return ret; } void libabw::ABWParser::readS(xmlTextReaderPtr reader) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libabw-0.1.2/src/lib/ABWParser.h new/libabw-0.1.3/src/lib/ABWParser.h --- old/libabw-0.1.2/src/lib/ABWParser.h 2017-12-31 14:06:00.000000000 +0100 +++ new/libabw-0.1.3/src/lib/ABWParser.h 2018-03-24 16:12:45.000000000 +0100 @@ -40,18 +40,18 @@ // Functions to read the AWML document structure bool processXmlDocument(librevenge::RVNGInputStream *input); - void processXmlNode(xmlTextReaderPtr reader); + int processXmlNode(xmlTextReaderPtr reader); void readAbiword(xmlTextReaderPtr reader); void readM(xmlTextReaderPtr reader); - void readHistory(xmlTextReaderPtr reader); - void readRevisions(xmlTextReaderPtr reader); - void readIgnoredWords(xmlTextReaderPtr reader); + int readHistory(xmlTextReaderPtr reader); + int readRevisions(xmlTextReaderPtr reader); + int readIgnoredWords(xmlTextReaderPtr reader); void readPageSize(xmlTextReaderPtr reader); void readSection(xmlTextReaderPtr reader); void readA(xmlTextReaderPtr reader); void readC(xmlTextReaderPtr reader); - void readD(xmlTextReaderPtr reader); + int readD(xmlTextReaderPtr reader); void readL(xmlTextReaderPtr reader); void readP(xmlTextReaderPtr reader); void readS(xmlTextReaderPtr reader); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libabw-0.1.2/src/lib/ABWStylesCollector.cpp new/libabw-0.1.3/src/lib/ABWStylesCollector.cpp --- old/libabw-0.1.2/src/lib/ABWStylesCollector.cpp 2017-12-31 14:06:00.000000000 +0100 +++ new/libabw-0.1.3/src/lib/ABWStylesCollector.cpp 2018-03-24 16:12:45.000000000 +0100 @@ -14,7 +14,6 @@ #include <librevenge/librevenge.h> #include "ABWStylesCollector.h" -#include "libabw_internal.h" #define ABW_EPSILON 1.0E-06 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libabw-0.1.2/src/lib/ABWXMLHelper.cpp new/libabw-0.1.3/src/lib/ABWXMLHelper.cpp --- old/libabw-0.1.2/src/lib/ABWXMLHelper.cpp 2017-12-31 14:06:00.000000000 +0100 +++ new/libabw-0.1.3/src/lib/ABWXMLHelper.cpp 2019-08-12 09:42:27.000000000 +0200 @@ -132,7 +132,7 @@ { std::unique_ptr<xmlTextReader, void(*)(xmlTextReaderPtr)> reader( xmlReaderForIO(abwxmlInputReadFunc, abwxmlInputCloseFunc, (void *)input, nullptr, nullptr, - XML_PARSE_NOBLANKS|XML_PARSE_NOENT|XML_PARSE_NONET|XML_PARSE_RECOVER), + XML_PARSE_NOBLANKS|XML_PARSE_NONET|XML_PARSE_RECOVER), xmlFreeTextReader); if (watcher) watcher->setReader(reader.get()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libabw-0.1.2/src/lib/ABWZlibStream.cpp new/libabw-0.1.3/src/lib/ABWZlibStream.cpp --- old/libabw-0.1.2/src/lib/ABWZlibStream.cpp 2017-12-31 14:06:00.000000000 +0100 +++ new/libabw-0.1.3/src/lib/ABWZlibStream.cpp 2018-03-24 16:12:45.000000000 +0100 @@ -10,7 +10,6 @@ #include <zlib.h> #include "ABWZlibStream.h" #include <string.h> // for memcpy -#include <stdio.h> #define BLOCK_SIZE 16384 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libabw-0.1.2/src/lib/libabw.rc new/libabw-0.1.3/src/lib/libabw.rc --- old/libabw-0.1.2/src/lib/libabw.rc 2017-12-31 14:16:39.000000000 +0100 +++ new/libabw-0.1.3/src/lib/libabw.rc 2019-08-17 15:56:39.000000000 +0200 @@ -1,8 +1,8 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,1,2,BUILDNUMBER - PRODUCTVERSION 0,1,2,0 + FILEVERSION 0,1,3,BUILDNUMBER + PRODUCTVERSION 0,1,3,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "The libwpd developer community" VALUE "FileDescription", "libwpd" - VALUE "FileVersion", "0.1.2.BUILDNUMBER" + VALUE "FileVersion", "0.1.3.BUILDNUMBER" VALUE "InternalName", "libwpd-0.1" VALUE "LegalCopyright", "Copyright (C) 2002-2006 William Lachance, Marc Maurer, Fridrich Strba, other contributors" VALUE "OriginalFilename", "libwpd-0.1.dll" VALUE "ProductName", "libwpd" - VALUE "ProductVersion", "0.1.2" + VALUE "ProductVersion", "0.1.3" END END BLOCK "VarFileInfo"
