Accepting request 842600 from home:marec2000:branches:server:database

- update to 10.5.6 * release notes and changelog https://mariadb.com/kb/en/mariadb-1056-release-notes https://mariadb.com/kb/en/mariadb-1056-changelog - refresh mariadb-10.2.19-link-and-enable-c++11-atomics.patch - drop mariadb-10.5-fix-prevent-optimizing-out-buf-argument-in-ch.patch - mariadb now builds against pcre2 - added binaries aria_s3_copy and mariadb-conv to tools subpackage - added type_test.type_test_double to list of skipped tests OBS-URL: https://build.opensuse.org/request/show/842600 OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=260
2020-10-21 22:25:44 +00:00 · 2020-10-21 22:25:44 +00:00 · 71b7d6d6a4
commit 71b7d6d6a4
parent b62a06fa4f
9 changed files with 129 additions and 151 deletions
--- a/mariadb-10.2.19-link-and-enable-c++11-atomics.patch
+++ b/mariadb-10.2.19-link-and-enable-c++11-atomics.patch
@ -38,8 +38,8 @@ Date:   Fri Dec 21 19:14:04 2018 +0200
   SET(HAVE_valgrind 1)
 --- a/mysys/CMakeLists.txt
 +++ b/mysys/CMakeLists.txt
-@@ -78,6 +78,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings
-  ${LIBNSL} ${LIBM} ${LIBRT} ${LIBDL} ${LIBSOCKET} ${LIBEXECINFO} ${CRC32_LIBRARY})
+@@ -130,6 +130,10 @@
+  ${LIBNSL} ${LIBM} ${LIBRT} ${LIBDL} ${LIBSOCKET} ${LIBEXECINFO})
 DTRACE_INSTRUMENT(mysys)
 
 +IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
@ -51,7 +51,7 @@ Date:   Fri Dec 21 19:14:04 2018 +0200
 ENDIF(HAVE_BFD_H)
 --- a/sql/CMakeLists.txt
 +++ b/sql/CMakeLists.txt
-@@ -178,6 +178,10 @@ ELSE()
+@@ -215,6 +215,10 @@
   SET(MYSQLD_SOURCE main.cc ${DTRACE_PROBES_ALL})
 ENDIF()
 
@ -59,6 +59,6 @@ Date:   Fri Dec 21 19:14:04 2018 +0200
 +  TARGET_LINK_LIBRARIES(sql atomic)
 +ENDIF()
 +
