Skip to content

Upgrade mariadb to version 10.11.19 #18627

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

Merged
jslobodzian merged 1 commit into from
Sep 1, 2026
Merged

Upgrade mariadb to version 10.11.19 #18627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 15 additions & 11 deletions SPECS/mariadb/mariadb-libfmt.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,18 @@ To avoid potential issues on systems with FMT library between 8.0 and the one wi
introduce a bundling mechanism for use on such distributions.
We pre-download the sources archive and supply the CMake with it, instead of the web URL.

--- mariadb-10.11.10/cmake/libfmt.cmake 2024-10-29 15:32:31.000000000 +0100
+++ mariadb-10.11.10/cmake/libfmt.cmake_patched 2024-11-14 12:06:35.961435488 +0100
@@ -15,7 +15,7 @@ MACRO(BUNDLE_LIBFMT)
ExternalProject_Add(
libfmt
PREFIX "${dir}"
- URL "https://github.com/fmtlib/fmt/releases/download/11.0.2/fmt-11.0.2.zip"
+ URL "file:///${dir}/fmt-11.0.2.zip"
URL_MD5 c622dca45ec3fc95254c48370a9f7a1d
INSTALL_COMMAND ""
CONFIGURE_COMMAND ""
Since 10.11.19 upstream selects the archive via a compiler-dependent SET(source URL ...)
block: fmt 11.0.2 only for gcc < 4.9 (RHEL-7), otherwise fmt 12.2.0. Azure Linux builds
with gcc 13, so only the latter branch is redirected to the pre-downloaded archive.

--- mariadb-10.11.19/cmake/libfmt.cmake 2024-10-29 15:32:31.000000000 +0100
+++ mariadb-10.11.19/cmake/libfmt.cmake_patched 2024-11-14 12:06:35.961435488 +0100
@@ -18,7 +18,7 @@ MACRO(BUNDLE_LIBFMT)
SET(source URL "https://github.com/fmtlib/fmt/releases/download/11.0.2/fmt-11.0.2.zip"
URL_MD5 c622dca45ec3fc95254c48370a9f7a1d)
ELSE()
- SET(source URL "https://github.com/fmtlib/fmt/releases/download/12.2.0/fmt-12.2.0.zip"
+ SET(source URL "file:///${dir}/fmt-12.2.0.zip"
URL_MD5 6083253772ad29e73a4d5920be08918e)
ENDIF()

8 changes: 4 additions & 4 deletions SPECS/mariadb/mariadb-logrotate.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ Adjust the 'mariadb.logrotate.sh' script in several ways:
for the very unlikely, but possible scenario
in which the debian config file would exist.

--- mariadb-10.11.6/support-files/mariadb.logrotate.sh 2023-11-08 16:51:43.000000000 +0100
+++ mariadb-10.11.6/support-files/mariadb.logrotate.sh_patched 2023-12-17 18:03:36.955861025 +0100
--- mariadb-10.11.19/support-files/mariadb.logrotate.sh 2023-11-08 16:51:43.000000000 +0100
+++ mariadb-10.11.19/support-files/mariadb.logrotate.sh_patched 2023-12-17 18:03:36.955861025 +0100
@@ -6,7 +6,7 @@
# Read https://mariadb.com/kb/en/error-log/ to learn more about logging and
# https://mariadb.com/kb/en/rotating-logs-on-unix-and-linux/ about rotating logs.
# Read https://mariadb.com/docs/server/server-management/server-monitoring-logs/error-log to learn more about logging and
# https://mariadb.com/docs/server/server-management/server-monitoring-logs/rotating-logs-on-unix-and-linux about rotating logs.

-@localstatedir@/mysqld.log @localstatedir@/mariadb.log @logdir@/*.log {
+@LOG_LOCATION@ {
Expand Down
21 changes: 0 additions & 21 deletions SPECS/mariadb/mariadb-ssl-cypher.patch
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion SPECS/mariadb/mariadb.signatures.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
"rh-skipped-tests-ppc.list": "8d844255335c4dbeeaf363f95b8b690d024c84ad65620d36ec78650a9d54460e",
"rh-skipped-tests-s390.list": "5e826f9f3cc920c0fe67434fd32b25a205d6a8530552e998edb376c4661b59f3",
"wsrep_sst_rsync_tunnel": "5194ed1971d0afe8d2836c1d143263f6891311c9ac0fae536b866f2a885d056e",
"mariadb-10.11.18.tar.gz": "a973e9b3af53aaf08d782117ec4165adbacdeb545a9946a06cfad9cfa72f0149"
"mariadb-10.11.19.tar.gz": "8a88523366453b14b4122c2dbb5d82096eed73c858976fa231b454d27e232ae4"
}
}
9 changes: 7 additions & 2 deletions SPECS/mariadb/mariadb.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
# See mariadb-libfmt.patch for detailed description.
%bcond bundled_fmt 0
%if %{with bundled_fmt}
%global fmt_bundled_version 11.0.2
%global fmt_bundled_version 12.2.0
%endif

# Include systemd files
Expand Down Expand Up @@ -130,7 +130,7 @@
%global sameevr %{epoch}:%{version}-%{release}

Name: %{majorname}
Version: 10.11.18
Version: 10.11.19
Release: 1%{?dist}
Epoch: 3

Expand Down Expand Up @@ -1767,6 +1767,11 @@ fi
%endif

%changelog
* Tue Aug 25 2026 Sumit Jena <v-sumitjena@microsoft.com> - 3:10.11.19-1
- Upgrade to 10.11.19
- Rebase mariadb-logrotate.patch and mariadb-libfmt.patch onto upstream context changes
- Follow upstream's new compiler-conditional bundled fmt selection (12.2.0)

* Fri May 29 2026 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 3:10.11.18-1
- Auto-upgrade to 10.11.18 - for CVE-2026-48165, CVE-2026-48163

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 @@ -13131,8 +13131,8 @@
"type": "other",
"other": {
"name": "mariadb",
"version": "10.11.18",
"downloadUrl": "https://downloads.mariadb.org/interstitial/mariadb-10.11.18/source/mariadb-10.11.18.tar.gz"
"version": "10.11.19",
"downloadUrl": "https://downloads.mariadb.org/interstitial/mariadb-10.11.19/source/mariadb-10.11.19.tar.gz"
}
}
},
Expand Down
Loading