Skip to content

Commit 40455ab

Browse files
BinduSri-6522866Kanishk Bansaljslobodzian
authored
[HIGH] Upgrade mariadb to 10.11.15 for CVE-2025-13699 (microsoft#15417)
Co-authored-by: Kanishk Bansal <kanbansal@microsoft.com> Co-authored-by: jslobodzian <joslobo@microsoft.com>
1 parent 0a4cc48 commit 40455ab

File tree

4 files changed

+8
-165
lines changed

4 files changed

+8
-165
lines changed

SPECS/mariadb/CVE-2023-52971.patch

Lines changed: 0 additions & 157 deletions
This file was deleted.

SPECS/mariadb/mariadb.signatures.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"README.mariadb-docs": "c3c6584dbdc35445014ac48023da59cafc5abc6996859cebb4e357c2f380990f",
55
"README.wsrep_sst_rsync_tunnel": "f121b2f6e804a8aaf01e0c835e62b64a0d0bf6cd922cc1a21897f196f8b0714f",
66
"clustercheck.sh": "4be47a46f99b714bc3681fdf11b09d242dae5e3eb81274b3040a73f9d7800d50",
7-
"mariadb-10.11.11.tar.gz": "14cc0d9d9a7a330231d9ed91ac28f29b502d2f1e7021d81c940280db52bac812",
7+
"mariadb-10.11.15.tar.gz": "6190529d9d047163259967a92095b505df15b39195ea55cdf856314eef4546f5",
88
"mariadb-check-socket.sh": "6d04410549275140f07b89a1dcef99f31cd47751ef9142d14e7898e7cbcff023",
99
"mariadb-check-upgrade.sh": "e49c23e79155d416f7bad292d073213c0beafed99c172a06d909ec3e24ee6e75",
1010
"mariadb-prepare-db-dir.sh": "ff8d2e719f6db158eda0acb58a9d84b43c959baf0d2a8f4d9ce7a62f13af36d0",
@@ -21,4 +21,4 @@
2121
"rh-skipped-tests-s390.list": "5e826f9f3cc920c0fe67434fd32b25a205d6a8530552e998edb376c4661b59f3",
2222
"wsrep_sst_rsync_tunnel": "5194ed1971d0afe8d2836c1d143263f6891311c9ac0fae536b866f2a885d056e"
2323
}
24-
}
24+
}

SPECS/mariadb/mariadb.spec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
# Plain package name for cases, where %%{name} differs (e.g. for versioned packages)
22
%global majorname mariadb
3-
%define package_version 10.11.11
3+
%define package_version 10.11.15
44
%define majorversion %(echo %{package_version} | cut -d'.' -f1-2 )
55

6-
76
%define _vpath_builddir .
87

98
# Set if this package will be the default one in distribution
@@ -201,7 +200,6 @@ Patch12: rocksdb-6.8-gcc13.patch
201200
Patch13: %{majorname}-libfmt.patch
202201
# Patch14: make MTR port calculation reasonably predictable
203202
Patch14: %{majorname}-mtr.patch
204-
Patch15: CVE-2023-52971.patch
205203

206204
%global pkgname %{majorname}
207205

@@ -823,7 +821,6 @@ rm -r storage/rocksdb/
823821
%endif
824822

825823
%patch -P14 -p1
826-
%patch -P15 -p1
827824

828825
# generate a list of tests that fail, but are not disabled by upstream
829826
cat %{SOURCE50} | tee -a mysql-test/unstable-tests
@@ -1772,6 +1769,9 @@ fi
17721769
%endif
17731770

17741771
%changelog
1772+
* Mon Dec 29 2025 BinduSri Adabala <v-badabala@microsoft.com> - 10.11.15-1
1773+
- Upgrade to 10.11.15 for CVE-2025-13699
1774+
17751775
* Fri Apr 04 2025 Mayank Singh <mayansingh@microsoft.com> - 10.11.11-1
17761776
- Initial Azure Linux import from Fedora 42 (license: MIT).
17771777
- License verified

cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12961,8 +12961,8 @@
1296112961
"type": "other",
1296212962
"other": {
1296312963
"name": "mariadb",
12964-
"version": "10.11.11",
12965-
"downloadUrl": "https://downloads.mariadb.org/interstitial/mariadb-10.11.11/source/mariadb-10.11.11.tar.gz"
12964+
"version": "10.11.15",
12965+
"downloadUrl": "https://downloads.mariadb.org/interstitial/mariadb-10.11.15/source/mariadb-10.11.15.tar.gz"
1296612966
}
1296712967
}
1296812968
},

0 commit comments

Comments
 (0)