Skip to content

[HIGH] Upgrade mariadb to 10.11.15 for CVE-2025-13699 #15417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BinduSri-6522866 wants to merge 4 commits into
base: fasttrack/3.0
Choose a base branch
from
+8 −165
Open

[HIGH] Upgrade mariadb to 10.11.15 for CVE-2025-13699 #15417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
34b095f
Upgrade mariadb to 10.11.15 for CVE-2025-13699
BinduSri-6522866 Dec 30, 2025
e219f12
address review comment
BinduSri-6522866 Dec 30, 2025
e92cc43
revert the macros
Dec 30, 2025
fca6033
Merge branch 'fasttrack/3.0' into topic_mariadb-3.0
jslobodzian Dec 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
157 changes: 0 additions & 157 deletions SPECS/mariadb/CVE-2023-52971.patch
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions SPECS/mariadb/mariadb.signatures.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"README.mariadb-docs": "c3c6584dbdc35445014ac48023da59cafc5abc6996859cebb4e357c2f380990f",
"README.wsrep_sst_rsync_tunnel": "f121b2f6e804a8aaf01e0c835e62b64a0d0bf6cd922cc1a21897f196f8b0714f",
"clustercheck.sh": "4be47a46f99b714bc3681fdf11b09d242dae5e3eb81274b3040a73f9d7800d50",
"mariadb-10.11.11.tar.gz": "14cc0d9d9a7a330231d9ed91ac28f29b502d2f1e7021d81c940280db52bac812",
"mariadb-10.11.15.tar.gz": "6190529d9d047163259967a92095b505df15b39195ea55cdf856314eef4546f5",
"mariadb-check-socket.sh": "6d04410549275140f07b89a1dcef99f31cd47751ef9142d14e7898e7cbcff023",
"mariadb-check-upgrade.sh": "e49c23e79155d416f7bad292d073213c0beafed99c172a06d909ec3e24ee6e75",
"mariadb-prepare-db-dir.sh": "ff8d2e719f6db158eda0acb58a9d84b43c959baf0d2a8f4d9ce7a62f13af36d0",
Expand All @@ -21,4 +21,4 @@
"rh-skipped-tests-s390.list": "5e826f9f3cc920c0fe67434fd32b25a205d6a8530552e998edb376c4661b59f3",
"wsrep_sst_rsync_tunnel": "5194ed1971d0afe8d2836c1d143263f6891311c9ac0fae536b866f2a885d056e"
}
}
}
8 changes: 4 additions & 4 deletions SPECS/mariadb/mariadb.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
# Plain package name for cases, where %%{name} differs (e.g. for versioned packages)
%global majorname mariadb
%define package_version 10.11.11
%define package_version 10.11.15
%define majorversion %(echo %{package_version} | cut -d'.' -f1-2 )
Copy link
Collaborator

@jslobodzian jslobodzian Dec 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

majorversion was removed here, but it still exists in the new mariadb.spec file. Was there a reason to remove this and package_version?

Copy link
Contributor

@Kanishk-Bansal Kanishk-Bansal Dec 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

package_version is removed to ensure that auto upgrade pipeline works in future
Logs at https://dev.azure.com/mariner-org/mariner/Mariner%20Core%20Devs/_build/results?buildId=1013141&view=logs&j=8abbbfb0-6c61-5acb-a99d-afcc1086beec&t=ebf371c8-faf2-5e80-b7d1-11735f4338f5&l=64

Copy link
Collaborator

@jslobodzian jslobodzian Dec 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @Kanishk-Bansal we probably want to improve the auto-upgrade pipeline to accomodate this instedad.



%define _vpath_builddir .

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

%global pkgname %{majorname}

Expand Down Expand Up @@ -823,7 +821,6 @@ rm -r storage/rocksdb/
%endif

%patch -P14 -p1
%patch -P15 -p1

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

%changelog
* Mon Dec 29 2025 BinduSri Adabala <v-badabala@microsoft.com> - 10.11.15-1
- Upgrade to 10.11.15 for CVE-2025-13699

* Fri Apr 04 2025 Mayank Singh <mayansingh@microsoft.com> - 10.11.11-1
- Initial Azure Linux import from Fedora 42 (license: MIT).
- License verified
Expand Down
4 changes: 2 additions & 2 deletions cgmanifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12961,8 +12961,8 @@
"type": "other",
"other": {
"name": "mariadb",
"version": "10.11.11",
"downloadUrl": "https://downloads.mariadb.org/interstitial/mariadb-10.11.11/source/mariadb-10.11.11.tar.gz"
"version": "10.11.15",
"downloadUrl": "https://downloads.mariadb.org/interstitial/mariadb-10.11.15/source/mariadb-10.11.15.tar.gz"
}
}
},
Expand Down
Loading