Accepting request 849241 from home:kstreitova:branches:server:database

- Update to 10.5.8 * release notes and changelog: https://mariadb.com/kb/en/library/mariadb-1058-release-notes https://mariadb.com/kb/en/library/mariadb-1058-changelog * fixes for the following security vulnerabilities: 10.5.7: CVE-2020-14812, CVE-2020-14765, CVE-2020-14776, CVE-2020-14789 10.5.8: none - tracker bugs: [bsc#1177472] and [bsc#1178428] - refresh mariadb-10.2.19-link-and-enable-c++11-atomics.patch - update suse_skipped_tests.list * fixes for the following security vulnerabilities: 10.5.6: CVE-2020-15180 < 10.5.6: none OBS-URL: https://build.opensuse.org/request/show/849241 OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=261
2020-11-18 09:22:33 +00:00 · 2020-11-18 09:22:33 +00:00 · a5a87c1e70
commit a5a87c1e70
parent 71b7d6d6a4
8 changed files with 66 additions and 20 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
@ -7,9 +7,11 @@ Date:   Fri Dec 21 19:14:04 2018 +0200
   atomic operations. Check first if support is available without
   linking, otherwise use the library.

--- a/configure.cmake
-+++ b/configure.cmake
-@@ -926,7 +926,25 @@ int main()
+Index: mariadb-10.5.8/configure.cmake
+===================================================================
+--- mariadb-10.5.8.orig/configure.cmake
+++ mariadb-10.5.8/configure.cmake
+@@ -861,7 +861,25 @@ int main()
   long long int *ptr= &var;
   return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
 }"
@ -36,10 +38,12 @@ Date:   Fri Dec 21 19:14:04 2018 +0200
 
 IF(WITH_VALGRIND)
   SET(HAVE_valgrind 1)
--- a/mysys/CMakeLists.txt
-+++ b/mysys/CMakeLists.txt
-@@ -130,6 +130,10 @@
-  ${LIBNSL} ${LIBM} ${LIBRT} ${LIBDL} ${LIBSOCKET} ${LIBEXECINFO})
+Index: mariadb-10.5.8/mysys/CMakeLists.txt
+===================================================================
+--- mariadb-10.5.8.orig/mysys/CMakeLists.txt
+++ mariadb-10.5.8/mysys/CMakeLists.txt
+@@ -140,6 +140,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings
+  ${LIBNSL} ${LIBM} ${LIBRT} ${CMAKE_DL_LIBS} ${LIBSOCKET} ${LIBEXECINFO})
 DTRACE_INSTRUMENT(mysys)
 
 +IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
@ -49,9 +53,11 @@ Date:   Fri Dec 21 19:14:04 2018 +0200
 IF(HAVE_BFD_H)
   TARGET_LINK_LIBRARIES(mysys bfd)  
 ENDIF(HAVE_BFD_H)
--- a/sql/CMakeLists.txt
-+++ b/sql/CMakeLists.txt
-@@ -215,6 +215,10 @@
+Index: mariadb-10.5.8/sql/CMakeLists.txt
+===================================================================
+--- mariadb-10.5.8.orig/sql/CMakeLists.txt
+++ mariadb-10.5.8/sql/CMakeLists.txt
+@@ -215,6 +215,10 @@ ELSE()
   SET(MYSQLD_SOURCE main.cc ${DTRACE_PROBES_ALL})
 ENDIF()
 
