From a2352af454736cf486126c6fa1a3feb98245cbf5 Mon Sep 17 00:00:00 2001
From: CBL-Mariner-Bot <75509084+CBL-Mariner-Bot@users.noreply.github.com>
Date: Mon, 29 Dec 2025 08:57:37 -0800
Subject: [PATCH] [AUTOPATCHER-CORE] Upgrade `mariadb` to 10.6.24 for
 CVE-2025-13699 [HIGH] (#15401)

(cherry picked from commit 2a1be8f9b3e4465d9391342ebff838a57161265b)
---
 SPECS/mariadb/mariadb.signatures.json | 2 +-
 SPECS/mariadb/mariadb.spec            | 5 ++++-
 cgmanifest.json                       | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/SPECS/mariadb/mariadb.signatures.json b/SPECS/mariadb/mariadb.signatures.json
index 62a213087a7..5b42e949090 100644
--- a/SPECS/mariadb/mariadb.signatures.json
+++ b/SPECS/mariadb/mariadb.signatures.json
@@ -1,5 +1,5 @@
 {
   "Signatures": {
-    "mariadb-10.6.21.tar.gz": "fc326ecb0e1483292d58edd0ebe63067c53548d0a0e7c952a06d058d4ff5a7ce"
+    "mariadb-10.6.24.tar.gz": "7dad54f0bc5b4af704cafe20fb82d694417fdd00575585bf82134de9a740d26d"
   }
 }
diff --git a/SPECS/mariadb/mariadb.spec b/SPECS/mariadb/mariadb.spec
index 76852690822..8cfb1dcc3b8 100644
--- a/SPECS/mariadb/mariadb.spec
+++ b/SPECS/mariadb/mariadb.spec
@@ -1,6 +1,6 @@
 Summary:        Database servers made by the original developers of MySQL.
 Name:           mariadb
-Version:        10.6.21
+Version:        10.6.24
 Release:        1%{?dist}
 License:        GPLv2 WITH exceptions AND LGPLv2 AND BSD
 Vendor:         Microsoft Corporation
@@ -465,6 +465,9 @@ fi
 %{_datadir}/mysql/hindi/errmsg.sys
 
 %changelog
+* Sat Dec 27 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 10.6.24-1
+- Auto-upgrade to 10.6.24 - for CVE-2025-13699
+
 * Thu Mar 27 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 10.6.21-1
 - Auto-upgrade to 10.6.21 - for CVE-2025-21490
 
diff --git a/cgmanifest.json b/cgmanifest.json
index 6a5dd460243..2b2c91d61e2 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -12881,8 +12881,8 @@
         "type": "other",
         "other": {
           "name": "mariadb",
-          "version": "10.6.21",
-          "downloadUrl": "https://github.com/MariaDB/server/archive/mariadb-10.6.21.tar.gz"
+          "version": "10.6.24",
+          "downloadUrl": "https://github.com/MariaDB/server/archive/mariadb-10.6.24.tar.gz"
         }
       }
     },