From 2b8b70476201bd0619c981d12ecc0fc8d2824086 Mon Sep 17 00:00:00 2001
From: Lukas Javorsky <ljavorsk@redhat.com>
Date: Fri, 18 Sep 2020 13:34:42 +0200
Subject: [PATCH] Rebase to 10.5.4

---
 mariadb-logrotate.patch    | 6 +++---
 mariadb.spec               | 8 ++++++--
 rh-skipped-tests-base.list | 3 +++
 sources                    | 2 +-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/mariadb-logrotate.patch b/mariadb-logrotate.patch
index 6af9466..d4ed2b7 100644
--- a/mariadb-logrotate.patch
+++ b/mariadb-logrotate.patch
@@ -26,8 +26,8 @@ Update 6/2018
   beeing able to send the SIGHUP to the process and read the mysqld pid file, which root can.
 * Submited as PR: https://github.com/MariaDB/server/pull/807
 
---- mariadb-10.3.19/support-files/mysql-log-rotate.sh	2019-11-03 17:03:27.000000000 +0100
-+++ mariadb-10.3.19/support-files/mysql-log-rotate.sh_patched	2019-11-06 15:07:54.205379672 +0100
+--- mariadb-10.5.4/support-files/mysql-log-rotate.sh.old	2020-09-16 13:36:57.247955135 +0200
++++ mariadb-10.5.4/support-files/mysql-log-rotate.sh	2020-09-16 13:40:59.744220908 +0200
 @@ -3,23 +3,10 @@
  # in the [mysqld] section as follows:
  #
@@ -58,7 +58,7 @@ Update 6/2018
 @@ -27,11 +14,9 @@
          compress
      postrotate
- 	# just if mysqld is really running
+	# just if mariadbd is really running
 -	if test -x @bindir@/mysqladmin && \
 -	   @bindir@/mysqladmin ping &>/dev/null
 -	then
diff --git a/mariadb.spec b/mariadb.spec
index a0235fc..fb22472 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -153,7 +153,7 @@
 %global sameevr   %{epoch}:%{version}-%{release}
 
 Name:             mariadb
-Version:          10.5.3
+Version:          10.5.4
 Release:          1%{?with_debug:.debug}%{?dist}
 Epoch:            3
 
@@ -1374,6 +1374,7 @@ fi
 
 %config(noreplace) %{_sysconfdir}/my.cnf.d/%{pkg_name}-server.cnf
 %config(noreplace) %{_sysconfdir}/my.cnf.d/enable_encryption.preset
+%config(noreplace) %{_sysconfdir}/my.cnf.d/spider.cnf
 
 %{_libexecdir}/{mysqld,mariadbd}
 
@@ -1429,7 +1430,6 @@ fi
 %{_mandir}/man1/mysql.server.1*
 
 %{_datadir}/%{pkg_name}/fill_help_tables.sql
-%{_datadir}/%{pkg_name}/install_spider.sql
 %{_datadir}/%{pkg_name}/maria_add_gis_sp.sql
 %{_datadir}/%{pkg_name}/maria_add_gis_sp_bootstrap.sql
 %{_datadir}/%{pkg_name}/mysql_system_tables.sql
@@ -1601,6 +1601,10 @@ fi
 %endif
 
 %changelog
+* Wed Sep 16 2020 Lukas Javorsky <ljavorsk@redhat.com> - 10.5.4-1
+- Rebase to 10.5.4
+- Add spider.cnf to the server config files
+
 * Mon Sep 14 2020 Lukas Javorsky <ljavorsk@redhat.com> - 10.5.3-1
 - Rebase to 10.5.3
 
diff --git a/rh-skipped-tests-base.list b/rh-skipped-tests-base.list
index 1c180cd..aef2dc4 100644
--- a/rh-skipped-tests-base.list
+++ b/rh-skipped-tests-base.list
@@ -45,3 +45,6 @@ disks.disks_notembedded                      :
 
 # Fails since 10.5.3
 main.mysqld--help-aria                       :
+
+# Fails since 10.5.4
+main.ssl_system_ca                           :
diff --git a/sources b/sources
index 91ed341..dcc822d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mariadb-10.5.3.tar.gz) = 753b3c6a79193cd290d655114f841355e5ff39c709b07e8dae3c76b35acee31d4c9585d27b515df5dde6a8effe20b955f3eb5ddb89ce01c39ffe6907ede6ffab
+SHA512 (mariadb-10.5.4.tar.gz) = f949cee6e227e4633f95ab826db7976ed76340eb6dfcbee1eb698e6779b669a8593b2dc733b6a442a60ed95840a627e0551f07a37f2b7738fb03cf1e367f4e1d