--- a/mariadb-10.5.6.tar.gz
+++ b/mariadb-10.5.6.tar.gz
@ -1,3 +0,0 @@
-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
@ -1,6 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iF0EABECAB0WIQQZk2nlQEvV/H0v5DvLywgqG7lD2wUCX3z1MQAKCRDLywgqG7lD
-266xAKDyp0zIylMDdluhOtlbmS0BLwefxwCfciErEKwqXuBp8DzVD5EMVVRPqYg=
-=5CGr
-----END PGP SIGNATURE-----
--- a/mariadb-10.5.8.tar.gz
+++ b/mariadb-10.5.8.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eb4824f6f2c532cd3fc6a6bce7bf78ea7c6b949f8bdd07656b2c84344e757be8
+size 88206163
--- a/mariadb-10.5.8.tar.gz.sig
+++ b/mariadb-10.5.8.tar.gz.sig
@ -0,0 +1,6 @@
+-----BEGIN PGP SIGNATURE-----
+
+iF0EABECAB0WIQQZk2nlQEvV/H0v5DvLywgqG7lD2wUCX6s7dQAKCRDLywgqG7lD
+27aMAKCAdX+NC/VksUO9bk5zjiaPLVdZzwCfTrccWCS7uAGMk2fLbFMLb4DSQ20=
+=hJl1
+-----END PGP SIGNATURE-----
--- a/mariadb.changes
+++ b/mariadb.changes
@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Thu Nov 12 14:57:52 UTC 2020 - Kristyna Streitova <kstreitova@suse.com>
+
+- Update to 10.5.8
+  * release notes and changelog:
+    https://mariadb.com/kb/en/library/mariadb-1058-release-notes
+    https://mariadb.com/kb/en/library/mariadb-1058-changelog
+  * fixes for the following security vulnerabilities:
+    10.5.7: CVE-2020-14812, CVE-2020-14765, CVE-2020-14776,
+            CVE-2020-14789
+    10.5.8: none
+- tracker bugs: [bsc#1177472] and [bsc#1178428]
+- refresh mariadb-10.2.19-link-and-enable-c++11-atomics.patch
+- update suse_skipped_tests.list
+
 -------------------------------------------------------------------
 Mon Oct 19 12:11:14 UTC 2020 - marec@detebe.org

@ -5,6 +20,9 @@ Mon Oct 19 12:11:14 UTC 2020 - marec@detebe.org
  * release notes and changelog
    https://mariadb.com/kb/en/mariadb-1056-release-notes
    https://mariadb.com/kb/en/mariadb-1056-changelog
+  * fixes for the following security vulnerabilities:
+    10.5.6: CVE-2020-15180
+    < 10.5.6: none
 - 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
--- 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.5.6
+Version:        10.5.8
 Release:        0
 Summary:        Server part of MariaDB
 License:        SUSE-GPL-2.0-with-FLOSS-exception
@ -569,6 +569,7 @@ rm %{buildroot}%{_libdir}/mysql/plugin/{auth_gssapi_client.so,dialog.so,mysql_cl
 # Devel files
 rm %{buildroot}%{_bindir}/mysql_config
 rm %{buildroot}%{_bindir}/mariadb_config
+rm %{buildroot}%{_bindir}/mariadb-config
 rm %{buildroot}%{_libdir}/pkgconfig/mariadb.pc
 rm -f %{buildroot}%{_prefix}/lib/pkgconfig/libmariadb.pc
 rm -f %{buildroot}%{_libdir}/pkgconfig/libmariadb.pc
--- a/suse_skipped_tests.list
+++ b/suse_skipped_tests.list
@ -48,3 +48,24 @@ oqgraph.social                                   : since 10.4.12 - i586 (MDEV-22
 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
+main.sp2                                         : since 10.5.8 - all
+main.mysqld--help-aria                           : since 10.5.8 - all
+unit.conc_connection                             : since 10.5.8 - all
+main.not_partition                               : since 10.5.8 - aarch64
+period.overlaps                                  : since 10.5.8 - s390x
+perfschema.memory_aggregate_32bit                : since 10.5.8 - s390x
+perfschema.socket_connect                        : since 10.5.8 - s390x
+sys_vars.gtid_ignore_duplicates_grant            : since 10.5.8 - i586
+sys_vars.myisam_stats_method_basic               : since 10.5.8 - i586
+innodb.innodb-page_compression_bzip2             : since 10.5.8 - i586
+sys_vars.read_only_func                          : since 10.5.8 - i586
+sys_vars.big_tables_basic                        : since 10.5.8 - i586
+main.mysql_protocols                             : since 10.5.8 - i586
+sys_vars.max_prepared_stmt_count_func            : since 10.5.8 - i586
+sys_vars.net_read_timeout_basic                  : since 10.5.8 - i586
+sys_vars.key_cache_age_threshold_basic           : since 10.5.8 - i586
+main.upgrade_MDEV-19650                          : since 10.5.8 - x86_64
+main.upgrade_MDEV-23102-1                        : since 10.5.8 - x86_64
+main.upgrade_MDEV-23102-2                        : since 10.5.8 - x86_64
+main.mysql_upgrade_to_100502                     : since 10.5.8 - x86_64
+