- 
- IF(MSVC AND NOT WITHOUT_DYNAMIC_PLUGINS)
-
+ IF(MSVC)
+   SET(libs_to_export_symbols sql mysys dbug strings)
+   # Create shared library of already compiled object
--- a/mariadb-10.4.14.tar.gz
+++ b/mariadb-10.4.14.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f92fcd59e0122461482f28c67c5ea01c7cf6979494a571db68074396864c86fc
-size 80789865
--- a/mariadb-10.4.14.tar.gz.sig
+++ b/mariadb-10.4.14.tar.gz.sig
@ -1,6 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iF0EABECAB0WIQQZk2nlQEvV/H0v5DvLywgqG7lD2wUCXy2clQAKCRDLywgqG7lD
-2+m7AJ9R9x3CftzhU4Pnco28oFMhYpV9IgCg5QWuTZ5EzhSu20eIpo7LO2lxJkU=
-=WF1y
-----END PGP SIGNATURE-----
--- a/mariadb-10.5-fix-prevent-optimizing-out-buf-argument-in-ch.patch
+++ b/mariadb-10.5-fix-prevent-optimizing-out-buf-argument-in-ch.patch
@ -1,40 +0,0 @@
-From 35c277851972267d4d020126ab8f893c4b17dd36 Mon Sep 17 00:00:00 2001
-From: Martin Liska <mliska@suse.cz>
-Date: Sun, 8 Dec 2019 10:52:27 +0100
-Subject: [PATCH] MDEV-21248: Prevent optimizing out buf argument in
- check_stack_overrun.
-
-When using LTO, one can see optimization of stack variables that
-are passed to check_stack_overrun as argument buf. That prevents
-proper stack overrun detection.
---
- sql/sql_parse.cc | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
-index dc81e8a2b91..6f3c076709a 100644
--- a/sql/sql_parse.cc
-+++ b/sql/sql_parse.cc
-@@ -7392,8 +7392,17 @@ long max_stack_used;
-     corresponding exec. (Thus we only have to check in fix_fields.)
-   - Passing to check_stack_overrun() prevents the compiler from removing it.
- */
-bool check_stack_overrun(THD *thd, long margin,
-			 uchar *buf __attribute__((unused)))
-+
-+bool
-+#ifdef __GNUC__
-+/*
-+  Do not optimize the function in order to preserve a stack variable creation.
-+  Otherwise, the variable pointed as "buf" can be removed due to a missing
-+  usage.
-+ */
-+__attribute__((optimize("-O0")))
-+#endif
-+check_stack_overrun(THD *thd, long margin, uchar *buf __attribute__((unused)))
- {
-   long stack_used;
-   DBUG_ASSERT(thd == current_thd);
-- 
-2.25.1
-
--- a/mariadb-10.5.6.tar.gz
+++ b/mariadb-10.5.6.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ff05dd69e9f6992caf1053242db704f04eda6f9accbcc98b74edfaf6013c45c4
+size 86884252
--- a/mariadb-10.5.6.tar.gz.sig
+++ b/mariadb-10.5.6.tar.gz.sig
@ -0,0 +1,6 @@
+-----BEGIN PGP SIGNATURE-----
+
+iF0EABECAB0WIQQZk2nlQEvV/H0v5DvLywgqG7lD2wUCX3z1MQAKCRDLywgqG7lD
+266xAKDyp0zIylMDdluhOtlbmS0BLwefxwCfciErEKwqXuBp8DzVD5EMVVRPqYg=
+=5CGr
+-----END PGP SIGNATURE-----
--- a/mariadb.changes
+++ b/mariadb.changes
@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Oct 19 12:11:14 UTC 2020 - marec@detebe.org
+
+- update to 10.5.6
+  * release notes and changelog
+    https://mariadb.com/kb/en/mariadb-1056-release-notes
+    https://mariadb.com/kb/en/mariadb-1056-changelog
+- refresh mariadb-10.2.19-link-and-enable-c++11-atomics.patch
+- drop mariadb-10.5-fix-prevent-optimizing-out-buf-argument-in-ch.patch
+- mariadb now builds against pcre2
+- added binaries aria_s3_copy and mariadb-conv to tools subpackage
+- added type_test.type_test_double to list of skipped tests
+
 -------------------------------------------------------------------
 Tue Sep  1 15:44:02 UTC 2020 - Cristian Rodríguez <crrodriguez@opensuse.org>

--- a/mariadb.spec
+++ b/mariadb.spec
@ -56,7 +56,7 @@
 # Build with cracklib plugin when cracklib-dict-full >= 2.9.0 is available
 %define with_cracklib_plugin 0
 Name:           mariadb
-Version:        10.4.14
+Version:        10.5.6
 Release:        0
 Summary:        Server part of MariaDB
 License:        SUSE-GPL-2.0-with-FLOSS-exception
@ -84,7 +84,6 @@ Patch4:         mariadb-10.2.4-fortify-and-O.patch
 Patch5:         mariadb-10.2.19-link-and-enable-c++11-atomics.patch
 Patch6:         mariadb-10.4.12-harden_setuid.patch
 Patch7:         mariadb-10.4.12-fix-install-db.patch
-Patch8:         mariadb-10.5-fix-prevent-optimizing-out-buf-argument-in-ch.patch
 # needed for bison SQL parser and wsrep API
 BuildRequires:  bison
 BuildRequires:  cmake
@ -111,7 +110,7 @@ BuildRequires:  pam-devel
 # MariaDB requires a specific version of pcre. Provide MariaDB with
 # "BuildRequires: pcre-devel" and it automatically decides if the version is
 # ok or not. If not, it uses bundled pcre.
-BuildRequires:  pcre-devel
+BuildRequires:  pcre2-devel
 BuildRequires:  pkgconfig
 BuildRequires:  procps
 # Some tests and myrocks_hotbackup script need python3
@ -373,7 +372,6 @@ find . -name "*.jar" -type f -exec rm --verbose -f {} \;
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1

 cp %{_sourcedir}/suse-test-run .

@ -542,6 +540,10 @@ rm -f %{buildroot}%{_datadir}/mysql/magic
 # Upstream ships them because of MDEV-10797 (we don't need them as we use our own systemd scripts)
 rm -f %{buildroot}%{_datadir}/mysql/mysql.server
 rm -f %{buildroot}%{_datadir}/mysql/mysqld_multi.server
+# upstream installs links for mysql
+unlink %{buildroot}%{_datadir}/mysql/systemd/mysql.service
+unlink %{buildroot}%{_datadir}/mysql/systemd/mysqld.service
+unlink %{buildroot}%{_unitdir}/mysqld.service
 # The old fork of mytop utility (we ship it as a separate package)
 rm -f %{buildroot}%{_bindir}/mytop
 # xtrabackup is not supported for MariaDB >= 10.3
@ -571,7 +573,9 @@ rm %{buildroot}%{_libdir}/pkgconfig/mariadb.pc
 rm -f %{buildroot}%{_prefix}/lib/pkgconfig/libmariadb.pc
 rm -f %{buildroot}%{_libdir}/pkgconfig/libmariadb.pc
 rm %{buildroot}%{_datadir}/aclocal/mysql.m4
+rm %{buildroot}%{_mandir}/man1/mariadb_config*.1*
 rm %{buildroot}%{_mandir}/man1/mysql_config*.1*
+rm %{buildroot}%{_mandir}/man1/mytop.1*
 rm -r %{buildroot}%{_includedir}/mysql

 # Rename the wsrep README so it corresponds with the other README names
@ -603,7 +607,7 @@ filelist mysqlslap mariadb-slap >mariadb-bench.files
 filelist mysql_client_test mariadb-client-test mysql_client_test_embedded mariadb-client-test-embedded mysql_waitpid mariadb-waitpid mysqltest mariadb-test mysqltest_embedded mariadb-test-embedded >mariadb-test.files

 # mariadb-tools.files
-filelist msql2mysql mysql_plugin mariadb-plugin mysql_convert_table_format mariadb-convert-table-format mysql_find_rows mariadb-find-rows mysql_setpermission mariadb-setpermission mysql_tzinfo_to_sql mariadb-tzinfo-to-sql mysqlaccess mariadb-access mysqlhotcopy mariadb-hotcopy perror replace mysql_embedded mariadb-embedded >mariadb-tools.files
+filelist msql2mysql mysql_plugin mariadb-plugin mysql_convert_table_format mariadb-convert-table-format mysql_find_rows mariadb-find-rows mysql_setpermission mariadb-setpermission mysql_tzinfo_to_sql mariadb-tzinfo-to-sql mysqlaccess mariadb-access mysqlhotcopy mariadb-hotcopy perror replace mysql_embedded mariadb-embedded aria_s3_copy mariadb-conv >mariadb-tools.files

 # All configuration files
 echo '%{_datadir}/mysql/*.cnf' >> mariadb.files
@ -913,7 +917,7 @@ exit 0
 %{_mandir}/man1/mysql-stress-test.pl.1%{?ext_man}
 %{_datadir}/mysql-test/valgrind.supp
 %dir %attr(755, mysql, mysql) %{_datadir}/mysql-test
-%{_datadir}/mysql-test/[^v]*
+%attr(-, mysql, mysql) %{_datadir}/mysql-test/[^v]*
 %dir %attr(755, mysql, mysql) %{_datadir}/mysql-test%{_localstatedir}

 %files tools -f mariadb-tools.files
--- a/suse_skipped_tests.list
+++ b/suse_skipped_tests.list
@ -47,3 +47,4 @@ sys_vars.tcp_nodelay                             : since 10.4.10 - all
 oqgraph.social                                   : since 10.4.12 - i586 (MDEV-22280)
 main.symlink-myisam-11902                        : since 10.4.13 - i586
 main.ssl_system_ca                               : since 10.4.14 - all
+type_test.type_test_double                       : since 10.5.6 - all