Accepting request 917536 from home:dspinella:branches:server:database

- 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 manpages to dev package - Add new systemd socket from upstream OBS-URL: https://build.opensuse.org/request/show/917536 OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=276
2021-09-08 10:14:57 +00:00 · 2021-09-08 10:14:57 +00:00 · 283f67041a
commit 283f67041a
parent be229450d6
7 changed files with 43 additions and 91 deletions
--- a/mariadb-10.2.4-fortify-and-O.patch
+++ b/mariadb-10.2.4-fortify-and-O.patch
@ -17,66 +17,3 @@ Index: CMakeLists.txt
 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 ()
--- a/mariadb-10.5.10.tar.gz
+++ b/mariadb-10.5.10.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a5ff32f9fcaaf26bf5cba94accc7b246d2d5eb75710d027e40122df6bac0babb
-size 99019617
--- a/mariadb-10.5.10.tar.gz.asc
+++ b/mariadb-10.5.10.tar.gz.asc
@ -1,6 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iF0EABECAB0WIQQZk2nlQEvV/H0v5DvLywgqG7lD2wUCYJRvoQAKCRDLywgqG7lD
-23CBAJ0ZDLtwXvUvR4vYwrryNXMeTte/gQCgydybdIn2u3C+rvs9PLmUK0+jTc4=
-=my3Y
-----END PGP SIGNATURE-----
--- a/mariadb-10.6.4.tar.gz
+++ b/mariadb-10.6.4.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:75bf9b147a95d38160d01a73b098d50a1960563b46d16a235971fff64d99643c
+size 84947143
--- a/mariadb-10.6.4.tar.gz.asc
+++ b/mariadb-10.6.4.tar.gz.asc
@ -0,0 +1,6 @@
+-----BEGIN PGP SIGNATURE-----
+
+iF0EABECAB0WIQQZk2nlQEvV/H0v5DvLywgqG7lD2wUCYQopBAAKCRDLywgqG7lD
+24bAAKCqBjQZ7Flzd3ouZq/qRiRWRPTp9wCgt+9X7OjhIUqmEEN3ZLmcEXzwaXU=
+=MnrN
+-----END PGP SIGNATURE-----
--- a/mariadb.changes
+++ b/mariadb.changes
@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Mon Sep  6 08:35:07 UTC 2021 - Danilo Spinella <danilo.spinella@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 manpages to dev package
+- Add new systemd socket from upstream
+
 -------------------------------------------------------------------
 Fri Aug 20 07:32:45 UTC 2021 - Martin Liška <mliska@suse.cz>

--- a/mariadb.spec
+++ b/mariadb.spec
@ -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:  libboost_headers-devel
 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 @@ done
 # 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 @@ export CXXFLAGS="$CFLAGS -felide-constructors"
 %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
@ -747,6 +729,8 @@ cd build

 %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 +745,7 @@ cd mysql-test
 %if 0%{ignore_testsuite_result} > 0
    || :
 %else
+    --skip-test=spider \
    --skip-test-list=unstable-tests
 %endif
 %endif
@ -869,6 +854,10 @@ exit 0
 %{_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 +899,8 @@ exit 0
 %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
@ -921,6 +912,7 @@ exit 0
 %files -n libmariadbd-devel
 %{_libdir}/libmysqld.so
 %{_libdir}/libmariadbd.so
+%{_mandir}/man3/*

 %files client -f mariadb-client.files
 %dir %{_libdir}/mysql