Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mariadb for openSUSE:Factory checked in at 2021-09-20 23:31:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mariadb (Old) and /work/SRC/openSUSE:Factory/.mariadb.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mariadb" Mon Sep 20 23:31:44 2021 rev:112 rq:918741 version:10.6.4 Changes: -------- --- /work/SRC/openSUSE:Factory/mariadb/mariadb.changes 2021-08-24 10:54:27.356354079 +0200 +++ /work/SRC/openSUSE:Factory/.mariadb.new.1899/mariadb.changes 2021-09-20 23:31:49.427075036 +0200 @@ -1,0 +2,22 @@ +Mon Sep 6 08:35:07 UTC 2021 - Danilo Spinella <danilo.spine...@suse.com> + +- Update to 10.6.4 + * release notes and changelog: + https://mariadb.com/kb/en/library/mariadb-1064-release-notes + https://mariadb.com/kb/en/library/mariadb-1064-changelog + https://mariadb.com/kb/en/library/mariadb-1063-release-notes + https://mariadb.com/kb/en/library/mariadb-1063-changelog + https://mariadb.com/kb/en/library/mariadb-1062-release-notes + https://mariadb.com/kb/en/library/mariadb-1062-changelog + https://mariadb.com/kb/en/library/mariadb-1061-release-notes + https://mariadb.com/kb/en/library/mariadb-1061-changelog + https://mariadb.com/kb/en/library/mariadb-1060-release-notes + https://mariadb.com/kb/en/library/mariadb-1060-changelog + * fixes for the following security vulnerabilities: + 10.6.4: CVE-2021-2372 + CVE-2021-2389 +- Removed support to tokudb as it has been removed from upstream +- Refresh mariadb-10.2.4-fortify-and-O.patch +- Add new systemd socket from upstream + +------------------------------------------------------------------- Old: ---- mariadb-10.5.10.tar.gz mariadb-10.5.10.tar.gz.asc New: ---- mariadb-10.6.4.tar.gz mariadb-10.6.4.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mariadb.spec ++++++ --- /var/tmp/diff_new_pack.HOf0n8/_old 2021-09-20 23:31:50.667076568 +0200 +++ /var/tmp/diff_new_pack.HOf0n8/_new 2021-09-20 23:31:50.667076568 +0200 @@ -26,12 +26,6 @@ # ignore failures %define ignore_testsuite_result 0 %define with_oqgraph 1 -# TokuDB engine is available only for x86_64 architecture -# see https://mariadb.com/kb/en/mariadb/tokudb/ -# Temporarily stop to build it as jemalloc 5 is not backwards compatible -# and a build without jemalloc is not supported upstream (MDEV-15034) -# Also we can't use PerconaFT (AGPL licence) that is needed for tokudb -%define with_tokudb 0 # Mroonga and RocksDB are available only for x86_64 architecture # see https://mariadb.com/kb/en/mariadb/about-mroonga/ and # https://mariadb.com/kb/en/library/myrocks-supported-platforms/ @@ -56,7 +50,7 @@ # Build with cracklib plugin when cracklib-dict-full >= 2.9.0 is available %define with_cracklib_plugin 0 Name: mariadb -Version: 10.5.10 +Version: 10.6.4 Release: 0 Summary: Server part of MariaDB License: SUSE-GPL-2.0-with-FLOSS-exception @@ -190,9 +184,6 @@ BuildRequires: boost-devel %endif %endif -%if 0%{with_tokudb} > 0 -BuildRequires: jemalloc-devel -%endif %description MariaDB is an open-source, multi-threaded, relational database management @@ -402,12 +393,6 @@ # tests created by upstream cat %{SOURCE50} | tee -a mysql-test/unstable-tests -# Remove python scripts remains from tokudb upstream (those files are not used anyway) -rm -r storage/tokudb/mysql-test/tokudb/t/*.py - -# Remove PerconaFT from the package because it has AGPL licence [bsc#1118754] -rm -rf storage/tokudb/PerconaFT - %build %global _lto_cflags %{_lto_cflags} -ffat-lto-objects EXTRA_FLAGS="-Wno-unused-but-set-variable -fno-strict-aliasing -Wno-unused-parameter" @@ -440,9 +425,6 @@ %if 0%{with_oqgraph} < 1 -DPLUGIN_OQGRAPH=NO \ %endif -%if 0%{with_tokudb} < 1 - -DPLUGIN_TOKUDB=NO \ -%endif %if 0%{with_mroonga} < 1 -DPLUGIN_MROONGA=NO \ %endif @@ -603,6 +585,8 @@ rm %{buildroot}%{_mandir}/man1/mysql_config*.1* rm %{buildroot}%{_mandir}/man1/mytop.1* rm -r %{buildroot}%{_includedir}/mysql +# Devel man pages +rm -rf %{buildroot}%{_mandir}/man3/* # Rename the wsrep README so it corresponds with the other README names cp Docs/README-wsrep Docs/README.wsrep @@ -747,6 +731,8 @@ %if 0%{run_testsuite} > 0 cd mysql-test +# spider test have been enabled in 10.6 and they fail, skip these tests +# mariadb-client cannot connect to the server due to self-signed certificates ./mysql-test-run.pl \ --parallel=%{?jobs:%{jobs}} \ --force \ @@ -761,6 +747,7 @@ %if 0%{ignore_testsuite_result} > 0 || : %else + --skip-test=spider \ --skip-test-list=unstable-tests %endif %endif @@ -869,6 +856,10 @@ %{_unitdir}/mariadb.target %{_unitdir}/mysql.service %{_unitdir}/mysql@.service +%{_unitdir}/mariadb-extra.socket +%{_unitdir}/mariadb-extra@.socket +%{_unitdir}/mariadb.socket +%{_unitdir}/mariadb@.socket %{_tmpfilesdir}/mariadb.conf %{_sbindir}/rcmysql %{_sbindir}/rcmariadb @@ -910,6 +901,8 @@ %dir %{_datadir}/mysql/systemd %{_datadir}/mysql/systemd/mariadb.service %{_datadir}/mysql/systemd/mariadb@.service +%{_datadir}/mysql/systemd/mariadb-extra@.socket +%{_datadir}/mysql/systemd/mariadb@.socket %files rpm-macros %dir %{_rpmconfigdir}/macros.d ++++++ mariadb-10.2.4-fortify-and-O.patch ++++++ --- /var/tmp/diff_new_pack.HOf0n8/_old 2021-09-20 23:31:50.755076676 +0200 +++ /var/tmp/diff_new_pack.HOf0n8/_new 2021-09-20 23:31:50.759076682 +0200 @@ -17,66 +17,3 @@ ENDIF() INCLUDE(wsrep) -Index: storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake -=================================================================== ---- storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake.orig -+++ storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake -@@ -26,11 +26,9 @@ endif () - if (CMAKE_VERSION VERSION_LESS 3.0) - set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DEBUG TOKU_PTHREAD_DEBUG=1 TOKU_DEBUG_TXN_SYNC=1) - set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DRD TOKU_PTHREAD_DEBUG=1 TOKU_DEBUG_TXN_SYNC=1) -- set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DRD _FORTIFY_SOURCE=2) - else () - set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS - $<$<OR:$<CONFIG:DEBUG>,$<CONFIG:DRD>>:TOKU_PTHREAD_DEBUG=1 TOKU_DEBUG_TXN_SYNC=1> -- $<$<CONFIG:DRD>:_FORTIFY_SOURCE=2> - ) - endif () - -@@ -93,23 +91,23 @@ endif () - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions") - - ## set extra debugging flags and preprocessor definitions --set(CMAKE_C_FLAGS_DEBUG "-g3 -O0 ${CMAKE_C_FLAGS_DEBUG}") --set(CMAKE_CXX_FLAGS_DEBUG "-g3 -O0 ${CMAKE_CXX_FLAGS_DEBUG}") -+set(CMAKE_C_FLAGS_DEBUG "-g3 ${CMAKE_C_FLAGS_DEBUG}") -+set(CMAKE_CXX_FLAGS_DEBUG "-g3 ${CMAKE_CXX_FLAGS_DEBUG}") - - ## flags to use when we want to run DRD on the resulting binaries - ## DRD needs debugging symbols. - ## -O0 makes it too slow, and -O2 inlines too much for our suppressions to work. -O1 is just right. --set(CMAKE_C_FLAGS_DRD "-g3 -O1 ${CMAKE_C_FLAGS_DRD}") --set(CMAKE_CXX_FLAGS_DRD "-g3 -O1 ${CMAKE_CXX_FLAGS_DRD}") -+set(CMAKE_C_FLAGS_DRD "-g3 ${CMAKE_C_FLAGS_DRD}") -+set(CMAKE_CXX_FLAGS_DRD "-g3 ${CMAKE_CXX_FLAGS_DRD}") - - ## set extra release flags - ## need to set flags for RelWithDebInfo as well because we want the MySQL/MariaDB builds to use them - if (CMAKE_CXX_COMPILER_ID STREQUAL Clang) - # have tried -flto and -O4, both make our statically linked executables break apple's linker -- set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -g -O3 -UNDEBUG") -- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g -O3 -UNDEBUG") -- set(CMAKE_C_FLAGS_RELEASE "-g -O3 ${CMAKE_C_FLAGS_RELEASE} -UNDEBUG") -- set(CMAKE_CXX_FLAGS_RELEASE "-g -O3 ${CMAKE_CXX_FLAGS_RELEASE} -UNDEBUG") -+ set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -g -UNDEBUG") -+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g -UNDEBUG") -+ set(CMAKE_C_FLAGS_RELEASE "-g ${CMAKE_C_FLAGS_RELEASE} -UNDEBUG") -+ set(CMAKE_CXX_FLAGS_RELEASE "-g ${CMAKE_CXX_FLAGS_RELEASE} -UNDEBUG") - else () - if (APPLE) - set(FLTO_OPTS "-fwhole-program") -@@ -117,10 +115,10 @@ else () - set(FLTO_OPTS "-fuse-linker-plugin") - endif() - # we overwrite this because the default passes -DNDEBUG and we don't want that -- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-flto ${FLTO_OPTS} ${CMAKE_C_FLAGS_RELWITHDEBINFO} -g -O3 -UNDEBUG") -- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-flto ${FLTO_OPTS} ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g -O3 -UNDEBUG") -- set(CMAKE_C_FLAGS_RELEASE "-g -O3 -flto ${FLTO_OPTS} ${CMAKE_C_FLAGS_RELEASE} -UNDEBUG") -- set(CMAKE_CXX_FLAGS_RELEASE "-g -O3 -flto ${FLTO_OPTS} ${CMAKE_CXX_FLAGS_RELEASE} -UNDEBUG") -+ set(CMAKE_C_FLAGS_RELWITHDEBINFO "-flto ${FLTO_OPTS} ${CMAKE_C_FLAGS_RELWITHDEBINFO} -g -UNDEBUG") -+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-flto ${FLTO_OPTS} ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g -UNDEBUG") -+ set(CMAKE_C_FLAGS_RELEASE "-g -flto ${FLTO_OPTS} ${CMAKE_C_FLAGS_RELEASE} -UNDEBUG") -+ set(CMAKE_CXX_FLAGS_RELEASE "-g -flto ${FLTO_OPTS} ${CMAKE_CXX_FLAGS_RELEASE} -UNDEBUG") - set(CMAKE_EXE_LINKER_FLAGS "-g ${FLTO_OPTS} ${CMAKE_EXE_LINKER_FLAGS}") - set(CMAKE_SHARED_LINKER_FLAGS "-g ${FLTO_OPTS} ${CMAKE_SHARED_LINKER_FLAGS}") - endif () ++++++ mariadb-10.5.10.tar.gz -> mariadb-10.6.4.tar.gz ++++++ /work/SRC/openSUSE:Factory/mariadb/mariadb-10.5.10.tar.gz /work/SRC/openSUSE:Factory/.mariadb.new.1899/mariadb-10.6.4.tar.gz differ: char 5, line 1