!95 [2403]Bump to 10.5.25

From: @XIE-JING-2022 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen

mariadb.spec

@@ -2,7 +2,7 @@
 %global pkgnamepatch mariadb
 %{!?runselftest:%global runselftest 0}
 %global ignore_testsuite_result 0
-%global last_tested_version 10.5.15
+%global last_tested_version 10.5.25
 %global force_run_testsuite 0
 %global require_mysql_selinux 1
 
@@ -73,7 +73,7 @@
 %global sameevr   %{epoch}:%{version}-%{release}
 
 Name:             mariadb
-Version:          10.5.24
+Version:          10.5.25
 Release:          1
 Epoch:            4
 
@@ -252,6 +252,7 @@ to a MariaDB/MySQL server.
 %if %{with config}
 %package          config
 Summary:          The config files required by server and client
+%{?with_conflicts:Conflicts:        greatsql-mysql-config}
 
 %description      config
 The package provides the config file my.cnf and my.cnf.d directory used by any
@@ -264,7 +265,7 @@ package itself.
 %if %{with common}
 %package          common
 Summary:          The shared files required by server and client
-Requires:         %{_sysconfdir}/my.cnf
+Requires:         %{name}-config%{?_isa} = %{sameevr}
 
 
 %if %{without clibrary}
@@ -337,8 +338,7 @@ Recommends:       %{name}-backup%{?_isa} = %{sameevr}
 Suggests:         mytop
 Suggests:         logrotate
 
-Requires:         %{_sysconfdir}/my.cnf
-Requires:         %{_sysconfdir}/my.cnf.d
+Requires:         %{name}-config%{?_isa} = %{sameevr}
 
 %if %require_mysql_selinux
 Requires:         (mysql-selinux if selinux-policy-targeted)
@@ -1474,6 +1474,11 @@ fi
 %endif
 
 %changelog
+* Tue May 28 2024 xiejing <xiejing@kylinos.cn> - 4:10.5.25-1
+- Bump to 10.5.25 for resolving CVE-2024-21096
+- Fix version description in systemd service file
+- Add conflict with greatsql and change requires
+
 * Tue Feb 27 2024 Zheng Zhenyu <zheng.zhenyu@outlook.com> - 4:10.5.24-1
 - upgrade to 10.5.24
 

mysql.service.in

@@ -17,7 +17,7 @@
 #
 
 [Unit]
-Description=MariaDB 10.5.15 database server
+Description=MariaDB 10.5.25 database server
 Documentation=man:mariadbd(8)
 Documentation=https://mariadb.com/kb/en/library/systemd/
 After=network.target

mysql@.service.in

@@ -39,7 +39,7 @@
 #	LimitNOFILE=10000
 
 [Unit]
-Description=MariaDB 10.5.15 database server (multi-instance %I)
+Description=MariaDB 10.5.25 database server (multi-instance %I)
 Documentation=man:mariadbd(8)
 Documentation=https://mariadb.com/kb/en/library/systemd/
 After=network.target