[AUTO-CHERRYPICK] [AUTOPATCHER-CORE][Medium] Upgrade mariadb to 10.6.21 for CVE-2025-21490 - branch main (#13154)

CBL-Mariner-Bot · web-flow · commit 6d0979aec74d · 2025-03-28T13:43:53.000-04:00
diff --git a/SPECS/mariadb/mariadb.signatures.json b/SPECS/mariadb/mariadb.signatures.json
@@ -1,5 +1,5 @@
 {
   "Signatures": {
-    "mariadb-10.6.20.tar.gz": "b0f37fac388df74a2a4cfbf1d53cadc4a4361ed1928bda1a627f03a6a60e745d"
+    "mariadb-10.6.21.tar.gz": "fc326ecb0e1483292d58edd0ebe63067c53548d0a0e7c952a06d058d4ff5a7ce"
   }
 }
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.20
+Version:        10.6.21
 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
+* 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
+
 * Mon Nov 04 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 10.6.20-1
 - Auto-upgrade to 10.6.20 - address CVE-2024-21096
 
diff --git a/cgmanifest.json b/cgmanifest.json
@@ -12891,8 +12891,8 @@
         "type": "other",
         "other": {
           "name": "mariadb",
-          "version": "10.6.20",
-          "downloadUrl": "https://github.com/MariaDB/server/archive/mariadb-10.6.20.tar.gz"
+          "version": "10.6.21",
+          "downloadUrl": "https://github.com/MariaDB/server/archive/mariadb-10.6.21.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.20.tar.gz": "b0f37fac388df74a2a4cfbf1d53cadc4a4361ed1928bda1a627f03a6a60e745d"`
	`3`	`+ "mariadb-10.6.21.tar.gz": "fc326ecb0e1483292d58edd0ebe63067c53548d0a0e7c952a06d058d4ff5a7ce"`
`4`	`4`	`}`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12891,8 +12891,8 @@`
`12891`	`12891`	`"type": "other",`
`12892`	`12892`	`"other": {`
`12893`	`12893`	`"name": "mariadb",`
`12894`		`- "version": "10.6.20",`
`12895`		`- "downloadUrl": "https://github.com/MariaDB/server/archive/mariadb-10.6.20.tar.gz"`
	`12894`	`+ "version": "10.6.21",`
	`12895`	`+ "downloadUrl": "https://github.com/MariaDB/server/archive/mariadb-10.6.21.tar.gz"`
`12896`	`12896`	`}`
`12897`	`12897`	`}`
`12898`	`12898`	`},`