commit liborcus for openSUSE:Factory
Hello community, here is the log from the commit of package liborcus for openSUSE:Factory checked in at 2018-03-01 12:02:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/liborcus (Old) and /work/SRC/openSUSE:Factory/.liborcus.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "liborcus" Thu Mar 1 12:02:14 2018 rev:25 rq:580615 version:0.13.4 Changes: -------- --- /work/SRC/openSUSE:Factory/liborcus/liborcus.changes 2018-02-22 14:59:41.639944258 +0100 +++ /work/SRC/openSUSE:Factory/.liborcus.new/liborcus.changes 2018-03-01 12:02:18.529938541 +0100 @@ -1,0 +2,6 @@ +Tue Feb 27 13:54:19 UTC 2018 - tchvatal@suse.com + +- Version updat eto 0.13.4: + * Various false positive fixes in detection of xml files + +------------------------------------------------------------------- Old: ---- liborcus-0.13.3.tar.xz New: ---- liborcus-0.13.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ liborcus.spec ++++++ --- /var/tmp/diff_new_pack.92eaiY/_old 2018-03-01 12:02:19.109917742 +0100 +++ /var/tmp/diff_new_pack.92eaiY/_new 2018-03-01 12:02:19.113917598 +0100 @@ -18,7 +18,7 @@ %define libname liborcus-0_13-0 Name: liborcus -Version: 0.13.3 +Version: 0.13.4 Release: 0 Summary: Spreadsheet file processing library License: MPL-2.0 ++++++ liborcus-0.13.3.tar.xz -> liborcus-0.13.4.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liborcus-0.13.3/ChangeLog new/liborcus-0.13.4/ChangeLog --- old/liborcus-0.13.3/ChangeLog 2018-02-15 02:36:56.000000000 +0100 +++ new/liborcus-0.13.4/ChangeLog 2018-02-27 00:23:20.000000000 +0100 @@ -1,3 +1,24 @@ +2018-02-26 Kohei Yoshida <kohei.yoshida@gmail.com> [ef2e27538e335583ef3ff85c4bc4f512efc72eb5] + + Up the version to 0.13.4. + + +2018-02-21 Markus Mohrhard <markus.mohrhard@googlemail.com> [13af2fbab2cac1020d6bb840833c0e0efc231bff] + + protect the self-closing xml element code against self-closing root elements + + Found by Antti Levomäki and Christian Jalio from Forcepoint. + + (cherry picked from commit 12e5d89cbd7101c61fbdf063322203a1590a0ef5) + +2018-02-19 Kohei Yoshida <kohei.yoshida@gmail.com> [b8848ef7fc6a7d89e3f872574e36cbbab82275b0] + + xls-xml: Gracefully handle formula cells without cached results. + + This fixes #51. + + (cherry picked from commit 32a1b05ffc6edd7d528b6760dab9035252329ab0) + 2018-02-14 Kohei Yoshida <kohei.yoshida@gmail.com> [7ca73a7c83504a30a1d24444a27f57a86451100f] Up the version to 0.13.3. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liborcus-0.13.3/configure new/liborcus-0.13.4/configure --- old/liborcus-0.13.3/configure 2018-02-15 02:35:40.000000000 +0100 +++ new/liborcus-0.13.4/configure 2018-02-27 00:21:57.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for liborcus 0.13.3. +# Generated by GNU Autoconf 2.69 for liborcus 0.13.4. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='liborcus' PACKAGE_TARNAME='liborcus' -PACKAGE_VERSION='0.13.3' -PACKAGE_STRING='liborcus 0.13.3' +PACKAGE_VERSION='0.13.4' +PACKAGE_STRING='liborcus 0.13.4' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1420,7 +1420,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures liborcus 0.13.3 to adapt to many kinds of systems. +\`configure' configures liborcus 0.13.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1491,7 +1491,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of liborcus 0.13.3:";; + short | recursive ) echo "Configuration of liborcus 0.13.4:";; esac cat <<\_ACEOF @@ -1642,7 +1642,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -liborcus configure 0.13.3 +liborcus configure 0.13.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2291,7 +2291,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by liborcus $as_me 0.13.3, which was +It was created by liborcus $as_me 0.13.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3158,7 +3158,7 @@ # Define the identity of the package. PACKAGE='liborcus' - VERSION='0.13.3' + VERSION='0.13.4' cat >>confdefs.h <<_ACEOF @@ -17532,7 +17532,7 @@ ORCUS_API_VERSION=0.13 ORCUS_MAJOR_VERSION=0 ORCUS_MINOR_VERSION=13 -ORCUS_MICRO_VERSION=3 +ORCUS_MICRO_VERSION=4 @@ -21423,7 +21423,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by liborcus $as_me 0.13.3, which was +This file was extended by liborcus $as_me 0.13.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21489,7 +21489,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -liborcus config.status 0.13.3 +liborcus config.status 0.13.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liborcus-0.13.3/configure.ac new/liborcus-0.13.4/configure.ac --- old/liborcus-0.13.3/configure.ac 2018-02-15 02:33:38.000000000 +0100 +++ new/liborcus-0.13.4/configure.ac 2018-02-27 00:20:12.000000000 +0100 @@ -8,7 +8,7 @@ # =================== m4_define([orcus_major_version], [0]) m4_define([orcus_minor_version], [13]) -m4_define([orcus_micro_version], [3]) +m4_define([orcus_micro_version], [4]) m4_define([orcus_version], [orcus_major_version.orcus_minor_version.orcus_micro_version]) # =============== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liborcus-0.13.3/include/orcus/sax_parser.hpp new/liborcus-0.13.4/include/orcus/sax_parser.hpp --- old/liborcus-0.13.3/include/orcus/sax_parser.hpp 2017-11-16 01:38:32.000000000 +0100 +++ new/liborcus-0.13.4/include/orcus/sax_parser.hpp 2018-02-22 00:10:37.000000000 +0100 @@ -171,6 +171,8 @@ m_handler.start_element(elem); reset_buffer_pos(); m_handler.end_element(elem); + if (!m_nest_level) + m_root_elem_open = false; #if ORCUS_DEBUG_SAX_PARSER cout << "element_open: ns='" << elem.ns << "', name='" << elem.name << "' (self-closing)" << endl; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liborcus-0.13.3/src/liborcus/xls_xml_context.cpp new/liborcus-0.13.4/src/liborcus/xls_xml_context.cpp --- old/liborcus-0.13.3/src/liborcus/xls_xml_context.cpp 2018-02-14 04:18:33.000000000 +0100 +++ new/liborcus-0.13.4/src/liborcus/xls_xml_context.cpp 2018-02-22 00:03:20.000000000 +0100 @@ -1334,7 +1334,7 @@ mp_sheet_props->set_merge_cell_range(merge_range); } - if (!m_cur_cell_style_id.empty()) + if (mp_cur_sheet && !m_cur_cell_style_id.empty()) { auto it = m_style_map.find(m_cur_cell_style_id); if (it != m_style_map.end()) @@ -1344,6 +1344,16 @@ } } + if (mp_cur_sheet && !m_cur_cell_formula.empty()) + { + // Likely a Cell element without a child Data element. + mp_cur_sheet->set_formula( + m_cur_row, m_cur_col, spreadsheet::formula_grammar_t::xls_xml, + m_cur_cell_formula.data(), m_cur_cell_formula.size()); + } + + m_cur_cell_formula.clear(); + ++m_cur_col; if (m_cur_merge_across > 0) m_cur_col += m_cur_merge_across;
participants (1)
-
root@hilbert.suse.de