From 6f35a9644ab0981d54e430fa122a3fb11a9c678c Mon Sep 17 00:00:00 2001
From: Funda Wang <fundawang@yeah.net>
Date: Fri, 9 May 2025 12:06:07 +0800
Subject: [PATCH] 10.5.29

(cherry picked from commit 3e15e6a90650d2ff222daac3fbc518202a26783a)
---
 mariadb-10.5.28.tar.gz => mariadb-10.5.29.tar.gz | 4 ++--
 mariadb.spec                                     | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)
 rename mariadb-10.5.28.tar.gz => mariadb-10.5.29.tar.gz (32%)

diff --git a/mariadb-10.5.28.tar.gz b/mariadb-10.5.29.tar.gz
similarity index 32%
rename from mariadb-10.5.28.tar.gz
rename to mariadb-10.5.29.tar.gz
index 356a490..d586339 100644
--- a/mariadb-10.5.28.tar.gz
+++ b/mariadb-10.5.29.tar.gz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0b5070208da0116640f20bd085f1136527f998cc23268715bcbf352e7b7f3cc1
-size 117755203
+oid sha256:de49ed417f6fa90e8fee72a41e526e0983dc47f388caff9e703803cec263b826
+size 117805539
diff --git a/mariadb.spec b/mariadb.spec
index 794a25e..96c1522 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -73,7 +73,7 @@
 %global sameevr   %{epoch}:%{version}-%{release}
 
 Name:             mariadb
-Version:          10.5.28
+Version:          10.5.29
 Release:          1
 Epoch:            4
 
@@ -1477,6 +1477,9 @@ fi
 %endif
 
 %changelog
+* Fri May 09 2025 Funda Wang <fundawang@yeah.net> - 4:10.5.29-1
+- update to 10.5.29 for CVE-2025-30722, CVE-2025-30693, CVE-2023-52970, CVE-2023-52969
+
 * Mon Mar 31 2025 Funda Wang <fundawang@yeah.net> - 4:10.5.28-1
 - update to 10.5.28 for CVE-2025-21490
 
-- 
Gitee