From 8cb21f0462266c87a4c34c6551a899fe57f192c8 Mon Sep 17 00:00:00 2001 From: xiejing Date: Tue, 17 Jun 2025 19:50:31 +0800 Subject: [PATCH] Revert to the old cmake usage pattern to prevent macro definitions from being overridden (cherry picked from commit c61f1f9a65a73d79e244f7d452bfe92aa8df3802) --- mariadb.spec | 7 +++++-- mysql.service.in | 2 +- mysql@.service.in | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/mariadb.spec b/mariadb.spec index 87c87bb..7860458 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -2,7 +2,7 @@ %global pkgnamepatch mariadb %{!?runselftest:%global runselftest 0} %global ignore_testsuite_result 0 -%global last_tested_version 10.5.25 +%global last_tested_version 10.5.29 %global force_run_testsuite 0 %global require_mysql_selinux 1 @@ -74,7 +74,7 @@ Name: mariadb Version: 10.5.29 -Release: 1 +Release: 2 Epoch: 4 Summary: A very fast and robust SQL database server @@ -1477,6 +1477,9 @@ fi %endif %changelog +* Tue Jun 17 2025 xiejing - 4:10.5.29-2 +- Revert to the old cmake usage pattern to prevent macro definitions from being overridden + * Fri May 09 2025 Funda Wang - 4:10.5.29-1 - update to 10.5.29 for CVE-2025-30722, CVE-2025-30693, CVE-2023-52970, CVE-2023-52969 diff --git a/mysql.service.in b/mysql.service.in index ae12df9..bf6d9f5 100644 --- a/mysql.service.in +++ b/mysql.service.in @@ -17,7 +17,7 @@ # [Unit] -Description=MariaDB 10.5.25 database server +Description=MariaDB 10.5.29 database server Documentation=man:mariadbd(8) Documentation=https://mariadb.com/kb/en/library/systemd/ After=network.target diff --git a/mysql@.service.in b/mysql@.service.in index f250f51..3c7132c 100644 --- a/mysql@.service.in +++ b/mysql@.service.in @@ -39,7 +39,7 @@ # LimitNOFILE=10000 [Unit] -Description=MariaDB 10.5.25 database server (multi-instance %I) +Description=MariaDB 10.5.29 database server (multi-instance %I) Documentation=man:mariadbd(8) Documentation=https://mariadb.com/kb/en/library/systemd/ After=network.target -- Gitee