From be00ebc048c7c18be4b9b8d5f7c602b18f02007f Mon Sep 17 00:00:00 2001
From: Funda Wang <fundawang@yeah.net>
Date: Mon, 31 Mar 2025 19:08:50 +0800
Subject: [PATCH] 10.5.28

(cherry picked from commit 0c9fa73d82f049728d36f807f47df9077737628a)
---
 mariadb-10.5.25.tar.gz | 3 ---
 mariadb-10.5.28.tar.gz | 3 +++
 mariadb.spec           | 7 +++++--
 3 files changed, 8 insertions(+), 5 deletions(-)
 delete mode 100644 mariadb-10.5.25.tar.gz
 create mode 100644 mariadb-10.5.28.tar.gz

diff --git a/mariadb-10.5.25.tar.gz b/mariadb-10.5.25.tar.gz
deleted file mode 100644
index c7b8e76..0000000
--- a/mariadb-10.5.25.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9619d0f51e864357466b2c63301a34a53f7dfd99f18c4fd452fab22bf39ba64e
-size 115951936
diff --git a/mariadb-10.5.28.tar.gz b/mariadb-10.5.28.tar.gz
new file mode 100644
index 0000000..356a490
--- /dev/null
+++ b/mariadb-10.5.28.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0b5070208da0116640f20bd085f1136527f998cc23268715bcbf352e7b7f3cc1
+size 117755203
diff --git a/mariadb.spec b/mariadb.spec
index d9266e2..72c519f 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -73,8 +73,8 @@
 %global sameevr   %{epoch}:%{version}-%{release}
 
 Name:             mariadb
-Version:          10.5.25
-Release:          4
+Version:          10.5.28
+Release:          1
 Epoch:            4
 
 Summary:          A very fast and robust SQL database server
@@ -1477,6 +1477,9 @@ fi
 %endif
 
 %changelog
+* Mon Mar 31 2025 Funda Wang <fundawang@yeah.net> - 4:10.5.28-1
+- update to 10.5.28 for CVE-2025-21490
+
 * Thu Nov 21 2024 Funda Wang <fundawang@yeah.net> - 4:10.5.25-4
 - adopt to new cmake macro
 - sync with master codebase