import mariadb-10.5.13-1.el9

.gitignore

@@ -1 +1 @@
-SOURCES/mariadb-10.5.12-downstream_modified.tar.gz
+SOURCES/mariadb-10.5.13-downstream_modified.tar.gz

.mariadb.metadata

@@ -1 +1 @@
-4408b5954760239031b0738d78baf6020163b6e4 SOURCES/mariadb-10.5.12-downstream_modified.tar.gz
+ace36fe1a0ebba69b7cab359cb9a51c5b9fecbb4 SOURCES/mariadb-10.5.13-downstream_modified.tar.gz

SOURCES/rh-skipped-tests-base.list

@@ -55,3 +55,15 @@ plugins.feedback_plugin_load                 :
 
 # Fails only on RHEL 9 BETA on i686 architecture
 main.myisampack                              :
+
+# Fails on all arches since 10.5.13 on CentOS Stream 9
+oqgraph.regression_mdev6345                  :
+type_test.type_test_double                   :
+# Fails only on i686 since 10.5.13 on CentOS Stream 9
+oqgraph.general-innodb                       :
+oqgraph.general-Aria                         :
+oqgraph.general-MyISAM                       :
+oqgraph.legacy_upgrade                       :
+oqgraph.regression_1133093                   :
+oqgraph.regression_1196036                   :
+oqgraph.regression_1213120                   :

SPECS/mariadb.spec

@@ -15,7 +15,7 @@
 # The last version on which the full testsuite has been run
 # In case of further rebuilds of that version, don't require full testsuite to be run
 # run only "main" suite
-%global last_tested_version 10.5.12
+%global last_tested_version 10.5.13
 # Set to 1 to force run the testsuite even if it was already tested in current version
 %global force_run_testsuite 0
 
@@ -153,8 +153,8 @@
 %global sameevr   %{epoch}:%{version}-%{release}
 
 Name:             mariadb
-Version:          10.5.12
-Release:          4%{?with_debug:.debug}%{?dist}
+Version:          10.5.13
+Release:          1%{?with_debug:.debug}%{?dist}
 Epoch:            3
 
 Summary:          A very fast and robust SQL database server
@@ -220,10 +220,12 @@ Patch9:           %{pkgnamepatch}-ownsetup.patch
 Patch10:          %{pkgnamepatch}-ssl-cipher-tests.patch
 #   Patch11: Use PCDIR CMake option, if configured
 Patch11:          %{pkgnamepatch}-pcdir.patch
+#   Patch12: OpenSSL 3 patch
+#   Picked from the upstream developement branch for MariaDB 10.8.
+#   https://jira.mariadb.org/browse/MDEV-25785
+Patch12:           %{pkgnamepatch}-openssl3.patch
 #   Patch15:  Add option to edit groonga's and groonga-normalizer-mysql install path
 Patch15:          %{pkgnamepatch}-groonga.patch
-#   Patch16:  Fix openssl 3.0 compatibility at least partially (some tests still fail)
-Patch16:          %{pkgnamepatch}-openssl3.patch
 
 BuildRequires:    make
 BuildRequires:    cmake gcc-c++
@@ -751,8 +753,10 @@ rm -r storage/rocksdb/
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%if 0%{?fedora} >= 35 || 0%{?rhel} >= 9
+%patch12 -p1
+%endif
 %patch15 -p1
-%patch16 -p1
 
 # generate a list of tests that fail, but are not disabled by upstream
 cat %{SOURCE50} | tee -a mysql-test/unstable-tests
@@ -801,11 +805,6 @@ fi
 
 
 %build
-# This package has static probe points which do not currently
-# work with LTO and result in undefined symbols at link time.
-# This is being worked on in upstream GCC
-%define _lto_cflags %{nil}
-
 # fail quickly and obviously if user tries to build as root
 %if %runselftest
     if [ x"$(id -u)" = "x0" ]; then
@@ -1648,6 +1647,9 @@ fi
 %endif
 
 %changelog
+* Thu Dec 02 2021 Michal Schorm <mschorm@redhat.com> - 3:10.5.13-1
+- Rebase to 10.5.13
+
 * Thu Nov 18 2021 Honza Horak <hhorak@redhat.com> - 3:10.5.12-4
 - Use OpenSSL 3.0.0 patch from upstream
   Related: #1991498