From f20aec3d3dbd2e0410749bec263ad74a32c9e31e Mon Sep 17 00:00:00 2001
From: Michal Schorm <mschorm@redhat.com>
Date: Fri, 12 Feb 2021 08:45:05 +0100
Subject: [PATCH] Enhance the logrotate script as proposed in:  
 https://mariadb.com/kb/en/rotating-logs-on-unix-and-linux/

Resolves: #1683981
---
 mariadb-logrotate.patch | 18 +++++++++++++-----
 mariadb.spec            |  6 +++++-
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/mariadb-logrotate.patch b/mariadb-logrotate.patch
index d4ed2b7..aa46e59 100644
--- a/mariadb-logrotate.patch
+++ b/mariadb-logrotate.patch
@@ -26,9 +26,15 @@ 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.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 @@
+Update 02/2021
+* Enhance the script as proposed in:
+  https://mariadb.com/kb/en/rotating-logs-on-unix-and-linux/
+* Discussion continues in:
+  https://jira.mariadb.org/browse/MDEV-16621
+
+--- mariadb-10.5.8/support-files/mysql-log-rotate.sh	2021-02-12 08:37:47.857289694 +0100
++++ mariadb-10.5.8/support-files/mysql-log-rotate.sh_pacthed	2021-02-12 08:40:26.420372325 +0100
+@@ -3,35 +3,22 @@
  # in the [mysqld] section as follows:
  #
  # [mysqld]
@@ -55,10 +61,12 @@ Update 6/2018
          notifempty
          daily
          rotate 3
-@@ -27,11 +14,9 @@
+         missingok
          compress
++        delaycompress
++        sharedscripts
      postrotate
-	# just if mariadbd 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 8b293d1..e947632 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -158,7 +158,7 @@
 
 Name:             mariadb
 Version:          10.5.8
-Release:          6%{?with_debug:.debug}%{?dist}
+Release:          7%{?with_debug:.debug}%{?dist}
 Epoch:            3
 
 Summary:          A very fast and robust SQL database server
@@ -1662,6 +1662,10 @@ fi
 %endif
 
 %changelog
+* Fri Feb 12 2021 Michal Schorm <mschorm@redhat.com> - 3:10.5.8-7
+- Enhance the logrotate script
+- Resolves: #1683981
+
 * Fri Feb 12 2021 Michal Schorm <mschorm@redhat.com> - 3:10.5.8-6
 - Fix Perl database driver dependency