Merge PR "[AUTO-CHERRYPICK] [AUTOPATCHER-CORE] Upgrade mariadb to 10.6.24 for CVE-2025-13699 [HIGH] - branch main" #15412

CBL-Mariner-Bot · web-flow · commit daacfd49dc5d · 2025-12-29T09:04:19.000-08:00
diff --git 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
@@ -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
@@ -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"
         }
       }
     },

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"Signatures": {`
`3`		`- "mariadb-10.6.21.tar.gz": "fc326ecb0e1483292d58edd0ebe63067c53548d0a0e7c952a06d058d4ff5a7ce"`
	`3`	`+ "mariadb-10.6.24.tar.gz": "7dad54f0bc5b4af704cafe20fb82d694417fdd00575585bf82134de9a740d26d"`
`4`	`4`	`}`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12881,8 +12881,8 @@`
`12881`	`12881`	`"type": "other",`
`12882`	`12882`	`"other": {`
`12883`	`12883`	`"name": "mariadb",`
`12884`		`- "version": "10.6.21",`
`12885`		`- "downloadUrl": "https://github.com/MariaDB/server/archive/mariadb-10.6.21.tar.gz"`
	`12884`	`+ "version": "10.6.24",`
	`12885`	`+ "downloadUrl": "https://github.com/MariaDB/server/archive/mariadb-10.6.24.tar.gz"`
`12886`	`12886`	`}`
`12887`	`12887`	`}`
`12888`	`12888`	`},`