openSUSE Commits
Threads by month
- ----- 2024 -----
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
May 2020
- 1 participants
- 4645 discussions
Hello community,
here is the log from the commit of package python-networkx for openSUSE:Leap:15.2 checked in at 2020-05-29 18:49:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/python-networkx (Old)
and /work/SRC/openSUSE:Leap:15.2/.python-networkx.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-networkx"
Fri May 29 18:49:10 2020 rev:12 rq:810201 version:2.4
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/python-networkx/python-networkx.changes 2020-01-15 15:50:47.015506432 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.python-networkx.new.3606/python-networkx.changes 2020-05-29 18:49:11.264204496 +0200
@@ -1,0 +2,94 @@
+Fri Nov 22 00:41:03 UTC 2019 - steven.kowalik(a)suse.com
+
+- Drop incorrectly calculated dependency on python33
+- Switch to using %pytest macro
+
+-------------------------------------------------------------------
+Sun Nov 17 23:53:12 UTC 2019 - Steve Kowalik <steven.kowalik(a)suse.com>
+
+- Update to version 2.4
+ Highlights:
+ * Remove deprecated code from 1.x
+ * Support for Python 3.8
+ * Switched to pytest for testing
+ * Last release to support Python 3.5
+ * Fifteen new fuctions, including onion decomposition and linear prufing
+ * Three new generators, such as a directed joint degree generator
+- Add numpy-38-test.patch, to correct test failure under Python 3.8
+- Update URL, upstream changed to tarballs from zipfiles.
+
+-------------------------------------------------------------------
+Tue Jul 23 17:28:58 UTC 2019 - Todd R <toddrme2178(a)gmail.com>
+
+- Update to version 2.3
+ Highlights:
+ * Dropped support for Python 2. We are no longer supporting Python 2.7 and we will
+ start changing code to take advantage of Python 3 features we couldn't before.
+ * Added some Moral Graph analysis functions.
+ * Enable matplotlib drawing using curved arrows via connectionstyle parameter.
+ * Remove ticks and axes labels from matplotlib plots.
+ * Two new generators of Harary Graphs.
+ * Added Dual Barabasi-Albert model
+ * Added VoteRank algorithm
+ * Added Equitable coloring algorithms
+ * Added planar layout algorithms
+ * Les Miserables network example
+ * Javascript example update
+
+-------------------------------------------------------------------
+Tue Jan 22 11:33:30 UTC 2019 - Matej Cepl <mcepl(a)suse.com>
+
+- Switch off test_subgraph_centrality_big_graph test, as it leads to
+ crashes on i586, gh#networkx/networkx#3304.
+
+-------------------------------------------------------------------
+Fri Jan 4 14:41:26 UTC 2019 - Jan Engelhardt <jengelh(a)inai.de>
+
+- Fix incomplete summary. Trim filler wording from description.
+
+-------------------------------------------------------------------
+Wed Jan 2 13:55:25 UTC 2019 - Martin Pluskal <mpluskal(a)suse.com>
+
+- Update to version 2.2:
+ * Add support for Python 3.7. This is the last release to support
+ Python 2.
+ * Uniform random number generator (RNG) handling which defaults
+ to global RNGs but allows specification of a single RNG for all
+ random numbers in NX.
+ * Improved GraphViews to ease subclassing and remove cyclic
+ references which caused trouble with deepcopy and pickle.
+ * New Graph method G.update(H)
+- Run tests
+- Update project url
+
+-------------------------------------------------------------------
+Sun Sep 2 17:28:03 UTC 2018 - arun(a)gmx.de
+
+- specfile:
+ * update copyright year
+ * removed devel from noarch package
+
+- update to version 2.1:
+ * Highlights
+ + Arrows for drawing DiGraph edges are vastly improved! And an
+ example to show them.
+ + More than 12 new functions for graph generation, manipulation
+ and/or new graph algorithms.
+ o Add a large clique size heuristic function (#2830)
+ o Add rooted product function (#2825)
+ o Label Propagation Community Detection (#2821)
+ o Minimum cycle basis (#2823)
+ o Add Mycielski Operator (#2785)
+ o Adds prefix_tree, dag_to_branching, and example. (#2784)
+ o Add inverse_line_graph generator from #2241 (#2782)
+ o Steiner tree and metric closure. (#2252)
+ o Add flow based node and edge disjoint paths. (#2063)
+ o Update geometric networks with new models (#2498)
+ o Graph edit distance (#2729)
+ o Added function for finding a k-edge-augmentation (#2572)
+ + G.name is no longer processed by graph operators. It remains as
+ a property mechanism to access G.graph['name'] but the user is
+ in charge of updating or changing it for copies, subgraphs,
+ unions and other graph operations.
+
+-------------------------------------------------------------------
Old:
----
networkx-2.0.zip
New:
----
networkx-2.4.tar.gz
numpy-38-test.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-networkx.spec ++++++
--- /var/tmp/diff_new_pack.LdcPXg/_old 2020-05-29 18:49:11.608205483 +0200
+++ /var/tmp/diff_new_pack.LdcPXg/_new 2020-05-29 18:49:11.612205495 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-networkx
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,40 +12,40 @@
# 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/
#
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%define skip_python2 1
Name: python-networkx
-Version: 2.0
+Version: 2.4
Release: 0
-Summary: Python package for the creation, manipulation,
+Summary: Python package for the study of complex networks
License: BSD-3-Clause
Group: Development/Languages/Python
-Url: http://networkx.lanl.gov
-Source: https://files.pythonhosted.org/packages/source/n/networkx/networkx-%{versio…
+URL: https://networkx.github.io/
+Source: https://files.pythonhosted.org/packages/source/n/networkx/networkx-%{versio…
+# UPSTREAM PATCH: gh#networkx/networkx#3724
+Patch0: numpy-38-test.patch
BuildRequires: %{python_module PyYAML}
BuildRequires: %{python_module decorator >= 3.4.0}
-BuildRequires: %{python_module devel}
BuildRequires: %{python_module matplotlib}
-BuildRequires: %{python_module numpy-devel}
BuildRequires: %{python_module pydot}
BuildRequires: %{python_module pyparsing}
+BuildRequires: %{python_module pytest}
BuildRequires: %{python_module scipy}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
BuildRequires: unzip
Requires: python-decorator >= 3.4.0
+Recommends: python-PyYAML
+Recommends: python-matplotlib
Recommends: python-pydot
Recommends: python-pygraphviz
-Recommends: python-PyYAML
Recommends: python-pyparsing
-Recommends: python-numpy
-Recommends: python-matplotlib
Recommends: python-scipy
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%python_subpackages
@@ -55,11 +55,10 @@
Features:
* Includes standard graph-theoretic and statistical physics functions
- * Easy exchange of network algorithms between applications, disciplines, and platforms
+ * Exchange of network algorithms between applications, disciplines, and platforms
* Includes many classic graphs and synthetic networks
* Nodes and edges can be "anything" (e.g. time-series, text, images, XML records)
* Exploits existing code from high-quality legacy software in C, C++, Fortran, etc.
- * Open source (encourages community input)
* Unit-tested
%package -n %{name}-doc
@@ -70,9 +69,9 @@
%description -n %{name}-doc
Documentation and examples for %{name}.
-
%prep
%setup -q -n networkx-%{version}
+%autopatch -p1
%build
%python_build
@@ -90,8 +89,9 @@
%{python_expand pushd %{buildroot}%{$python_sitelib}
# Fix wrong-script-interpreter
-find networkx -name '*test*.py' -exec sed -i "s|#!/usr/bin/env python|#!%__$python|" {} \;
-find networkx -name '*test*.py' -exec grep -q '#!%__$python' {} \; -exec chmod a+x {} \;
+find networkx -name '*test*.py' -exec sed -i "s|#!%{_bindir}/env python$|#!%__$python|" {} +
+find networkx -name '*test*.py' -exec sed -i "s|#!%{_bindir}/env python3$|#!%__$python|" {} +
+find networkx -name '*test*.py' -exec grep -q '#!%__$python' {} \; -exec chmod a+x {} +
# Deduplicating files can generate a RPMLINT warning for pyc mtime
find networkx -name '*test*.py' -exec $python -m compileall -d %{$python_sitelib} {} \;
find networkx -name '*test*.py' -exec $python -O -m compileall -d %{$python_sitelib} {} \;
@@ -100,15 +100,18 @@
popd
}
+%check
+# test excluded because it leads to crashes on i586, gh#networkx/networkx#3304
+%pytest -k 'not test_subgraph_centrality_big_graph'
+
%files %{python_files}
-%defattr(-,root,root)
-%doc README.rst LICENSE.txt CONTRIBUTING.rst
+%license LICENSE.txt
+%doc README.rst CONTRIBUTING.rst
%{python_sitelib}/networkx/
%{python_sitelib}/networkx-%{version}-py*.egg-info
%files -n %{name}-doc
-%defattr(-,root,root)
-%doc LICENSE.txt
+%license LICENSE.txt
%{_docdir}/networkx-%{version}/
%changelog
++++++ numpy-38-test.patch ++++++
diff --git a/networkx/readwrite/tests/test_gexf.py b/networkx/readwrite/tests/test_gexf.py
index afc40111..f16504c0 100644
--- a/networkx/readwrite/tests/test_gexf.py
+++ b/networkx/readwrite/tests/test_gexf.py
@@ -404,7 +404,8 @@ gexf.net/1.2draft http://www.gexf.net/1.2draft/gexf.xsd" version="1.2">
nx.set_node_attributes(G, {n: n for n in numpy.arange(4)}, 'number')
G[0][1]['edge-number'] = numpy.float64(1.1)
- expected = """<gexf version="1.2" xmlns="http://www.gexf.net/1.2draft"\
+ if sys.version_info < (3, 8):
+ expected = """<gexf version="1.2" xmlns="http://www.gexf.net/1.2draft"\
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation\
="http://www.gexf.net/1.2draft http://www.gexf.net/1.2draft/gexf.xsd">
<meta lastmodifieddate="{}">
@@ -449,6 +450,54 @@ gexf.net/1.2draft http://www.gexf.net/1.2draft/gexf.xsd" version="1.2">
<edge id="2" source="2" target="3" />
</edges>
</graph>
+</gexf>""".format(time.strftime('%Y-%m-%d'), nx.__version__)
+ else:
+ expected = """<gexf xmlns="http://www.gexf.net/1.2draft"\
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation\
+="http://www.gexf.net/1.2draft http://www.gexf.net/1.2draft/gexf.xsd"\
+ version="1.2">
+ <meta lastmodifieddate="{}">
+ <creator>NetworkX {}</creator>
+ </meta>
+ <graph defaultedgetype="undirected" mode="static" name="">
+ <attributes mode="static" class="edge">
+ <attribute id="1" title="edge-number" type="float" />
+ </attributes>
+ <attributes mode="static" class="node">
+ <attribute id="0" title="number" type="int" />
+ </attributes>
+ <nodes>
+ <node id="0" label="0">
+ <attvalues>
+ <attvalue for="0" value="0" />
+ </attvalues>
+ </node>
+ <node id="1" label="1">
+ <attvalues>
+ <attvalue for="0" value="1" />
+ </attvalues>
+ </node>
+ <node id="2" label="2">
+ <attvalues>
+ <attvalue for="0" value="2" />
+ </attvalues>
+ </node>
+ <node id="3" label="3">
+ <attvalues>
+ <attvalue for="0" value="3" />
+ </attvalues>
+ </node>
+ </nodes>
+ <edges>
+ <edge source="0" target="1" id="0">
+ <attvalues>
+ <attvalue for="1" value="1.1" />
+ </attvalues>
+ </edge>
+ <edge source="1" target="2" id="1" />
+ <edge source="2" target="3" id="2" />
+ </edges>
+ </graph>
</gexf>""".format(time.strftime('%Y-%m-%d'), nx.__version__)
obtained = '\n'.join(nx.generate_gexf(G))
assert expected == obtained
1
0
Hello community,
here is the log from the commit of package mariadb-connector-c for openSUSE:Leap:15.2 checked in at 2020-05-29 18:49:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/mariadb-connector-c (Old)
and /work/SRC/openSUSE:Leap:15.2/.mariadb-connector-c.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mariadb-connector-c"
Fri May 29 18:49:07 2020 rev:27 rq:809030 version:3.1.8
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/mariadb-connector-c/mariadb-connector-c.changes 2020-03-13 10:56:13.744385649 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.mariadb-connector-c.new.3606/mariadb-connector-c.changes 2020-05-29 18:49:09.404199158 +0200
@@ -1,0 +2,17 @@
+Fri May 22 15:25:14 UTC 2020 - Kristyna Streitova <kstreitova(a)suse.com>
+
+- Update to release 3.1.8 [bsc#1171550]
+ * CONC-304: Rename the static library to libmariadb.a and other
+ libmariadb files in a consistent manner
+ * CONC-441: Default user name for C/C is wrong if login user
+ is different from effective user
+ * CONC-449: Check $MARIADB_HOME/my.cnf in addition to
+ $MYSQL_HOME/my.cnf
+ * CONC-457: mysql_list_processes crashes in unpack_fields
+ * CONC-458: mysql_get_timeout_value crashes when used improperly
+ * CONC-464: Fix static build for auth_gssapi_client plugin
+ * Fixes for the following security vulnerabilities:
+ CVE-2020-13249
+- refresh absolute_path_fix.patch and private_library.patch
+
+-------------------------------------------------------------------
Old:
----
mariadb-connector-c-3.1.7-src.tar.gz
mariadb-connector-c-3.1.7-src.tar.gz.asc
New:
----
mariadb-connector-c-3.1.8-src.tar.gz
mariadb-connector-c-3.1.8-src.tar.gz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mariadb-connector-c.spec ++++++
--- /var/tmp/diff_new_pack.ImpYOK/_old 2020-05-29 18:49:09.880200524 +0200
+++ /var/tmp/diff_new_pack.ImpYOK/_new 2020-05-29 18:49:09.884200536 +0200
@@ -25,7 +25,7 @@
%endif
%bcond_with sqlite3
Name: mariadb-connector-c
-Version: 3.1.7
+Version: 3.1.8
Release: 0
Summary: MariaDB connector in C
License: LGPL-2.1-or-later
++++++ absolute_path_fix.patch ++++++
--- /var/tmp/diff_new_pack.ImpYOK/_old 2020-05-29 18:49:09.908200605 +0200
+++ /var/tmp/diff_new_pack.ImpYOK/_new 2020-05-29 18:49:09.908200605 +0200
@@ -2,16 +2,16 @@
Date: Fri Mar 3 15:59:09 CET 2017
Summary: Remove pure ugliness with paths
-Index: mariadb-connector-c-3.1.3-src/mariadb_config/mariadb_config.c.in
+Index: mariadb-connector-c-3.1.8-src/mariadb_config/mariadb_config.c.in
===================================================================
---- mariadb-connector-c-3.1.3-src.orig/mariadb_config/mariadb_config.c.in
-+++ mariadb-connector-c-3.1.3-src/mariadb_config/mariadb_config.c.in
+--- mariadb-connector-c-3.1.8-src.orig/mariadb_config/mariadb_config.c.in
++++ mariadb-connector-c-3.1.8-src/mariadb_config/mariadb_config.c.in
@@ -5,13 +5,13 @@
static char *mariadb_progname;
--#define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql"
--#define LIBS "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb"
+-#define INCLUDE "-I@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql"
+-#define LIBS "-L@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb"
+#define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mariadb"
+#define LIBS "-L@INSTALL_LIBDIR@ -lmariadb"
#define LIBS_SYS "@extra_dynamic_LDFLAGS@"
@@ -23,10 +23,10 @@
#define SOCKET "@MARIADB_UNIX_ADDR@"
#define PORT "@MARIADB_PORT@"
#define TLS_LIBRARY_VERSION "@TLS_LIBRARY_VERSION@"
-Index: mariadb-connector-c-3.1.3-src/mariadb_config/libmariadb.pc.in
+Index: mariadb-connector-c-3.1.8-src/mariadb_config/libmariadb.pc.in
===================================================================
---- mariadb-connector-c-3.1.3-src.orig/mariadb_config/libmariadb.pc.in
-+++ mariadb-connector-c-3.1.3-src/mariadb_config/libmariadb.pc.in
+--- mariadb-connector-c-3.1.8-src.orig/mariadb_config/libmariadb.pc.in
++++ mariadb-connector-c-3.1.8-src/mariadb_config/libmariadb.pc.in
@@ -7,8 +7,8 @@
#
++++++ mariadb-connector-c-3.1.7-src.tar.gz -> mariadb-connector-c-3.1.8-src.tar.gz ++++++
++++ 5042 lines of diff (skipped)
++++++ private_library.patch ++++++
--- /var/tmp/diff_new_pack.ImpYOK/_old 2020-05-29 18:49:10.172201362 +0200
+++ /var/tmp/diff_new_pack.ImpYOK/_new 2020-05-29 18:49:10.172201362 +0200
@@ -8,11 +8,11 @@
exports all symbols. With the exception of exported symbols, it is
identical to the regular library.
-Index: mariadb-connector-c-3.1.4-src/libmariadb/CMakeLists.txt
+Index: mariadb-connector-c-3.1.8-src/libmariadb/CMakeLists.txt
===================================================================
---- mariadb-connector-c-3.1.4-src.orig/libmariadb/CMakeLists.txt
-+++ mariadb-connector-c-3.1.4-src/libmariadb/CMakeLists.txt
-@@ -410,17 +410,25 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8 AND MSVC)
+--- mariadb-connector-c-3.1.8-src.orig/libmariadb/CMakeLists.txt
++++ mariadb-connector-c-3.1.8-src/libmariadb/CMakeLists.txt
+@@ -411,17 +411,25 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8 AND MSVC)
SET_TARGET_PROPERTIES(mariadbclient PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64")
ENDIF()
@@ -25,7 +25,7 @@
IF(CMAKE_SYSTEM_NAME MATCHES "Linux" OR
CMAKE_SYSTEM_NAME MATCHES "GNU")
IF (NOT WITH_ASAN AND NOT WITH_TSAN AND NOT WITH_UBSAN AND NOT WITH_MSAN)
- TARGET_LINK_LIBRARIES (libmariadb "-Wl,--no-undefined")
+ TARGET_LINK_LIBRARIES (libmariadb LINK_PRIVATE "-Wl,--no-undefined")
ENDIF()
SET_TARGET_PROPERTIES(libmariadb PROPERTIES LINK_FLAGS "${CC_BINARY_DIR}/libmariadb/mariadbclient.def")
+ SET_TARGET_PROPERTIES(libmariadbprivate PROPERTIES LINK_FLAGS "-Wl,--no-undefined")
@@ -38,7 +38,7 @@
SET_TARGET_PROPERTIES(libmariadb PROPERTIES PREFIX "")
#
-@@ -454,7 +462,9 @@ INSTALL(TARGETS mariadbclient
+@@ -455,7 +463,9 @@ INSTALL(TARGETS mariadbclient
INSTALL(TARGETS libmariadb
COMPONENT SharedLibraries
DESTINATION ${INSTALL_LIBDIR})
@@ -47,12 +47,12 @@
+ COMPONENT SharedLibraries
+ DESTINATION ${INSTALL_LIBDIR})
- IF(WIN32)
+ IF(MSVC)
# On Windows, install PDB
-Index: mariadb-connector-c-3.1.4-src/mariadb_config/mariadb_config.c.in
+Index: mariadb-connector-c-3.1.8-src/mariadb_config/mariadb_config.c.in
===================================================================
---- mariadb-connector-c-3.1.4-src.orig/mariadb_config/mariadb_config.c.in
-+++ mariadb-connector-c-3.1.4-src/mariadb_config/mariadb_config.c.in
+--- mariadb-connector-c-3.1.8-src.orig/mariadb_config/mariadb_config.c.in
++++ mariadb-connector-c-3.1.8-src/mariadb_config/mariadb_config.c.in
@@ -7,6 +7,8 @@ static char *mariadb_progname;
#define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mariadb"
@@ -62,15 +62,15 @@
#define LIBS_SYS "@extra_dynamic_LDFLAGS@"
#define CFLAGS INCLUDE
#define VERSION "@MARIADB_CLIENT_VERSION@"
-@@ -30,6 +32,7 @@ static struct option long_options[]=
- {"port", no_argument, 0, 'i'},
- {"plugindir", no_argument, 0, 'j'},
- {"tlsinfo", no_argument, 0, 'k'},
-+ {"privatelibs", no_argument, 0, 'm'},
+@@ -35,6 +37,7 @@ static struct option long_options[]=
+ {OPT_STRING_TYPE "port", no_argument, 0, 'i'},
+ {OPT_STRING_TYPE "plugindir", no_argument, 0, 'j'},
+ {OPT_STRING_TYPE "tlsinfo", no_argument, 0, 'k'},
++ {OPT_STRING_TYPE "privatelibs", no_argument, 0, 'm'},
{NULL, 0, 0, 0}
};
-@@ -45,6 +48,7 @@ static const char *values[]=
+@@ -50,6 +53,7 @@ static const char *values[]=
CC_VERSION,
SOCKET,
PORT,
@@ -78,7 +78,7 @@
PLUGIN_DIR,
TLS_LIBRARY_VERSION
};
-@@ -115,6 +119,9 @@ int main(int argc, char **argv)
+@@ -120,6 +124,9 @@ int main(int argc, char **argv)
case 'l':
puts(LIBS_SYS);
break;
1
0
Hello community,
here is the log from the commit of package zlib for openSUSE:Leap:15.2 checked in at 2020-05-29 18:49:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/zlib (Old)
and /work/SRC/openSUSE:Leap:15.2/.zlib.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zlib"
Fri May 29 18:49:08 2020 rev:15 rq:809031 version:1.2.11
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/zlib/zlib.changes 2020-01-15 16:32:51.628894122 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.zlib.new.3606/zlib.changes 2020-05-29 18:49:10.332201822 +0200
@@ -1,0 +2,20 @@
+Thu Apr 23 08:17:19 UTC 2020 - Tomáš Chvátal <tchvatal(a)suse.com>
+
+- Update 410.patch to contain latest fixes from IBM bsc#1166260
+ * The build behaviour changed
+
+-------------------------------------------------------------------
+Tue Oct 29 10:47:18 UTC 2019 - Tomáš Chvátal <tchvatal(a)suse.com>
+
+- Update the zlib-no-version-check.patch to be even more forgiving
+ with the versions on the zlib to allow updates without rebuilds
+
+-------------------------------------------------------------------
+Mon Oct 21 07:11:58 UTC 2019 - Tomáš Chvátal <tchvatal(a)suse.com>
+
+- Add SUSE specific patch to fix bsc#1138793, we simply don't want
+ to test if the app was linked with exactly same version of zlib
+ like the one that is present on the runtime:
+ * zlib-no-version-check.patch
+
+-------------------------------------------------------------------
New:
----
zlib-no-version-check.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zlib.spec ++++++
--- /var/tmp/diff_new_pack.QcQ53c/_old 2020-05-29 18:49:10.796203153 +0200
+++ /var/tmp/diff_new_pack.QcQ53c/_new 2020-05-29 18:49:10.800203164 +0200
@@ -21,7 +21,6 @@
Release: 0
Summary: Library implementing the DEFLATE compression algorithm
License: Zlib
-Group: Development/Libraries/C and C++
URL: http://www.zlib.net/
Source0: http://zlib.net/zlib-%{version}.tar.gz
Source1: http://zlib.net/zlib-%{version}.tar.gz.asc
@@ -39,6 +38,9 @@
Patch3: zlib-power8-fate325307.patch
#PATCH-FIX-UPSTREAM https://github.com/madler/zlib/pull/410
Patch4: 410.patch
+#PATCH-FIX-SUSE do not check exact version match as the lib can be updated
+# we should simply rely on soname versioning to protect us
+Patch5: zlib-no-version-check.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
@@ -52,7 +54,6 @@
%package -n libz1
Summary: Library implementing the DEFLATE compression algorithm
-Group: System/Libraries
Provides: %{name} = %{version}-%{release}
Obsoletes: %{name} < %{version}-%{release}
@@ -64,7 +65,6 @@
%package devel
Summary: Development files for zlib, a data compression library
-Group: Development/Languages/C and C++
Requires: glibc-devel
Requires: libz1 = %{version}
@@ -86,7 +86,6 @@
%package devel-static
Summary: Static library for zlib
-Group: Development/Languages/C and C++
Requires: %{name}-devel = %{version}
Provides: %{name}-devel:%{_libdir}/libz.a
@@ -101,14 +100,12 @@
%package -n libminizip1
Summary: Library for manipulation with .zip archives
-Group: System/Libraries
%description -n libminizip1
Minizip is a library for manipulation with files from .zip archives.
%package -n minizip-devel
Summary: Development files for the minizip library
-Group: Development/Languages/C and C++
Requires: %{name}-devel = %{version}
Requires: libminizip1 = %{version}
Requires: pkgconfig
@@ -124,31 +121,30 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
cp %{SOURCE4} .
%build
%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
export LDFLAGS="-Wl,-z,relro,-z,now"
-%ifarch s390x s390
-export CFLAGS="%{optflags} -DDFLTCC"
-%define addopts OBJA=dfltcc.o PIC_OBJA=dfltcc.lo
-%else
export CFLAGS="%{optflags}"
-%define addopts %{nil}
-%endif
# For sure not autotools build
CC="cc" ./configure \
--shared \
--prefix=%{_prefix} \
- --libdir=/%{_lib}
+ --libdir=/%{_lib} \
+%ifarch s390x s390
+ --dfltcc \
+%endif
+ %{nil}
%if %{do_profiling}
- make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_generate}" %{addopts}
+ make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_generate}"
make check %{?_smp_mflags}
make %{?_smp_mflags} clean
- make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_feedback}" %{addopts}
+ make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_feedback}"
%else
- make %{?_smp_mflags} %{addopts}
+ make %{?_smp_mflags}
%endif
# And build minizip
@@ -157,7 +153,7 @@
%configure \
--disable-static \
--disable-silent-rules
-make %{?_smp_mflags} %{addopts}
+make %{?_smp_mflags}
%check
make check %{?_smp_mflags}
++++++ 410.patch ++++++
--- /var/tmp/diff_new_pack.QcQ53c/_old 2020-05-29 18:49:10.824203234 +0200
+++ /var/tmp/diff_new_pack.QcQ53c/_new 2020-05-29 18:49:10.828203245 +0200
@@ -1,9 +1,9 @@
-From 230b5152e9660eb5e5821c2dbc84ae300dfe1fb1 Mon Sep 17 00:00:00 2001
+From 79ccd96ec69d2367291568c586aeaae941d2635c Mon Sep 17 00:00:00 2001
From: Ilya Leoshkevich <iii(a)linux.ibm.com>
Date: Wed, 18 Jul 2018 13:14:07 +0200
Subject: [PATCH] Add support for IBM Z hardware-accelerated deflate
-Future versions of IBM Z mainframes will provide DFLTCC instruction,
+IBM Z mainframes starting from version z15 provide DFLTCC instruction,
which implements deflate algorithm in hardware with estimated
compression and decompression performance orders of magnitude faster
than the current zlib and ratio comparable with that of level 1.
@@ -11,15 +11,15 @@
This patch adds DFLTCC support to zlib. In order to enable it, the
following build commands should be used:
- $ CFLAGS=-DDFLTCC ./configure
- $ make OBJA=dfltcc.o PIC_OBJA=dfltcc.lo
+ $ ./configure --dfltcc
+ $ make
When built like this, zlib would compress in hardware on level 1, and in
software on all other levels. Decompression will always happen in
hardware. In order to enable DFLTCC compression for levels 1-6 (i.e. to
make it used by default) one could either add -DDFLTCC_LEVEL_MASK=0x7e
-at compile time, or set the environment variable DFLTCC_LEVEL_MASK to
-0x7e at run time.
+to CFLAGS at compile time, or set the environment variable
+DFLTCC_LEVEL_MASK to 0x7e at run time.
Two DFLTCC compression calls produce the same results only when they
both are made on machines of the same generation, and when the
@@ -34,15 +34,14 @@
* inflate(Z_BLOCK) and inflate(Z_TREES)
* inflateMark()
* inflatePrime()
- * deflateParams() after the first deflate() call
When used, these functions will either switch to software, or, in case
this is not possible, gracefully fail.
-This patch tries to add DFLTCC support in a least intrusive way.
-All SystemZ-specific code was placed into a separate file, but
+This patch tries to add DFLTCC support in the least intrusive way.
+All SystemZ-specific code is placed into a separate file, but
unfortunately there is still a noticeable amount of changes in the
-main zlib code. Below is the summary of those changes.
+main zlib code. Below is the summary of these changes.
DFLTCC takes as arguments a parameter block, an input buffer, an output
buffer and a window. Since DFLTCC requires parameter block to be
@@ -61,9 +60,12 @@
parameter block, which is allocated alongside zlib state, using
the new DEFLATE_RESET_KEEP_HOOK and INFLATE_RESET_KEEP_HOOK macros.
-In order to make unsupported deflateParams(), inflatePrime() and
-inflateMark() calls to fail gracefully, the new DEFLATE_PARAMS_HOOK,
-INFLATE_PRIME_HOOK and INFLATE_MARK_HOOK macros were introduced.
+The new DEFLATE_PARAMS_HOOK switches between hardware and software
+deflate implementations when deflateParams() arguments demand this.
+
+In order to make unsupported inflatePrime() and inflateMark() calls
+fail gracefully, the new INFLATE_PRIME_HOOK and INFLATE_MARK_HOOK macros
+were introduced.
The algorithm implemented in hardware has different compression ratio
than the one implemented in software. In order for deflateBound() to
@@ -93,12 +95,12 @@
updatewindow and made ZLIB_INTERNAL.
---
Makefile.in | 8 +
- configure | 13 +
+ configure | 20 +
contrib/README.contrib | 4 +
- contrib/s390/dfltcc.c | 904 ++++++++++++++++++++++++++++++++++
- contrib/s390/dfltcc.h | 55 +++
- contrib/s390/dfltcc_deflate.h | 50 ++
- deflate.c | 60 ++-
+ contrib/s390/dfltcc.c | 920 ++++++++++++++++++++++++++++++++++
+ contrib/s390/dfltcc.h | 55 ++
+ contrib/s390/dfltcc_deflate.h | 54 ++
+ deflate.c | 68 ++-
deflate.h | 12 +
gzguts.h | 4 +
inflate.c | 85 +++-
@@ -106,7 +108,7 @@
test/infcover.c | 2 +-
test/minigzip.c | 4 +
trees.c | 13 +-
- 14 files changed, 1165 insertions(+), 51 deletions(-)
+ 14 files changed, 1197 insertions(+), 54 deletions(-)
create mode 100644 contrib/s390/dfltcc.c
create mode 100644 contrib/s390/dfltcc.h
create mode 100644 contrib/s390/dfltcc_deflate.h
@@ -134,7 +136,28 @@
===================================================================
--- zlib-1.2.11.orig/configure
+++ zlib-1.2.11/configure
-@@ -911,6 +911,19 @@ EOF
+@@ -114,6 +114,7 @@ case "$1" in
+ echo ' configure [--const] [--zprefix] [--prefix=PREFIX] [--eprefix=EXPREFIX]' | tee -a configure.log
+ echo ' [--static] [--64] [--libdir=LIBDIR] [--sharedlibdir=LIBDIR]' | tee -a configure.log
+ echo ' [--includedir=INCLUDEDIR] [--archs="-arch i386 -arch x86_64"]' | tee -a configure.log
++ echo ' [--dfltcc]' | tee -a configure.log
+ exit 0 ;;
+ -p*=* | --prefix=*) prefix=`echo $1 | sed 's/.*=//'`; shift ;;
+ -e*=* | --eprefix=*) exec_prefix=`echo $1 | sed 's/.*=//'`; shift ;;
+@@ -137,6 +138,12 @@ case "$1" in
+ -c* | --const) zconst=1; shift ;;
+ -w* | --warn) warn=1; shift ;;
+ -d* | --debug) debug=1; shift ;;
++ --dfltcc)
++ CFLAGS="$CFLAGS -DDFLTCC"
++ OBJC="$OBJC dfltcc.o"
++ PIC_OBJC="$PIC_OBJC dfltcc.lo"
++ shift
++ ;;
+ *)
+ echo "unknown option: $1" | tee -a configure.log
+ echo "$0 --help for help" | tee -a configure.log
+@@ -911,6 +918,19 @@ EOF
fi
fi
@@ -173,14 +196,14 @@
===================================================================
--- /dev/null
+++ zlib-1.2.11/contrib/s390/dfltcc.c
-@@ -0,0 +1,904 @@
+@@ -0,0 +1,920 @@
+/* dfltcc.c - SystemZ DEFLATE CONVERSION CALL support. */
+
+/*
+ Use the following commands to build zlib with DFLTCC support:
+
-+ $ CFLAGS=-DDFLTCC ./configure
-+ $ make OBJA=dfltcc.o PIC_OBJA=dfltcc.lo
++ $ ./configure --dfltcc
++ $ make
+*/
+
+#define _GNU_SOURCE
@@ -407,31 +430,28 @@
+/*
+ Compress.
+ */
-+local inline int dfltcc_are_params_ok(int level,
-+ uInt window_bits,
-+ int strategy,
-+ uLong level_mask);
-+local inline int dfltcc_are_params_ok(level, window_bits, strategy, level_mask)
++local inline int dfltcc_can_deflate_with_params(z_streamp strm,
++ int level,
++ uInt window_bits,
++ int strategy);
++local inline int dfltcc_can_deflate_with_params(strm,
++ level,
++ window_bits,
++ strategy)
++ z_streamp strm;
+ int level;
+ uInt window_bits;
+ int strategy;
-+ uLong level_mask;
-+{
-+ return (level_mask & (1 << level)) != 0 &&
-+ (window_bits == HB_BITS) &&
-+ (strategy == Z_FIXED || strategy == Z_DEFAULT_STRATEGY);
-+}
-+
-+
-+int ZLIB_INTERNAL dfltcc_can_deflate(strm)
-+ z_streamp strm;
+{
+ deflate_state FAR *state = (deflate_state FAR *)strm->state;
+ struct dfltcc_state FAR *dfltcc_state = GET_DFLTCC_STATE(state);
+
+ /* Unsupported compression settings */
-+ if (!dfltcc_are_params_ok(state->level, state->w_bits, state->strategy,
-+ dfltcc_state->level_mask))
++ if ((dfltcc_state->level_mask & (1 << level)) == 0)
++ return 0;
++ if (window_bits != HB_BITS)
++ return 0;
++ if (strategy != Z_FIXED && strategy != Z_DEFAULT_STRATEGY)
+ return 0;
+
+ /* Unsupported hardware */
@@ -443,6 +463,17 @@
+ return 1;
+}
+
++int ZLIB_INTERNAL dfltcc_can_deflate(strm)
++ z_streamp strm;
++{
++ deflate_state FAR *state = (deflate_state FAR *)strm->state;
++
++ return dfltcc_can_deflate_with_params(strm,
++ state->level,
++ state->w_bits,
++ state->strategy);
++}
++
+local void dfltcc_gdht OF((z_streamp strm));
+local void dfltcc_gdht(strm)
+ z_streamp strm;
@@ -526,22 +557,24 @@
+ soft_bcc = 0;
+ no_flush = flush == Z_NO_FLUSH;
+
-+ /* Trailing empty block. Switch to software, except when Continuation Flag
-+ * is set, which means that DFLTCC has buffered some output in the
-+ * parameter block and needs to be called again in order to flush it.
++ /* No input data. Return, except when Continuation Flag is set, which means
++ * that DFLTCC has buffered some output in the parameter block and needs to
++ * be called again in order to flush it.
+ */
-+ if (flush == Z_FINISH && strm->avail_in == 0 && !param->cf) {
-+ if (param->bcf) {
-+ /* A block is still open, and the hardware does not support closing
-+ * blocks without adding data. Thus, close it manually.
-+ */
++ if (strm->avail_in == 0 && !param->cf) {
++ /* A block is still open, and the hardware does not support closing
++ * blocks without adding data. Thus, close it manually.
++ */
++ if (!no_flush && param->bcf) {
+ send_eobs(strm, param);
+ param->bcf = 0;
+ }
-+ return 0;
-+ }
-+
-+ if (strm->avail_in == 0 && !param->cf) {
++ /* Let one of deflate_* functions write a trailing empty block. */
++ if (flush == Z_FINISH)
++ return 0;
++ /* Clear history. */
++ if (flush == Z_FULL_FLUSH)
++ param->hl = 0;
+ *result = need_more;
+ return 1;
+ }
@@ -595,7 +628,7 @@
+ param->cvt = state->wrap == 2 ? CVT_CRC32 : CVT_ADLER32;
+ if (!no_flush)
+ /* We need to close a block. Always do this in software - when there is
-+ * no input data, the hardware will not nohor BCC. */
++ * no input data, the hardware will not honor BCC. */
+ soft_bcc = 1;
+ if (flush == Z_FINISH && !param->bcf)
+ /* We are about to open a BFINAL block, set Block Header Final bit
@@ -610,8 +643,8 @@
+ param->sbb = (unsigned int)state->bi_valid;
+ if (param->sbb > 0)
+ *strm->next_out = (Bytef)state->bi_buf;
-+ if (param->hl)
-+ param->nt = 0; /* Honor history */
++ /* Honor history and check value */
++ param->nt = 0;
+ param->cv = state->wrap == 2 ? ZSWAP32(strm->adler) : strm->adler;
+
+ /* When opening a block, choose a Huffman-Table Type */
@@ -971,17 +1004,20 @@
+ fly with deflateParams, we need to convert between hardware and software
+ window formats.
+*/
-+int ZLIB_INTERNAL dfltcc_deflate_params(strm, level, strategy)
++int ZLIB_INTERNAL dfltcc_deflate_params(strm, level, strategy, flush)
+ z_streamp strm;
+ int level;
+ int strategy;
++ int *flush;
+{
+ deflate_state FAR *state = (deflate_state FAR *)strm->state;
+ struct dfltcc_state FAR *dfltcc_state = GET_DFLTCC_STATE(state);
+ struct dfltcc_param_v0 FAR *param = &dfltcc_state->param;
+ int could_deflate = dfltcc_can_deflate(strm);
-+ int can_deflate = dfltcc_are_params_ok(level, state->w_bits, strategy,
-+ dfltcc_state->level_mask);
++ int can_deflate = dfltcc_can_deflate_with_params(strm,
++ level,
++ state->w_bits,
++ strategy);
+
+ if (can_deflate == could_deflate)
+ /* We continue to work in the same mode - no changes needed */
@@ -991,8 +1027,11 @@
+ /* DFLTCC was not used yet - no changes needed */
+ return Z_OK;
+
-+ /* Switching between hardware and software is not implemented */
-+ return Z_STREAM_ERROR;
++ /* For now, do not convert between window formats - simply get rid of the
++ * old data instead.
++ */
++ *flush = Z_FULL_FLUSH;
++ return Z_OK;
+}
+
+/*
@@ -1142,7 +1181,7 @@
===================================================================
--- /dev/null
+++ zlib-1.2.11/contrib/s390/dfltcc_deflate.h
-@@ -0,0 +1,50 @@
+@@ -0,0 +1,54 @@
+#ifndef DFLTCC_DEFLATE_H
+#define DFLTCC_DEFLATE_H
+
@@ -1154,7 +1193,8 @@
+ block_state *result));
+int ZLIB_INTERNAL dfltcc_deflate_params OF((z_streamp strm,
+ int level,
-+ int strategy));
++ int strategy,
++ int *flush));
+int ZLIB_INTERNAL dfltcc_deflate_set_dictionary OF((z_streamp strm,
+ const Bytef *dictionary,
+ uInt dict_length));
@@ -1174,11 +1214,14 @@
+ } while (0)
+#define DEFLATE_RESET_KEEP_HOOK(strm) \
+ dfltcc_reset((strm), sizeof(deflate_state))
-+#define DEFLATE_PARAMS_HOOK(strm, level, strategy) \
++#define DEFLATE_PARAMS_HOOK(strm, level, strategy, hook_flush) \
+ do { \
+ int err; \
+\
-+ err = dfltcc_deflate_params((strm), (level), (strategy)); \
++ err = dfltcc_deflate_params((strm), \
++ (level), \
++ (strategy), \
++ (hook_flush)); \
+ if (err == Z_STREAM_ERROR) \
+ return err; \
+ } while (0)
@@ -1221,7 +1264,7 @@
+#define DEFLATE_SET_DICTIONARY_HOOK(strm, dict, dict_len) do {} while (0)
+#define DEFLATE_GET_DICTIONARY_HOOK(strm, dict, dict_len) do {} while (0)
+#define DEFLATE_RESET_KEEP_HOOK(strm) do {} while (0)
-+#define DEFLATE_PARAMS_HOOK(strm, level, strategy) do {} while (0)
++#define DEFLATE_PARAMS_HOOK(strm, level, strategy, hook_flush) do {} while (0)
+#define DEFLATE_BOUND_ADJUST_COMPLEN(strm, complen, sourceLen) do {} while (0)
+#define DEFLATE_NEED_CONSERVATIVE_BOUND(strm) 0
+#define DEFLATE_HOOK(strm, flush, bstate) 0
@@ -1285,15 +1328,33 @@
return Z_OK;
}
-@@ -584,6 +601,7 @@ int ZEXPORT deflateParams(strm, level, s
+@@ -572,6 +589,7 @@ int ZEXPORT deflateParams(strm, level, s
+ {
+ deflate_state *s;
+ compress_func func;
++ int hook_flush = Z_NO_FLUSH;
+
+ if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
+ s = strm->state;
+@@ -584,12 +602,14 @@ int ZEXPORT deflateParams(strm, level, s
if (level < 0 || level > 9 || strategy < 0 || strategy > Z_FIXED) {
return Z_STREAM_ERROR;
}
-+ DEFLATE_PARAMS_HOOK(strm, level, strategy);
++ DEFLATE_PARAMS_HOOK(strm, level, strategy, &hook_flush);
func = configuration_table[s->level].func;
- if ((strategy != s->strategy || func != configuration_table[level].func) &&
-@@ -659,6 +677,7 @@ uLong ZEXPORT deflateBound(strm, sourceL
+- if ((strategy != s->strategy || func != configuration_table[level].func) &&
+- s->high_water) {
++ if ((strategy != s->strategy || func != configuration_table[level].func ||
++ hook_flush != Z_NO_FLUSH) && s->high_water) {
+ /* Flush the last buffer: */
+- int err = deflate(strm, Z_BLOCK);
++ int err = deflate(strm, RANK(hook_flush) > RANK(Z_BLOCK) ?
++ hook_flush : Z_BLOCK);
+ if (err == Z_STREAM_ERROR)
+ return err;
+ if (strm->avail_out == 0)
+@@ -659,6 +679,7 @@ uLong ZEXPORT deflateBound(strm, sourceL
/* conservative upper bound for compressed data */
complen = sourceLen +
((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 5;
@@ -1301,7 +1362,7 @@
/* if can't get parameters, return conservative bound plus zlib wrapper */
if (deflateStateCheck(strm))
-@@ -700,7 +719,8 @@ uLong ZEXPORT deflateBound(strm, sourceL
+@@ -700,7 +721,8 @@ uLong ZEXPORT deflateBound(strm, sourceL
}
/* if not default parameters, return conservative bound */
@@ -1311,7 +1372,7 @@
return complen + wraplen;
/* default settings: return tight bound for that case */
-@@ -727,7 +747,7 @@ local void putShortMSB (s, b)
+@@ -727,7 +749,7 @@ local void putShortMSB (s, b)
* applications may wish to modify it to avoid allocating a large
* strm->next_out buffer and copying into it. (See also read_buf()).
*/
@@ -1320,7 +1381,7 @@
z_streamp strm;
{
unsigned len;
-@@ -997,7 +1017,8 @@ int ZEXPORT deflate (strm, flush)
+@@ -997,7 +1019,8 @@ int ZEXPORT deflate (strm, flush)
(flush != Z_NO_FLUSH && s->status != FINISH_STATE)) {
block_state bstate;
@@ -1330,7 +1391,7 @@
s->strategy == Z_HUFFMAN_ONLY ? deflate_huff(s, flush) :
s->strategy == Z_RLE ? deflate_rle(s, flush) :
(*(configuration_table[s->level].func))(s, flush);
-@@ -1086,9 +1107,9 @@ int ZEXPORT deflateEnd (strm)
+@@ -1086,9 +1109,9 @@ int ZEXPORT deflateEnd (strm)
TRY_FREE(strm, strm->state->pending_buf);
TRY_FREE(strm, strm->state->head);
TRY_FREE(strm, strm->state->prev);
@@ -1342,7 +1403,7 @@
strm->state = Z_NULL;
return status == BUSY_STATE ? Z_DATA_ERROR : Z_OK;
-@@ -1119,13 +1140,13 @@ int ZEXPORT deflateCopy (dest, source)
+@@ -1119,13 +1142,13 @@ int ZEXPORT deflateCopy (dest, source)
zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));
@@ -1359,7 +1420,7 @@
ds->prev = (Posf *) ZALLOC(dest, ds->w_size, sizeof(Pos));
ds->head = (Posf *) ZALLOC(dest, ds->hash_size, sizeof(Pos));
overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2);
-@@ -1174,7 +1195,8 @@ local unsigned read_buf(strm, buf, size)
+@@ -1174,7 +1197,8 @@ local unsigned read_buf(strm, buf, size)
strm->avail_in -= len;
zmemcpy(buf, strm->next_in, len);
++++++ zlib-no-version-check.patch ++++++
Index: zlib-1.2.11/infback.c
===================================================================
--- zlib-1.2.11.orig/infback.c
+++ zlib-1.2.11/infback.c
@@ -34,9 +34,6 @@ int stream_size;
{
struct inflate_state FAR *state;
- if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
- stream_size != (int)(sizeof(z_stream)))
- return Z_VERSION_ERROR;
if (strm == Z_NULL || window == Z_NULL ||
windowBits < 8 || windowBits > 15)
return Z_STREAM_ERROR;
Index: zlib-1.2.11/inflate.c
===================================================================
--- zlib-1.2.11.orig/inflate.c
+++ zlib-1.2.11/inflate.c
@@ -219,9 +219,6 @@ int stream_size;
int ret;
struct inflate_state FAR *state;
- if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
- stream_size != (int)(sizeof(z_stream)))
- return Z_VERSION_ERROR;
if (strm == Z_NULL) return Z_STREAM_ERROR;
strm->msg = Z_NULL; /* in case we return an error */
if (strm->zalloc == (alloc_func)0) {
Index: zlib-1.2.11/deflate.c
===================================================================
--- zlib-1.2.11.orig/deflate.c
+++ zlib-1.2.11/deflate.c
@@ -263,17 +263,12 @@ int ZEXPORT deflateInit2_(strm, level, m
{
deflate_state *s;
int wrap = 1;
- static const char my_version[] = ZLIB_VERSION;
ushf *overlay;
/* We overlay pending_buf and d_buf+l_buf. This works since the average
* output size for (length,distance) codes is <= 24 bits.
*/
- if (version == Z_NULL || version[0] != my_version[0] ||
- stream_size != sizeof(z_stream)) {
- return Z_VERSION_ERROR;
- }
if (strm == Z_NULL) return Z_STREAM_ERROR;
strm->msg = Z_NULL;
1
0
Hello community,
here is the log from the commit of package freetds for openSUSE:Leap:15.2 checked in at 2020-05-29 18:49:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/freetds (Old)
and /work/SRC/openSUSE:Leap:15.2/.freetds.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "freetds"
Fri May 29 18:49:06 2020 rev:10 rq:808988 version:1.1.36
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/freetds/freetds.changes 2020-01-15 14:55:53.361603762 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.freetds.new.3606/freetds.changes 2020-05-29 18:49:07.384193361 +0200
@@ -1,0 +2,31 @@
+Fri May 15 12:09:05 UTC 2020 - Tomáš Chvátal <tchvatal(a)suse.com>
+
+- Update to 1.1.36:
+ * Various bugfixes
+ * bsc#1141132 CVE-2019-13508
+
+-------------------------------------------------------------------
+Tue Nov 5 04:17:22 UTC 2019 - Linnaea Lavia <obs(a)lavia.moe>
+
+- Enable Kerberos support
+- Version update to 1.1.20:
+ * Default TDS protocol version is now "auto"
+ * Improved UTF-8 performances
+ * TDS Pool Server is enabled
+ * MARS support is enabled
+ * NTLMv2 is enabled
+ * See NEWS and ChangeLog for a complete list of changes
+
+-------------------------------------------------------------------
+Mon Jul 15 04:44:34 UTC 2019 - Martin Liška <mliska(a)suse.cz>
+
+- Add configure-return-void-fix.patch in order to fix wrong
+ configure with -Werror=return-type.
+
+-------------------------------------------------------------------
+Fri Mar 23 10:15:31 UTC 2018 - tchvatal(a)suse.com
+
+- Version update to 1.0.83:
+ * See NEWS for a complete list of changes
+
+-------------------------------------------------------------------
Old:
----
freetds-1.00.39.tar.gz
New:
----
configure-return-void-fix.patch
freetds-1.1.36.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ freetds.spec ++++++
--- /var/tmp/diff_new_pack.Tqt6KS/_old 2020-05-29 18:49:07.808194578 +0200
+++ /var/tmp/diff_new_pack.Tqt6KS/_new 2020-05-29 18:49:07.808194578 +0200
@@ -1,7 +1,7 @@
#
# spec file for package freetds
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,24 +12,25 @@
# 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/
#
Name: freetds
-Version: 1.00.39
+Version: 1.1.36
Release: 0
Summary: A free re-implementation of the TDS (Tabular Data Stream) protocol
-License: LGPL-2.1+ and GPL-2.0+
-Group: Productivity/Databases/Clients
-Url: http://www.freetds.org/
-Source: ftp://ftp.freetds.org/pub/freetds/stable/%{name}-%{version}.tar.gz
+License: LGPL-2.1-or-later AND GPL-2.0-or-later
+URL: https://www.freetds.org/
+Source: ftp://ftp.freetds.org/pub/freetds/stable/%{name}-%{version}.tar.bz2
+Patch0: configure-return-void-fix.patch
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: readline-devel
BuildRequires: unixODBC-devel
BuildRequires: pkgconfig(gnutls)
+BuildRequires: pkgconfig(krb5-gssapi)
BuildRequires: pkgconfig(nettle)
Requires: glibc-locale
@@ -41,8 +42,7 @@
%package config
Summary: A free re-implementation of the TDS (Tabular Data Stream) protocol
-License: LGPL-2.1+
-Group: Productivity/Databases/Clients
+License: LGPL-2.1-or-later
Obsoletes: libfreetds < %{version}
Provides: %{name} = %{version}
Provides: libfreetds = %{version}
@@ -58,8 +58,7 @@
%package tools
Summary: Applications for working with the TDS (Tabular Data Stream) protocol
-License: LGPL-2.1+ and GPL-2.0+
-Group: Productivity/Databases/Clients
+License: LGPL-2.1-or-later AND GPL-2.0-or-later
%description tools
FreeTDS is a project to document and implement the TDS (Tabular Data Stream)
@@ -71,8 +70,7 @@
%package devel
Summary: Include files needed for development with FreeTDS
-License: LGPL-2.1+
-Group: Development/Libraries/C and C++
+License: LGPL-2.1-or-later
Requires: libct4 = %{version}
Requires: libsybdb5 = %{version}
Requires: libtdsodbc0 = %{version}
@@ -83,8 +81,7 @@
%package -n libct4
Summary: FreeTDS standalone driver with modern API
-License: LGPL-2.1+
-Group: System/Libraries
+License: LGPL-2.1-or-later
%description -n libct4
ct-lib refers to Sybase's second-generation API, which fixes a number
@@ -93,8 +90,7 @@
%package -n libsybdb5
Summary: FreeTDS standalone driver with classic API
-License: LGPL-2.1+
-Group: System/Libraries
+License: LGPL-2.1-or-later
%description -n libsybdb5
db-lib is the oldest and simplest API, and the only API supported by
@@ -105,8 +101,7 @@
%package -n libtdsodbc0
Summary: FreeTDS ODBC Driver for unixODBC
-License: LGPL-2.1+
-Group: Productivity/Databases/Clients
+License: LGPL-2.1-or-later
Requires: unixODBC >= 2.0.0
%description -n libtdsodbc0
@@ -117,8 +112,7 @@
%package doc
Summary: User documentation for FreeTDS
-License: LGPL-2.1+ and GPL-2.0+
-Group: Documentation/HTML
+License: LGPL-2.1-or-later AND GPL-2.0-or-later
%description doc
The freetds-doc package contains the useguide and reference of FreeTDS
@@ -126,19 +120,21 @@
%prep
%setup -q
+%patch0 -p1
%build
%configure \
--with-unixodbc=%{_prefix} \
--enable-threadsafe \
+ --enable-krb5 \
--sysconfdir=%{_sysconfdir} \
- --with-tdsver=4.2 \
+ --with-tdsver=auto \
--disable-static \
%if 0%{?suse_version} >= 1310
--with-gnutls \
%endif
--with-pic
-make %{?_smp_mflags} RPM_OPT_FLAGS="%{optflags}" V=1
+%make_build RPM_OPT_FLAGS="%{optflags}"
%install
%make_install
@@ -176,35 +172,31 @@
odbcinst -u -d -n 'SQL Server'
%files config
-%defattr(-,root,root)
%config %{_sysconfdir}/*
-%{_mandir}/man5/*.5%{ext_man}
+%{_mandir}/man5/*.5%{?ext_man}
%files tools
-%defattr (-,root,root)
%{_bindir}/*
-%{_mandir}/man1/*.1%{ext_man}
+%{_mandir}/man1/*.1%{?ext_man}
%files devel
-%defattr (-,root,root)
-%doc BUGS COPYING* NEWS README TODO
+%doc BUGS NEWS README TODO
%{_libdir}/*.so
%{_includedir}/*
%files -n libct4
-%defattr(-,root,root)
+%license COPYING*
%{_libdir}/libct.so.4*
%files -n libsybdb5
-%defattr(-,root,root)
+%license COPYING*
%{_libdir}/libsybdb.so.5*
%files -n libtdsodbc0
-%defattr(-,root,root)
+%license COPYING*
%{_libdir}/libtdsodbc.so.*
%files doc
-%defattr (-,root,root)
%{_defaultdocdir}/freetds/
%changelog
++++++ configure-return-void-fix.patch ++++++
diff --git a/configure b/configure
index eb38925..163f255 100755
--- a/configure
+++ b/configure
@@ -19397,6 +19397,7 @@ SQLRETURN SQL_API SQLColAttribute (SQLHSTMT StatementHandle,
SQLUSMALLINT ColumnNumber, SQLUSMALLINT FieldIdentifier,
SQLPOINTER CharacterAttribute, SQLSMALLINT BufferLength,
SQLSMALLINT *StringLength, SQLLEN * NumericAttribute) {
+ return 0;
}
int
main ()
++++++ freetds-1.00.39.tar.gz -> freetds-1.1.36.tar.bz2 ++++++
++++ 188174 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package libxslt for openSUSE:Leap:15.2 checked in at 2020-05-29 18:49:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/libxslt (Old)
and /work/SRC/openSUSE:Leap:15.2/.libxslt.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libxslt"
Fri May 29 18:49:04 2020 rev:28 rq:808984 version:1.1.32
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/libxslt/libxslt-python.changes 2020-01-15 15:25:49.862590286 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.libxslt.new.3606/libxslt-python.changes 2020-05-29 18:49:06.436190641 +0200
@@ -1,0 +2,25 @@
+Mon Oct 21 13:55:37 UTC 2019 - Pedro Monreal Gonzalez <pmonrealgonzalez(a)suse.com>
+
+- Security fix [bsc#1154609, CVE-2019-18197]
+ * Fix dangling pointer in xsltCopyText
+ * Add libxslt-CVE-2019-18197.patch
+
+-------------------------------------------------------------------
+Tue Jul 2 15:02:27 UTC 2019 - Pedro Monreal Gonzalez <pmonrealgonzalez(a)suse.com>
+
+- Security fix: [bsc#1140101, CVE-2019-13118]
+ * Fix uninitialized read with UTF-8 grouping chars. Read of
+ uninitialized stack data due to too narrow xsl:number
+ instruction and an invalid character
+ * Added libxslt-CVE-2019-13118.patch
+
+-------------------------------------------------------------------
+Tue Jul 2 15:00:56 UTC 2019 - Pedro Monreal Gonzalez <pmonrealgonzalez(a)suse.com>
+
+- Security fix: [bsc#1140095, CVE-2019-13117]
+ * Fix uninitialized read of xsl:number token. An xsl number with
+ certain format strings could lead to a uninitialized read in
+ xsltNumberFormatInsertNumbers
+ * Added libxslt-CVE-2019-13117.patch
+
+-------------------------------------------------------------------
libxslt.changes: same change
New:
----
libxslt-CVE-2019-13117.patch
libxslt-CVE-2019-13118.patch
libxslt-CVE-2019-18197.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libxslt-python.spec ++++++
--- /var/tmp/diff_new_pack.KU0TN8/_old 2020-05-29 18:49:06.920192030 +0200
+++ /var/tmp/diff_new_pack.KU0TN8/_new 2020-05-29 18:49:06.924192041 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libxslt-python
#
-# Copyright (c) 2017 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,7 +12,7 @@
# 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/
#
@@ -34,6 +34,12 @@
Patch2: libxslt-random-seed.patch
# PATCH-FIX-UPSTREAM bsc#1132160 CVE-2019-11068 Fix security framework bypass
Patch4: libxslt-CVE-2019-11068.patch
+# PATCH-FIX-UPSTREAM bsc#1140095 CVE-2019-13117 Fix uninitialized read of xsl:number token
+Patch5: libxslt-CVE-2019-13117.patch
+# PATCH-FIX-UPSTREAM bsc#1140101 CVE-2019-13118 Fix uninitialized read with UTF-8 grouping chars
+Patch6: libxslt-CVE-2019-13118.patch
+# PATCH-FIX-UPSTREAM bsc#1154609 CVE-2019-18197 Fix dangling pointer in xsltCopyText
+Patch7: libxslt-CVE-2019-18197.patch
BuildRequires: libgcrypt-devel
BuildRequires: libgpg-error-devel
BuildRequires: libtool
@@ -61,6 +67,9 @@
%patch1
%patch2 -p1
%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
%build
autoreconf -fvi
++++++ libxslt.spec ++++++
--- /var/tmp/diff_new_pack.KU0TN8/_old 2020-05-29 18:49:06.944192098 +0200
+++ /var/tmp/diff_new_pack.KU0TN8/_new 2020-05-29 18:49:06.948192110 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libxslt
#
-# Copyright (c) 2017 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,7 +12,7 @@
# 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/
#
@@ -36,6 +36,12 @@
Patch3: libxslt-random-seed.patch
# PATCH-FIX-UPSTREAM bsc#1132160 CVE-2019-11068 Fix security framework bypass
Patch4: libxslt-CVE-2019-11068.patch
+# PATCH-FIX-UPSTREAM bsc#1140095 CVE-2019-13117 Fix uninitialized read of xsl:number token
+Patch5: libxslt-CVE-2019-13117.patch
+# PATCH-FIX-UPSTREAM bsc#1140101 CVE-2019-13118 Fix uninitialized read with UTF-8 grouping chars
+Patch6: libxslt-CVE-2019-13118.patch
+# PATCH-FIX-UPSTREAM bsc#1154609 CVE-2019-18197 Fix dangling pointer in xsltCopyText
+Patch7: libxslt-CVE-2019-18197.patch
BuildRequires: libgcrypt-devel
BuildRequires: libgpg-error-devel
BuildRequires: libtool
@@ -105,6 +111,9 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
%build
autoreconf -fvi
++++++ libxslt-CVE-2019-13117.patch ++++++
>From c5eb6cf3aba0af048596106ed839b4ae17ecbcb1 Mon Sep 17 00:00:00 2001
From: Nick Wellnhofer <wellnhofer(a)aevum.de>
Date: Sat, 27 Apr 2019 11:19:48 +0200
Subject: [PATCH] Fix uninitialized read of xsl:number token
Found by OSS-Fuzz.
---
libxslt/numbers.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/libxslt/numbers.c b/libxslt/numbers.c
index 89e1f668..75c31eba 100644
--- a/libxslt/numbers.c
+++ b/libxslt/numbers.c
@@ -382,7 +382,10 @@ xsltNumberFormatTokenize(const xmlChar *format,
tokens->tokens[tokens->nTokens].token = val - 1;
ix += len;
val = xmlStringCurrentChar(NULL, format+ix, &len);
- }
+ } else {
+ tokens->tokens[tokens->nTokens].token = (xmlChar)'0';
+ tokens->tokens[tokens->nTokens].width = 1;
+ }
} else if ( (val == (xmlChar)'A') ||
(val == (xmlChar)'a') ||
(val == (xmlChar)'I') ||
--
2.21.0
++++++ libxslt-CVE-2019-13118.patch ++++++
>From 6ce8de69330783977dd14f6569419489875fb71b Mon Sep 17 00:00:00 2001
From: Nick Wellnhofer <wellnhofer(a)aevum.de>
Date: Mon, 3 Jun 2019 13:14:45 +0200
Subject: [PATCH] Fix uninitialized read with UTF-8 grouping chars
The character type in xsltFormatNumberConversion was too narrow and
an invalid character/length combination could be passed to
xsltNumberFormatDecimal, resulting in an uninitialized read.
Found by OSS-Fuzz.
---
libxslt/numbers.c | 5 +++--
tests/docs/bug-222.xml | 1 +
tests/general/bug-222.out | 2 ++
tests/general/bug-222.xsl | 6 ++++++
4 files changed, 12 insertions(+), 2 deletions(-)
create mode 100644 tests/docs/bug-222.xml
create mode 100644 tests/general/bug-222.out
create mode 100644 tests/general/bug-222.xsl
diff --git a/libxslt/numbers.c b/libxslt/numbers.c
index f1ed8846..20b99d5a 100644
--- a/libxslt/numbers.c
+++ b/libxslt/numbers.c
@@ -1298,13 +1298,14 @@ OUTPUT_NUMBER:
number = floor((scale * number + 0.5)) / scale;
if ((self->grouping != NULL) &&
(self->grouping[0] != 0)) {
+ int gchar;
len = xmlStrlen(self->grouping);
- pchar = xsltGetUTF8Char(self->grouping, &len);
+ gchar = xsltGetUTF8Char(self->grouping, &len);
xsltNumberFormatDecimal(buffer, floor(number), self->zeroDigit[0],
format_info.integer_digits,
format_info.group,
- pchar, len);
+ gchar, len);
} else
xsltNumberFormatDecimal(buffer, floor(number), self->zeroDigit[0],
format_info.integer_digits,
diff --git a/tests/docs/bug-222.xml b/tests/docs/bug-222.xml
new file mode 100644
index 00000000..69d62f2c
--- /dev/null
+++ b/tests/docs/bug-222.xml
@@ -0,0 +1 @@
+<doc/>
diff --git a/tests/general/bug-222.out b/tests/general/bug-222.out
new file mode 100644
index 00000000..e3139698
--- /dev/null
+++ b/tests/general/bug-222.out
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+1⠢0
diff --git a/tests/general/bug-222.xsl b/tests/general/bug-222.xsl
new file mode 100644
index 00000000..e32dc473
--- /dev/null
+++ b/tests/general/bug-222.xsl
@@ -0,0 +1,6 @@
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+ <xsl:decimal-format name="f" grouping-separator="⠢"/>
+ <xsl:template match="/">
+ <xsl:value-of select="format-number(10,'#⠢0','f')"/>
+ </xsl:template>
+</xsl:stylesheet>
--
2.21.0
++++++ libxslt-CVE-2019-18197.patch ++++++
>From 2232473733b7313d67de8836ea3b29eec6e8e285 Mon Sep 17 00:00:00 2001
From: Nick Wellnhofer <wellnhofer(a)aevum.de>
Date: Sat, 17 Aug 2019 16:51:53 +0200
Subject: [PATCH] Fix dangling pointer in xsltCopyText
xsltCopyText didn't reset ctxt->lasttext in some cases which could
lead to various memory errors in relation with CDATA sections in input
documents.
Found by OSS-Fuzz.
---
libxslt/transform.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libxslt/transform.c b/libxslt/transform.c
index 95ebd073..d7ab0b66 100644
--- a/libxslt/transform.c
+++ b/libxslt/transform.c
@@ -1094,6 +1094,8 @@ xsltCopyText(xsltTransformContextPtr ctxt, xmlNodePtr target,
if ((copy->content = xmlStrdup(cur->content)) == NULL)
return NULL;
}
+
+ ctxt->lasttext = NULL;
} else {
/*
* normal processing. keep counters to extend the text node
--
2.22.0
1
0
Hello community,
here is the log from the commit of package glibc for openSUSE:Leap:15.2 checked in at 2020-05-29 18:49:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/glibc (Old)
and /work/SRC/openSUSE:Leap:15.2/.glibc.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "glibc"
Fri May 29 18:49:03 2020 rev:74 rq:808978 version:2.26
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/glibc/glibc.changes 2020-04-08 12:47:44.422323005 +0200
+++ /work/SRC/openSUSE:Leap:15.2/.glibc.new.3606/glibc.changes 2020-05-29 18:49:04.088183903 +0200
@@ -1,0 +2,6 @@
+Wed May 13 10:27:17 UTC 2020 - Andreas Schwab <schwab(a)suse.de>
+
+- nptl-setxid-race.patch: nptl: wait for pending setxid request also in
+ detached thread (bsc#1162930, BZ #25942)
+
+-------------------------------------------------------------------
New:
----
nptl-setxid-race.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ glibc.spec ++++++
--- /var/tmp/diff_new_pack.KMdvGb/_old 2020-05-29 18:49:05.576188173 +0200
+++ /var/tmp/diff_new_pack.KMdvGb/_new 2020-05-29 18:49:05.580188184 +0200
@@ -430,6 +430,8 @@
Patch1080: dlopen-filter-object.patch
# PATCH-FIX-UPSTREAM Fix use-after-free in glob when expanding ~user (CVE-2020-1752, BZ #25414)
Patch1081: glob-use-after-free.patch
+# PATCH-FIX-UPSTREAM nptl: wait for pending setxid request also in detached thread (BZ #25942)
+Patch1082: nptl-setxid-race.patch
###
# Patches awaiting upstream approval
@@ -746,6 +748,7 @@
%patch1079 -p1
%patch1080 -p1
%patch1081 -p1
+%patch1082 -p1
%patch2000 -p1
%patch2001 -p1
++++++ nptl-setxid-race.patch ++++++
>From 4cab20fa49b3ea3e3454fdc4f13bf3828d8efd19 Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab(a)suse.de>
Date: Thu, 7 May 2020 15:50:09 +0200
Subject: [PATCH] nptl: wait for pending setxid request also in detached thread
(bug 25942)
There is a race between __nptl_setxid and exiting detached thread, which
causes a deadlock on stack_cache_lock. The deadlock happens in this
state:
T1: setgroups -> __nptl_setxid (holding stack_cache_lock, waiting on cmdp->cntr == 0)
T2 (detached, exiting): start_thread -> __deallocate_stack (waiting on stack_cache_lock)
more threads waiting on stack_cache_lock in pthread_create
For non-detached threads, start_thread waits for its own setxid handler to
finish before exiting. Do this for detached threads as well.
---
nptl/pthread_create.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
Index: glibc-2.26/nptl/pthread_create.c
===================================================================
--- glibc-2.26.orig/nptl/pthread_create.c
+++ glibc-2.26/nptl/pthread_create.c
@@ -577,11 +577,7 @@ START_THREAD_DEFN
}
#endif
- /* If the thread is detached free the TCB. */
- if (IS_DETACHED (pd))
- /* Free the TCB. */
- __free_tcb (pd);
- else if (__glibc_unlikely (pd->cancelhandling & SETXID_BITMASK))
+ if (__glibc_unlikely (pd->cancelhandling & SETXID_BITMASK))
{
/* Some other thread might call any of the setXid functions and expect
us to reply. In this case wait until we did that. */
@@ -597,6 +593,11 @@ START_THREAD_DEFN
pd->setxid_futex = 0;
}
+ /* If the thread is detached free the TCB. */
+ if (IS_DETACHED (pd))
+ /* Free the TCB. */
+ __free_tcb (pd);
+
/* We cannot call '_exit' here. '_exit' will terminate the process.
The 'exit' implementation in the kernel will signal when the
1
0
Hello community,
here is the log from the commit of package osinfo-db for openSUSE:Leap:15.2 checked in at 2020-05-29 18:49:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/osinfo-db (Old)
and /work/SRC/openSUSE:Leap:15.2/.osinfo-db.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "osinfo-db"
Fri May 29 18:49:01 2020 rev:52 rq:808729 version:20200214
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/osinfo-db/osinfo-db.changes 2020-03-13 10:56:36.504401876 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.osinfo-db.new.3606/osinfo-db.changes 2020-05-29 18:49:03.228181434 +0200
@@ -1,0 +2,6 @@
+Fri May 22 10:41:42 MDT 2020 - carnold(a)suse.com
+
+- bsc#1172008 - osinfo-db: Add support for openSUSE Leap 15.2
+ add-opensuse-leap-15.2-support.patch
+
+-------------------------------------------------------------------
New:
----
add-opensuse-leap-15.2-support.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ osinfo-db.spec ++++++
--- /var/tmp/diff_new_pack.xPdtKL/_old 2020-05-29 18:49:03.720182846 +0200
+++ /var/tmp/diff_new_pack.xPdtKL/_new 2020-05-29 18:49:03.724182858 +0200
@@ -32,6 +32,7 @@
Patch24: add-win-2k19-media-info.patch
Patch25: fix-sle15sp1-volume-id-string.patch
Patch26: SLE-add-info-about-UEFI-support.patch
+Patch27: add-opensuse-leap-15.2-support.patch
BuildRequires: intltool
BuildRequires: osinfo-db-tools
@@ -49,6 +50,7 @@
%patch24 -p1
%patch25 -p1
%patch26 -p1
+%patch27 -p1
%build
cd %{_builddir}
++++++ add-opensuse-leap-15.2-support.patch ++++++
--- /dev/null 2020-05-18 08:31:58.984168313 -0600
+++ osinfo-db-20200214/os/opensuse.org/opensuse-15.2.xml 2020-05-22 10:39:56.073024784 -0600
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<libosinfo version="0.0.1">
+
+ <os id="http://opensuse.org/opensuse/15.2">
+ <short-id>opensuse15.2</short-id>
+ <name>openSUSE Leap 15.2</name>
+ <name xml:lang="fr">openSUSE Leap 15.2</name>
+ <name xml:lang="pl">openSUSE Leap 15.2</name>
+ <name xml:lang="uk">openSUSE Leap 15.2</name>
+ <version>15.2</version>
+ <vendor>openSUSE</vendor>
+ <vendor xml:lang="ca">openSUSE</vendor>
+ <vendor xml:lang="de">openSUSE</vendor>
+ <vendor xml:lang="es">openSUSE</vendor>
+ <vendor xml:lang="fr">openSUSE</vendor>
+ <vendor xml:lang="id">openSUSE</vendor>
+ <vendor xml:lang="it">openSUSE</vendor>
+ <vendor xml:lang="ja">openSUSE</vendor>
+ <vendor xml:lang="pl">openSUSE</vendor>
+ <vendor xml:lang="pt_BR">openSUSE</vendor>
+ <vendor xml:lang="uk">openSUSE</vendor>
+ <family>linux</family>
+ <distro>opensuse</distro>
+ <upgrades id="http://opensuse.org/opensuse/15.1"/>
+ <derives-from id="http://opensuse.org/opensuse/15.1"/>
+
+ <release-date>2020-07-02</release-date>
+
+ <variant id="netinst">
+ <name>openSUSE Leap 15.2</name>
+ <name xml:lang="fr">openSUSE Leap 15.2</name>
+ <name xml:lang="pl">openSUSE Leap 15.2</name>
+ <name xml:lang="uk">openSUSE Leap 15.2</name>
+ </variant>
+
+
+ <media arch="x86_64">
+ <url>https://download.opensuse.org/distribution/leap/15.2/iso/openSUSE-Leap-15.2…</url>
+ <iso>
+ <volume-id>openSUSE-Leap-15.2-DVD-x86_64*</volume-id>
+ <system-id>LINUX</system-id>
+ <publisher-id>SUSE LINUX GmbH</publisher-id>
+ </iso>
+ <kernel>boot/x86_64/loader/linux</kernel>
+ <initrd>boot/x86_64/loader/initrd</initrd>
+ </media>
+
+
+ <media arch="x86_64">
+ <variant id="netinst"/>
+ <url>https://download.opensuse.org/distribution/leap/15.2/iso/openSUSE-Leap-15.2…</url>
+ <iso>
+ <volume-id>openSUSE-Leap-15.2-NET-x86_64*</volume-id>
+ <system-id>LINUX</system-id>
+ <publisher-id>SUSE LINUX GmbH</publisher-id>
+ </iso>
+ <kernel>boot/x86_64/loader/linux</kernel>
+ <initrd>boot/x86_64/loader/initrd</initrd>
+ </media>
+
+
+ <media live="true" installer-script="false" arch="x86_64">
+ <url>https://download.opensuse.org/distribution/leap/15.2/live/openSUSE-Leap-15.…</url>
+ <iso>
+ <volume-id>openSUSE_Leap_15.2_GNOME_Live</volume-id>
+ <publisher-id>SUSE LINUX GMBH</publisher-id>
+ </iso>
+ <kernel>boot/x86_64/loader/linux</kernel>
+ <initrd>boot/x86_64/loader/initrd</initrd>
+ </media>
+
+
+ <media live="true" installer-script="false" arch="x86_64">
+ <url>https://download.opensuse.org/distribution/leap/15.2/live/openSUSE-Leap-15.…</url>
+ <iso>
+ <volume-id>openSUSE_Leap_15.2_KDE_Live</volume-id>
+ <publisher-id>SUSE LINUX GMBH</publisher-id>
+ </iso>
+ <kernel>boot/x86_64/loader/linux</kernel>
+ <initrd>boot/x86_64/loader/initrd</initrd>
+ </media>
+
+
+ <media live="true" installer-script="false" arch="x86_64">
+ <url>https://download.opensuse.org/distribution/leap/15.2/live/openSUSE-Leap-15.…</url>
+ <iso>
+ <volume-id>openSUSE_Leap_15.2_Rescue_CD</volume-id>
+ <publisher-id>SUSE LINUX GMBH</publisher-id>
+ </iso>
+ <kernel>boot/x86_64/loader/linux</kernel>
+ <initrd>boot/x86_64/loader/initrd</initrd>
+ </media>
+
+ <tree arch="x86_64">
+ <url>https://download.opensuse.org/pub/opensuse/distribution/leap/15.2/repo/oss/</url>
+ <treeinfo>
+ <family>openSUSE Leap</family>
+ <version>15.2</version>
+ <arch>x86_64</arch>
+ </treeinfo>
+ </tree>
+
+ <installer>
+ <script id='http://opensuse.org/opensuse/autoyast/jeos'/>
+ <script id='http://opensuse.org/opensuse/autoyast/desktop'/>
+ </installer>
+
+ <resources arch="all">
+ <minimum>
+ <cpu>1600000000</cpu>
+ <n-cpus>1</n-cpus>
+ <ram>1073741824</ram>
+ <storage>3221225472</storage>
+ </minimum>
+ <recommended>
+ <cpu>2400000000</cpu>
+ <ram>2147483648</ram>
+ <storage>17179869184</storage>
+ </recommended>
+ </resources>
+ </os>
+</libosinfo>
1
0
Hello community,
here is the log from the commit of package hplip for openSUSE:Leap:15.2 checked in at 2020-05-29 18:48:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/hplip (Old)
and /work/SRC/openSUSE:Leap:15.2/.hplip.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hplip"
Fri May 29 18:48:59 2020 rev:28 rq:778889 version:3.19.12
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/hplip/hplip.changes 2020-01-15 15:11:22.530105259 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.hplip.new.3606/hplip.changes 2020-05-29 18:49:02.084178151 +0200
@@ -1,0 +2,381 @@
+Mon Jan 13 22:01:08 UTC 2020 - Martin Wilck <mwilck(a)suse.com>
+
+- Use /etc/sane.d/dll.d/hpaio to register SANE backend rather
+ than modifying /etc/sane/dll.conf
+- SANE backend must be configured in hplip-sane package (bsc#1160708)
+
+-------------------------------------------------------------------
+Mon Jan 13 17:27:20 UTC 2020 - Martin Wilck <mwilck(a)suse.com>
+
+- Revert changes from 3.18.5 that break hp-setup for fax devices
+ (bsc#1107711, lp#1773320)
+ * Added patch: Revert-changes-from-3.18.5-that-break-hp-setup-for-f.patch
+
+-------------------------------------------------------------------
+Fri Jan 10 13:52:53 UTC 2020 - Martin Wilck <mwilck(a)suse.com>
+
+- Fix crash if python3-reportlab is missing (bsc#1159240, lp#1859179)
+ * Added hp-sendfax-avoid-crash-if-python-reportlab-is-missin.patch
+ * Added recommends on python3-reportlab
+
+-------------------------------------------------------------------
+Thu Jan 9 11:54:45 UTC 2020 - Johannes Weberhofer <jweberhofer(a)weberhofer.at>
+
+- updated to 3.19.12
+
+ Rendering print jobs with cupsfilter command
+ Added support for the following new Printers:
+
+ * HP Color LaserJet Pro M256dn
+ * HP Color LaserJet Pro M255dn
+ * HP Color LaserJet Pro M256nw
+ * HP Color LaserJet Pro M255nw
+ * HP Color LaserJet Pro M256dw
+ * HP Color LaserJet Pro M255dw
+ * HP Color LaserJet Pro M155a
+ * HP Color LaserJet Pro M156a
+ * HP Color LaserJet Pro M155nw
+ * HP Color LaserJet Pro M156nw
+ * HP Color LaserJet Pro MFP M282nw
+ * HP Color LaserJet Pro MFP M284nw
+ * HP Color LaserJet Pro MFP M283fdn
+ * HP Color LaserJet Pro MFP M285fdn
+ * HP Color LaserJet Pro MFP M283fdw
+ * HP Color LaserJet Pro MFP M285fdw
+ * HP Color LaserJet Pro MFP M283cdw
+ * HP Color LaserJet Pro MFP M285cdw
+ * HP Color LaserJet Pro MFP M182n
+ * HP Color LaserJet Pro MFP M184n
+ * HP Color LaserJet Pro MFP M182nw
+ * HP Color LaserJet Pro MFP M184nw
+ * HP Color LaserJet Pro MFP M183fw
+ * HP Color LaserJet Pro MFP M185fw
+
+- updated to 3.19.11
+
+ Added Supported for “hp-uiscan” to scan only backside of a page
+
+ Added support for the following new Printers:
+ * HP Color LaserJet MFP M776dn
+ * HP Color LaserJet Flow MFP M776z
+ * HP Color LaserJet Flow MFP M776zs
+ * HP Color LaserJet M856dn
+ * HP Color LaserJet M856x
+ * HP Color LaserJet E85055dn
+
+ Added Job Accounting Support for the following devices:
+ * HP LaserJet Managed Flow MFP E77822-28-30 Printer
+ * HP LaserJet Managed MFP E77822-28-30 Printer
+ * HP LaserJet Managed Flow MFP E87640-50-60 Printer
+ * HP LaserJet Managed MFP E87640-50-60 Printer
+ * HP LaserJet Managed Flow MFP E82540-50-60 Printer
+ * HP LaserJet Managed MFP E82540-50-60 Printer
+ * HP LaserJet Managed Flow MFP E72525-30-35 Printer
+ * HP LaserJet Managed MFP E72525-30-35 Printer
+
+- updated to 3.19.8
+ hp-uiscan will fetch the paper sizes from the device dynamically for ScanJet devices.
+ hp-uiscan will prompt error message when paper jam occurs for ScanJet devices.
+
+ Added support for the following new Printers:
+ * HP DesignJet T1530 Postscript
+ * HP DesignJet T1600 Postscript Printer
+ * HP DesignJet T1600dr Postscript Printer
+ * HP DesignJet T2530 Postscript
+ * HP DesignJet T2600 Postscript MFP
+ * HP DesignJet T930 Postscript
+ * HP LaserJet Pro M304a
+ * HP LaserJet Pro M305d
+ * HP LaserJet Pro M305dn
+ * HP LaserJet Pro M305dw
+ * HP LaserJet Pro MFP M329dn
+ * HP LaserJet Pro MFP M329dw
+
+-------------------------------------------------------------------
+Sun Dec 15 14:46:50 UTC 2019 - Stefan Brüns <stefan.bruens(a)rwth-aachen.de>
+
+- Pass Python includedir in CFLAGS to fix broken lookup of Python.h
+ in configure, fails with Python 3.8 (boo#1159242).
+
+-------------------------------------------------------------------
+Wed Oct 16 07:48:29 UTC 2019 - Andreas Schneider <asn(a)cryptomilk.org>
+
+- Added missing requirement lsb-release (needed for root password
+ prompt, e.g. hp-plugin).
+- Changed the pgp server to pool.sks-keyservers.net to avoid timeouts
+ from pgp.mit.edu
+ * New patch: hplip-change-pgp-server.patch
+
+-------------------------------------------------------------------
+Thu Aug 29 20:33:04 UTC 2019 - Martin Wilck <mwilck(a)suse.com>
+
+- Renamed "hplip-scan" to "hplip-scan-utils" to express the
+ purpose of the package more clearly in the name.
+ "hplip-scan" has never been in public repos.
+
+-------------------------------------------------------------------
+Thu Aug 29 20:24:48 UTC 2019 - Martin Wilck <mwilck(a)suse.com>
+
+- Added conditional BuildRequires on "cups-rpm-helper".
+ Recently a bug in python-pycups was fixed that had prevented
+ autogeneration of Provides: tags in printer drivers by means
+ of "BuildRequires: python3-cups". See OBS sr#726727. This
+ dependency must be conditional for now, as cups-rpm-helper
+ is not available in every project yet.
+- Ran spec-cleaner.
+
+-------------------------------------------------------------------
+Wed Aug 28 21:32:04 UTC 2019 - Martin Wilck <mwilck(a)suse.com>
+
+- Removed compatibility code for SLE12/Leap42 and earlier
+ As we are now using rpm 4.13 (A and B) syntax, we can't support
+ these any more anyway.
+
+-------------------------------------------------------------------
+Tue Aug 27 10:48:46 UTC 2019 - Martin Wilck <mwilck(a)suse.com>
+
+- Moved hp-scan and hp-uiscan to a separate package "hp-scan".
+ These tools pull in PIL and python3-scikit-image, which causes
+ a rather big dependency list, which is only available in openSUSE.
+ This allows us also to get rid of the non-functional "hp-scan" tool
+ in SLE.
+- Fixed --with-htmldir so that documentation is packaged
+- Improved package descriptions and summaries
+ * Clarified the relationship of hplip-hpijs, hplip-sane, and hplip
+ * Shortened the descriptions
+ * Removed reference to HTML documention in package description
+- Added -devel dependencies as required by post-build-checks
+- Minor spec file cleanup (macro usage)
+- Fixed build failures on non-standard architectures by adding BuildIgnore
+ These failures are actually caused by some ports catching up
+ slowly with package updates. But our BuildIgnores are helpful
+ nonetheless, making the build environment leaner.
+
+-------------------------------------------------------------------
+Mon Aug 12 12:53:35 UTC 2019 - Johannes Weberhofer <jweberhofer(a)weberhofer.at>
+
+- updated to 3.19.6
+ Added support for the following new Printers:
+ * HP Color LaserJet Enterprise M751dn
+ * HP Color LaserJet Enterprise M751n
+ * HP Color LaserJet Managed E75245dn
+ * HP Color LaserJet Pro M453cdn
+ * HP Color LaserJet Pro M453cdw
+ * HP Color LaserJet Pro M454cdn
+ * HP Color LaserJet Pro M454cdw
+ * HP Color LaserJet Pro M454dn
+ * HP Color LaserJet Pro M454dw
+ * HP Color LaserJet Pro M454nw
+ * HP Color LaserJet Pro MFP M478fcdn
+ * HP Color LaserJet Pro MFP M478fcdw
+ * HP Color LaserJet Pro MFP M479dw
+ * HP Color LaserJet Pro MFP M479fcdn
+ * HP Color LaserJet Pro MFP M479fcdw
+ * HP Color LaserJet Pro MFP M479fdn
+ * HP Color LaserJet Pro MFP M479fdw
+ * HP Color LaserJet Pro MFP M479fnw
+ * HP DesignJet T2600dr Postscript MFP
+ * HP DesignJet XL 3600 PS MFP
+ * HP Laser NS 1020
+ * HP Laser NS 1020w
+ * HP Laser NS MFP 1005
+ * HP Laser NS MFP 1005w
+ * HP LaserJet Enterprise Flow MFP M528c
+ * HP LaserJet Enterprise Flow MFP M528z
+ * HP LaserJet Enterprise M507dn
+ * HP LaserJet Enterprise M507dng
+ * HP LaserJet Enterprise M507n
+ * HP LaserJet Enterprise M507x
+ * HP LaserJet Enterprise MFP M528dn
+ * HP LaserJet Enterprise MFP M528f
+ * HP LaserJet Managed E50145dn
+ * HP LaserJet Managed E50145x
+ * HP LaserJet Managed Flow MFP E52645c
+ * HP LaserJet Managed MFP E52645dn
+ * HP LaserJet Pro M404c1
+ * HP LaserJet Pro M404c2
+ * HP LaserJet Pro M404c3
++++ 184 more lines (skipped)
++++ between /work/SRC/openSUSE:Leap:15.2/hplip/hplip.changes
++++ and /work/SRC/openSUSE:Leap:15.2/.hplip.new.3606/hplip.changes
Old:
----
hplip-3.18.6.tar.gz
hplip-3.18.6.tar.gz.asc
New:
----
Revert-changes-from-3.18.5-that-break-hp-setup-for-f.patch
hp-sendfax-avoid-crash-if-python-reportlab-is-missin.patch
hplip-3.19.12.tar.gz
hplip-3.19.12.tar.gz.asc
hplip-change-pgp-server.patch
hplip-orblite-return-null.diff
hplip-remove-imageprocessor.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hplip.spec ++++++
++++ 714 lines (skipped)
++++ between /work/SRC/openSUSE:Leap:15.2/hplip/hplip.spec
++++ and /work/SRC/openSUSE:Leap:15.2/.hplip.new.3606/hplip.spec
++++++ Revert-changes-from-3.18.5-that-break-hp-setup-for-f.patch ++++++
>From af8ddd502a88f8dc0910c2c9a91471be8434af61 Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck(a)suse.com>
Date: Mon, 13 Jan 2020 18:20:22 +0100
Subject: [PATCH] Revert changes from 3.18.5 that break hp-setup for fax
devices
See bsc#1107711, lp#1773320
https://launchpadlibrarian.net/371794274/hplip-use-binary-str.patch
Credits: Eric Schirra <ecsos(a)schirra.net>
---
base/utils.py | 5 +----
fax/pmlfax.py | 8 ++++----
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/base/utils.py b/base/utils.py
index f268cf8..cc77820 100644
--- a/base/utils.py
+++ b/base/utils.py
@@ -954,10 +954,7 @@ else:
def printable(s):
- if s:
- return s.translate(identity, unprintable)
- else:
- return ""
+ return s.translate(identity, unprintable)
def any(S,f=lambda x:x):
diff --git a/fax/pmlfax.py b/fax/pmlfax.py
index adcc1cb..b68ff6a 100644
--- a/fax/pmlfax.py
+++ b/fax/pmlfax.py
@@ -143,8 +143,8 @@ class PMLFaxDevice(FaxDevice):
def getPhoneNum(self):
if PY3:
- data = utils.printable(self.getPML(pml.OID_FAX_LOCAL_PHONE_NUM)[1])
- return data
+ data = utils.printable(self.getPML(pml.OID_FAX_LOCAL_PHONE_NUM)[1].encode('utf-8'))
+ return data.decode('utf-8')
else:
return utils.printable(self.getPML(pml.OID_FAX_LOCAL_PHONE_NUM)[1])
phone_num = property(getPhoneNum, setPhoneNum, doc="OID_FAX_LOCAL_PHONE_NUM")
@@ -155,8 +155,8 @@ class PMLFaxDevice(FaxDevice):
def getStationName(self):
if PY3:
- data = utils.printable(self.getPML(pml.OID_FAX_STATION_NAME)[1])
- return data
+ data = utils.printable(self.getPML(pml.OID_FAX_STATION_NAME)[1].encode('utf-8'))
+ return data.decode('utf-8')
else:
return utils.printable(self.getPML(pml.OID_FAX_STATION_NAME)[1])
--
2.24.1
++++++ hp-sendfax-avoid-crash-if-python-reportlab-is-missin.patch ++++++
>From 8b1bbbb9a3659475367a6f58986ac8248576663b Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck(a)suse.com>
Date: Fri, 10 Jan 2020 14:44:51 +0100
Subject: [PATCH] hp-sendfax: avoid crash if python-reportlab is missing
Avoids this crash:
warning: Reportlab not installed. Fax coverpages disabled.
warning: Please install version 2.0+ of Reportlab for coverpage support.
qt.qpa.xcb: QXcbConnection: XCB error: 3 (BadWindow), sequence: 669, resource id: 13465094, major code: 40 (TranslateCoords), minor code: 0
Traceback (most recent call last):
File "/usr/share/hplip/ui5/sendfaxdialog.py", line 375, in FilesTable_fileListChanged
self.toggleCoverPage(self.FilesTable.isMIMETypeInList(MIME_TYPE_COVERPAGE))
File "/usr/share/hplip/ui5/sendfaxdialog.py", line 328, in toggleCoverPage
---
ui5/sendfaxdialog.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/ui5/sendfaxdialog.py b/ui5/sendfaxdialog.py
index 4248907..3c3e880 100644
--- a/ui5/sendfaxdialog.py
+++ b/ui5/sendfaxdialog.py
@@ -325,9 +325,11 @@ class SendFaxDialog(QDialog, Ui_Dialog):
def toggleCoverPage(self, b):
# XXX: qt5port: disconnect method requires attention
- self.CoverPageGroupBox.toggled[bool].disconnect(self.CoverPageGroupBox_toggled)
+ if coverpages_enabled:
+ self.CoverPageGroupBox.toggled[bool].disconnect(self.CoverPageGroupBox_toggled)
self.CoverPageGroupBox.setChecked(b)
- self.CoverPageGroupBox.toggled[bool].connect(self.CoverPageGroupBox_toggled)
+ if coverpages_enabled:
+ self.CoverPageGroupBox.toggled[bool].connect(self.CoverPageGroupBox_toggled)
#
--
2.24.1
++++++ hplip-3.18.6.tar.gz -> hplip-3.19.12.tar.gz ++++++
/work/SRC/openSUSE:Leap:15.2/hplip/hplip-3.18.6.tar.gz /work/SRC/openSUSE:Leap:15.2/.hplip.new.3606/hplip-3.19.12.tar.gz differ: char 5, line 1
++++++ hplip-change-pgp-server.patch ++++++
Index: hplip-3.19.6/base/validation.py
===================================================================
--- hplip-3.19.6.orig/base/validation.py 2019-06-26 15:07:10.000000000 +0200
+++ hplip-3.19.6/base/validation.py 2019-10-16 09:53:51.966435988 +0200
@@ -42,7 +42,7 @@ class DigiSign_Verification(object):
class GPG_Verification(DigiSign_Verification):
- def __init__(self, pgp_site = 'pgp.mit.edu', key = 0x4ABA2F66DBD5A95894910E0673D770CDA59047B9):
+ def __init__(self, pgp_site = 'pool.sks-keyservers.net', key = 0x4ABA2F66DBD5A95894910E0673D770CDA59047B9):
self.__pgp_site = pgp_site
self.__key = key
self.__gpg = utils.which('gpg',True)
++++++ hplip-misc-missing-includes-and-definitions.patch ++++++
--- /var/tmp/diff_new_pack.bcDil0/_old 2020-05-29 18:49:02.852180355 +0200
+++ /var/tmp/diff_new_pack.bcDil0/_new 2020-05-29 18:49:02.852180355 +0200
@@ -1,19 +1,7 @@
-From 6dd5de8c21284530a7d9716b979812446cc4eb79 Mon Sep 17 00:00:00 2001
-From: Martin Wilck <mwilck(a)suse.com>
-Date: Wed, 21 Mar 2018 23:56:05 +0100
-Subject: [PATCH] hplip: misc missing #includes and definitions
-
----
- protocol/discovery/mdns.c | 1 +
- protocol/discovery/mdns.h | 1 +
- scan/sane/hpaio.c | 1 +
- scan/sane/http.c | 1 +
- 4 files changed, 4 insertions(+)
-
-Index: b/protocol/discovery/mdns.c
-===================================================================
---- a/protocol/discovery/mdns.c
-+++ b/protocol/discovery/mdns.c
+Only in hplip-3.18.12/: Makefile.am.orig
+diff -ur hplip-3.18.12-orig/protocol/discovery/mdns.c hplip-3.18.12/protocol/discovery/mdns.c
+--- hplip-3.18.12-orig/protocol/discovery/mdns.c 2018-12-08 14:56:48.794408994 +0100
++++ hplip-3.18.12/protocol/discovery/mdns.c 2018-12-08 14:56:28.785871912 +0100
@@ -37,6 +37,7 @@
#include <arpa/inet.h>
#include "mdns.h"
@@ -22,33 +10,32 @@
/* Convert "www.google.com" to "3www6google3com". */
static int mdns_convert_name_to_dns(const char *name, int name_size, char *dns_name)
-Index: b/protocol/discovery/mdns.h
-===================================================================
---- a/protocol/discovery/mdns.h
-+++ b/protocol/discovery/mdns.h
-@@ -100,5 +100,6 @@ static void mdns_parse_respponse(unsign
+diff -ur hplip-3.18.12-orig/protocol/discovery/mdns.h hplip-3.18.12/protocol/discovery/mdns.h
+--- hplip-3.18.12-orig/protocol/discovery/mdns.h 2018-12-03 08:08:49.000000000 +0100
++++ hplip-3.18.12/protocol/discovery/mdns.h 2018-12-08 14:56:28.785871912 +0100
+@@ -100,5 +100,6 @@
static void mdns_rr_cleanup(DNS_RECORD *rr);
static DNS_RECORD *mdns_read_responses(int udp_socket, int mode);
static unsigned char* mdns_readMDL(unsigned char *p, unsigned char *normalized_mdl, int len);
+int mdns_probe_nw_scanners(char* uris_buf, int buf_size, int *count);
#endif // _DISCOVERY_MDNS_H
-Index: b/scan/sane/hpaio.c
-===================================================================
---- a/scan/sane/hpaio.c
-+++ b/scan/sane/hpaio.c
-@@ -46,6 +46,7 @@
+diff -ur hplip-3.18.12-orig/scan/sane/hpaio.c hplip-3.18.12/scan/sane/hpaio.c
+--- hplip-3.18.12-orig/scan/sane/hpaio.c 2018-12-03 08:10:22.000000000 +0100
++++ hplip-3.18.12/scan/sane/hpaio.c 2018-12-08 14:58:23.952963358 +0100
+@@ -45,6 +45,7 @@
#include "sclpml.h"
#include "escl.h"
#include "io.h"
+#include "mdns.h"
+ #include "orblitei.h"
- #define DEBUG_DECLARE_ONLY
- #include "sanei_debug.h"
-Index: b/scan/sane/http.c
-===================================================================
---- a/scan/sane/http.c
-+++ b/scan/sane/http.c
+
+Only in hplip-3.18.12/scan/sane: hpaio.c.orig
+Only in hplip-3.18.12/scan/sane: hpaio.c.rej
+diff -ur hplip-3.18.12-orig/scan/sane/http.c hplip-3.18.12/scan/sane/http.c
+--- hplip-3.18.12-orig/scan/sane/http.c 2018-12-03 08:10:22.000000000 +0100
++++ hplip-3.18.12/scan/sane/http.c 2018-12-08 14:56:28.789872019 +0100
@@ -33,6 +33,7 @@
#include <stdio.h>
++++++ hplip-orblite-return-null.diff ++++++
diff -ur hplip-3.19.3-orig/scan/sane/orblite.c hplip-3.19.3/scan/sane/orblite.c
--- hplip-3.19.3-orig/scan/sane/orblite.c 2019-03-14 10:28:56.000000000 +0100
+++ hplip-3.19.3/scan/sane/orblite.c 2019-04-12 18:59:07.734202665 +0200
@@ -331,6 +331,7 @@
return &g_handle->Options[option];
}
//return g_handle->bb_orblite_get_option_descriptor(g_handle, option);
+ return NULL;
}
++++++ hplip-remove-imageprocessor.diff ++++++
>From fa9c0cf1a5db9bf8880b4796d5e3e0da46534e3d Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx(a)debian.org>
Date: Tue, 21 Aug 2018 18:18:10 +0200
Subject: Remove all ImageProcessor functionality, which is closed-source
---
Makefile.am | 14 ++------------
prnt/hpcups/HPCupsFilter.cpp | 21 ---------------------
2 files changed, 2 insertions(+), 33 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 1b097c4f9..8d5d78c9f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -166,7 +166,7 @@ if !HPLIP_CLASS_DRIVER
dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py
endif #HPLIP_CLASS_DRIVER
-dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template prnt/hpcups/libImageProcessor-x86_64.so prnt/hpcups/libImageProcessor-x86_32.so
+dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template
dist_noinst_SCRIPTS += dat2drv.py install.py hplip-install init-suse-firewall init-iptables-firewall class_rpm_build.sh hplipclassdriver.spec createPPD.sh Makefile_dat2drv hpijs-drv
if !HPLIP_CLASS_DRIVER
@@ -594,7 +594,7 @@ hpcups_SOURCES = prnt/hpcups/HPCupsFilter.cpp prnt/hpcups/HPCupsFilter.h prnt/hp
prnt/hpcups/ImageProcessor.h
hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)
-hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lImageProcessor -lcups -lcupsimage -lz $(DBUS_LIBS)
+hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lcups -lcupsimage -lz $(DBUS_LIBS)
#else
#hpcupsdir = $(cupsfilterdir)
#hpcups_PROGRAMS = hpcups
@@ -686,16 +686,6 @@ endif #HPLIP_CLASS_DRIVER
install-data-hook:
if HPLIP_BUILD
- if [ \( "$(UNAME)" = "x86_64" -a -d "$(libdir)/" \) ]; then \
- cp prnt/hpcups/libImageProcessor-x86_64.so $(libdir)/ ; \
- chmod 775 $(libdir)/libImageProcessor-x86_64.so ; \
- ln -sf $(libdir)/libImageProcessor-x86_64.so $(libdir)/libImageProcessor.so ; \
- fi; \
- if [ \( \( "$(UNAME)" = "i686" -o "$(UNAME)" = "i386" \) -a -d "$(libdir)/" \) ]; then \
- cp prnt/hpcups/libImageProcessor-x86_32.so $(libdir)/ ; \
- chmod 775 $(libdir)/libImageProcessor-x86_32.so ; \
- ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \
- fi
if !HPLIP_CLASS_DRIVER
# If scanner build, add hpaio entry to sane dll.conf.
if [ "$(scan_build)" = "yes" ]; then \
diff --git a/prnt/hpcups/HPCupsFilter.cpp b/prnt/hpcups/HPCupsFilter.cpp
index 5b282d83f..0bacfafac 100644
--- a/prnt/hpcups/HPCupsFilter.cpp
+++ b/prnt/hpcups/HPCupsFilter.cpp
@@ -31,7 +31,6 @@
\*****************************************************************************/
#include "HPCupsFilter.h"
-#include "ImageProcessor.h"
#include <signal.h>
#include <sys/wait.h>
@@ -637,16 +636,10 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
sprintf(hpPreProcessedRasterFile, "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name);
- image_processor_t* imageProcessor = imageProcessorCreate();
while (cupsRasterReadHeader2(cups_raster, &cups_header))
{
- IMAGE_PROCESSOR_ERROR result = imageProcessorStartPage(imageProcessor, &cups_header);
- if (result != IPE_SUCCESS){
- dbglog("DEBUG: imageProcessorStartPage failed result = %d\n", result);
- }
-
current_page_number++;
if (current_page_number == 1) {
@@ -745,12 +738,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
color_raster = rgbRaster;
black_raster = kRaster;
- result = imageProcessorProcessLine(imageProcessor, m_pPrinterBuffer, cups_header.cupsBytesPerLine);
- if (result != IPE_SUCCESS){
- dbglog("DEBUG: imageProcessorProcessLine failed result = %d\n", result);
- }
-
-
if ((y == 0) && !is_ljmono) {
//For ljmono, make sure that first line is not a blankRaster line.Otherwise printer
//may not skip blank lines before actual data
@@ -780,12 +767,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
}
} // for() loop end
- result = imageProcessorEndPage(imageProcessor);
- if (result != IPE_SUCCESS){
- dbglog("DEBUG: imageProcessorEndPage failed result = %d\n", result);
- }
-
-
m_Job.NewPage();
if (err != NO_ERROR) {
break;
@@ -800,8 +781,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
rgbRaster = NULL;
}
- imageProcessorDestroy(imageProcessor);
-
unlink(hpPreProcessedRasterFile);
return ret_status;
}
1
0
Hello community,
here is the log from the commit of package 00Meta for openSUSE:Leap:15.2:ARM:Images checked in at 2020-05-29 18:46:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2:ARM:Images/00Meta (Old)
and /work/SRC/openSUSE:Leap:15.2:ARM:Images/.00Meta.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "00Meta"
Fri May 29 18:46:05 2020 rev:91 rq: version:unknown
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ version_snapshot ++++++
--- /var/tmp/diff_new_pack.l5L7aJ/_old 2020-05-29 18:46:06.271172224 +0200
+++ /var/tmp/diff_new_pack.l5L7aJ/_new 2020-05-29 18:46:06.271172224 +0200
@@ -1 +1 @@
-1.27
\ No newline at end of file
+1.34
\ No newline at end of file
1
0
Hello community,
here is the log from the commit of package python-boto for openSUSE:Leap:15.1:Update checked in at 2020-05-29 18:15:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.1:Update/python-boto (Old)
and /work/SRC/openSUSE:Leap:15.1:Update/.python-boto.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-boto"
Fri May 29 18:15:19 2020 rev:2 rq:809074 version:unknown
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ _link ++++++
--- /var/tmp/diff_new_pack.zlJcAr/_old 2020-05-29 18:15:19.522236411 +0200
+++ /var/tmp/diff_new_pack.zlJcAr/_new 2020-05-29 18:15:19.526236422 +0200
@@ -1 +1 @@
-<link package='python-boto.12507' cicount='copy' />
+<link package='python-boto.12739' cicount='copy' />
1
0