From fce246bed99bb963b331721f1f6a4ce8228954f8 Mon Sep 17 00:00:00 2001 From: SumitJenaHCL Date: Wed, 26 Aug 2026 16:34:34 +0530 Subject: [PATCH] Upgrade mariadb to version 10.11.19 --- SPECS/mariadb/mariadb-libfmt.patch | 26 +++++++++++++++----------- SPECS/mariadb/mariadb-logrotate.patch | 8 ++++---- SPECS/mariadb/mariadb-ssl-cypher.patch | 21 --------------------- SPECS/mariadb/mariadb.signatures.json | 2 +- SPECS/mariadb/mariadb.spec | 9 +++++++-- cgmanifest.json | 4 ++-- 6 files changed, 29 insertions(+), 41 deletions(-) delete mode 100644 SPECS/mariadb/mariadb-ssl-cypher.patch diff --git a/SPECS/mariadb/mariadb-libfmt.patch b/SPECS/mariadb/mariadb-libfmt.patch index 58f1e63a3ad..be27b9e2256 100644 --- a/SPECS/mariadb/mariadb-libfmt.patch +++ b/SPECS/mariadb/mariadb-libfmt.patch @@ -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() + diff --git a/SPECS/mariadb/mariadb-logrotate.patch b/SPECS/mariadb/mariadb-logrotate.patch index ec522b0306c..abefa2e9c81 100644 --- a/SPECS/mariadb/mariadb-logrotate.patch +++ b/SPECS/mariadb/mariadb-logrotate.patch @@ -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@ { diff --git a/SPECS/mariadb/mariadb-ssl-cypher.patch b/SPECS/mariadb/mariadb-ssl-cypher.patch deleted file mode 100644 index a1a9dcfded5..00000000000 --- a/SPECS/mariadb/mariadb-ssl-cypher.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up mariadb-10.1.19/mysql-test/r/ssl_8k_key.result.sslbak mariadb-10.1.19/mysql-test/r/ssl_8k_key.result ---- mariadb-10.1.19/mysql-test/r/ssl_8k_key.result.sslbak 2016-11-24 08:55:21.637000000 -0500 -+++ mariadb-10.1.19/mysql-test/r/ssl_8k_key.result 2016-11-24 08:55:55.853000000 -0500 -@@ -1,2 +1,2 @@ --Variable_name Value --Ssl_cipher DHE-RSA-AES256-SHA -+have_ssl -+1 -diff -up mariadb-10.1.19/mysql-test/t/ssl_8k_key.test.sslbak mariadb-10.1.19/mysql-test/t/ssl_8k_key.test ---- mariadb-10.1.19/mysql-test/t/ssl_8k_key.test.sslbak 2016-11-24 08:54:10.485000000 -0500 -+++ mariadb-10.1.19/mysql-test/t/ssl_8k_key.test 2016-11-24 08:54:35.724000000 -0500 -@@ -5,7 +5,7 @@ - # - # Bug#29784 YaSSL assertion failure when reading 8k key. - # ----exec $MYSQL --ssl --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1 -+--exec $MYSQL --ssl --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem -e "SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher'" 2>&1 - - ## This test file is for testing encrypted communication only, not other - ## encryption routines that the SSL library happens to provide! - diff --git a/SPECS/mariadb/mariadb.signatures.json b/SPECS/mariadb/mariadb.signatures.json index 76908a937fc..c2bd5a47eac 100644 --- a/SPECS/mariadb/mariadb.signatures.json +++ b/SPECS/mariadb/mariadb.signatures.json @@ -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" } } diff --git a/SPECS/mariadb/mariadb.spec b/SPECS/mariadb/mariadb.spec index a30d8e9166d..f96cb6126ee 100644 --- a/SPECS/mariadb/mariadb.spec +++ b/SPECS/mariadb/mariadb.spec @@ -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 @@ -130,7 +130,7 @@ %global sameevr %{epoch}:%{version}-%{release} Name: %{majorname} -Version: 10.11.18 +Version: 10.11.19 Release: 1%{?dist} Epoch: 3 @@ -1767,6 +1767,11 @@ fi %endif %changelog +* Tue Aug 25 2026 Sumit Jena - 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 - 3:10.11.18-1 - Auto-upgrade to 10.11.18 - for CVE-2026-48165, CVE-2026-48163 diff --git a/cgmanifest.json b/cgmanifest.json index 3f3402573db..ff3ad37b0b3 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -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" } } },