From 39b5f88445ab5ceda671eddd5c2983dc98909a2a Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Sun, 8 Feb 2026 14:12:07 +0100 Subject: [PATCH 1/4] Rebase to 10.11.16 Release notes: https://mariadb.com/docs/release-notes/community-server/10.11/10.11.16 Related: RHEL-183086 --- mariadb10.11.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/mariadb10.11.spec b/mariadb10.11.spec index 51c178f..74b570f 100644 --- a/mariadb10.11.spec +++ b/mariadb10.11.spec @@ -1,6 +1,6 @@ # Plain package name for cases, where %%{name} differs (e.g. for versioned packages) %global majorname mariadb -%define package_version 10.11.15 +%define package_version 10.11.16 %define majorversion %(echo %{package_version} | cut -d'.' -f1-2 ) # Set if this package will be the default one in distribution @@ -15,7 +15,7 @@ # The last version on which the full testsuite has been run # In case of further rebuilds of that version, don't require full testsuite to be run # run only "main" suite -%global last_tested_version 10.11.15 +%global last_tested_version 10.11.16 # Set to 1 to force run the testsuite even if it was already tested in current version %global force_run_testsuite 0 @@ -153,7 +153,7 @@ Name: %{majorname}%{majorversion} Version: %{package_version} -Release: 2%{?with_debug:.debug}%{?dist} +Release: 1%{?with_debug:.debug}%{?dist} Epoch: 3 Summary: A very fast and robust SQL database server @@ -1811,6 +1811,9 @@ fi %endif %changelog +* Sat Feb 07 2026 Michal Schorm - 3:10.11.16-1 +- Rebase to 10.11.16 + * Tue Jan 20 2026 Petr Khartskhaev - 3:10.11.15-2 - Updated service files to work with environment files diff --git a/sources b/sources index fa5bf97..8c169b6 100755 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (mariadb-10.11.15.tar.gz) = 98d1e54954b69cf87a96be7d76f80333f27832a29279e6b0a9615b830e171713222abcb9ec9b9a545c0fc4a0f9f8e3d4774babcabf534a6fa3cb3dfdaed0dedc +SHA512 (mariadb-10.11.16.tar.gz) = 202ad856dad6ffaf5800e3629e938865c07e8590efafeb696aa9b0c7599e4e3b4eefb977f4c8f65bf03a5d6d4a6ac40154d62566a33fc6bf048cbeb79969601f SHA512 (fmt-11.0.2.zip) = 06eba9a2a8d1c2269801e10a00ed26a9344b79bca0391a6b10f35e9716682f8345125fceb96e9ca36ffbd4c0558b0e63e4c45a9dff09a8ee186458ec68e34198 SHA512 (pcre2-10.46.zip) = 1381ba2fe352ba33b90c416c25d2ee057f167fae3ecd9a56743ee2d381fd5793cd65dec07018ed77ce8576eaac993498ad6824cb58bf9fae2f5756881f4a9f9b From 3918cfa21e97cbd18f77cc408816ac88e59d39fc Mon Sep 17 00:00:00 2001 From: Pavol Sloboda Date: Mon, 25 May 2026 16:14:53 +0200 Subject: [PATCH 2/4] Rebase to 10.11.17 Other changes: - Add test_pam_modules dir and pam_mariadb_mtr.so to -test subpackage - Add plugins.mdev38550 to skipped tests list - it requires plugin that is shipped only by mariadb-connector-c in Fedora - Upstream updated bundled PCRE version to 10.47 Upstream changelog: https://mariadb.com/docs/release-notes/community-server/changelogs/10.11/10.11.17 Upstream release notes: https://mariadb.com/docs/release-notes/community-server/10.11/10.11.17 Related: RHEL-183086 --- mariadb10.11.spec | 12 ++++++++---- pcre_bundling.patch | 17 +++++++---------- sources | 4 ++-- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/mariadb10.11.spec b/mariadb10.11.spec index 74b570f..e6452ac 100644 --- a/mariadb10.11.spec +++ b/mariadb10.11.spec @@ -1,6 +1,6 @@ # Plain package name for cases, where %%{name} differs (e.g. for versioned packages) %global majorname mariadb -%define package_version 10.11.16 +%define package_version 10.11.17 %define majorversion %(echo %{package_version} | cut -d'.' -f1-2 ) # Set if this package will be the default one in distribution @@ -15,7 +15,7 @@ # The last version on which the full testsuite has been run # In case of further rebuilds of that version, don't require full testsuite to be run # run only "main" suite -%global last_tested_version 10.11.16 +%global last_tested_version 10.11.17 # Set to 1 to force run the testsuite even if it was already tested in current version %global force_run_testsuite 0 @@ -117,7 +117,7 @@ # the bundled library, since the package cannot be build with older version # https://mariadb.com/kb/en/pcre/ %bcond_with unbundled_pcre -%global pcre_bundled_version 10.46 +%global pcre_bundled_version 10.47 # To avoid issues with a breaking change in FMT library, bundle it on systems where FMT wasn't fixed yet # See mariadb-libfmt.patch for detailed description. @@ -1515,7 +1515,6 @@ fi %if %{with galera} %files -n %{pkgname}-server-galera -%doc Docs/README-wsrep %license LICENSE.clustercheck %{_bindir}/clustercheck %{_bindir}/galera_new_cluster @@ -1803,6 +1802,8 @@ fi %endif %{_bindir}/{mysql_client_test,mysqltest,mariadb-client-test,mariadb-test} %{_bindir}/my_safe_process +%dir %{_libdir}/%{majorname}/plugin +%dir %{_libdir}/%{majorname}/plugin/test_pam_modules/ %attr(-,mysql,mysql) %{_datadir}/mysql-test %{_mandir}/man1/{mysql_client_test,mysqltest,mariadb-client-test,mariadb-test}.1* %{_mandir}/man1/my_safe_process.1* @@ -1811,6 +1812,9 @@ fi %endif %changelog +* Tue May 26 2026 Pavol Sloboda - 3:10.11.17-1 +- Rebase to 10.11.17 + * Sat Feb 07 2026 Michal Schorm - 3:10.11.16-1 - Rebase to 10.11.16 diff --git a/pcre_bundling.patch b/pcre_bundling.patch index 1ad84c9..c97c838 100644 --- a/pcre_bundling.patch +++ b/pcre_bundling.patch @@ -1,15 +1,12 @@ -diff --git a/cmake/pcre.cmake b/cmake/pcre.cmake -index 08353e92..fc869ba9 100644 ---- a/cmake/pcre.cmake -+++ b/cmake/pcre.cmake -@@ -64,8 +64,8 @@ MACRO(BUNDLE_PCRE2) +diff -Naur mariadb-10.11.17/cmake/pcre.cmake mariadb-10.11.17_patched/cmake/pcre.cmake +--- mariadb-10.11.17/cmake/pcre.cmake 2026-05-08 07:43:18.000000000 +0200 ++++ mariadb-10.11.17_patched/cmake/pcre.cmake 2026-05-27 09:24:27.696297932 +0200 +@@ -65,7 +65,7 @@ ExternalProject_Add( pcre2 PREFIX "${dir}" -- URL "https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.45/pcre2-10.45.zip" -- URL_MD5 873da56c6469ec207ca5c5ae9688b83a -+ URL "file:///${dir}/pcre2-10.46.zip" -+ URL_MD5 261f3f9e14b6ce175103c5118a189faa +- URL "https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.47/pcre2-10.47.zip" ++ URL "file:///${dir}/pcre2-10.47.zip" + URL_MD5 7906aec38f872b74f1b925122dde9069 INSTALL_COMMAND "" CMAKE_ARGS - "-DCMAKE_WARN_DEPRECATED=FALSE" diff --git a/sources b/sources index 8c169b6..1f929a3 100755 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (mariadb-10.11.16.tar.gz) = 202ad856dad6ffaf5800e3629e938865c07e8590efafeb696aa9b0c7599e4e3b4eefb977f4c8f65bf03a5d6d4a6ac40154d62566a33fc6bf048cbeb79969601f +SHA512 (mariadb-10.11.17.tar.gz) = 788803b15afbb6193111774a233d0db0604f27ebae3b4b439368e2d7caeffb662846e530fa65f453a6d77541cedb99112ea319c7c0c2ce5074c32aefb06a51aa SHA512 (fmt-11.0.2.zip) = 06eba9a2a8d1c2269801e10a00ed26a9344b79bca0391a6b10f35e9716682f8345125fceb96e9ca36ffbd4c0558b0e63e4c45a9dff09a8ee186458ec68e34198 -SHA512 (pcre2-10.46.zip) = 1381ba2fe352ba33b90c416c25d2ee057f167fae3ecd9a56743ee2d381fd5793cd65dec07018ed77ce8576eaac993498ad6824cb58bf9fae2f5756881f4a9f9b +SHA512 (pcre2-10.47.zip) = e71fdb0d2d84d215ffd4c8ab4fe665a11e8fcc7db18fd4f43c655bca767665064fd65a8982a83d4f375f25f24c7482345dcb52e0bf427a14ff12d103222e1023 From ffa908b2f81c441e18b0707cb6baaa088be81ae7 Mon Sep 17 00:00:00 2001 From: Pavol Sloboda Date: Thu, 4 Jun 2026 09:51:43 +0200 Subject: [PATCH 3/4] Rebase to 10.11.18 Upstream Release notes: https://mariadb.com/docs/release-notes/community-server/10.11/10.11.18 Upstream Changelog: https://mariadb.com/docs/release-notes/community-server/changelogs/10.11/10.11.18 Resolves: RHEL-183086 --- mariadb10.11.spec | 7 +++++-- rh-skipped-tests-base.list | 5 +++++ sources | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/mariadb10.11.spec b/mariadb10.11.spec index e6452ac..0579936 100644 --- a/mariadb10.11.spec +++ b/mariadb10.11.spec @@ -1,6 +1,6 @@ # Plain package name for cases, where %%{name} differs (e.g. for versioned packages) %global majorname mariadb -%define package_version 10.11.17 +%define package_version 10.11.18 %define majorversion %(echo %{package_version} | cut -d'.' -f1-2 ) # Set if this package will be the default one in distribution @@ -15,7 +15,7 @@ # The last version on which the full testsuite has been run # In case of further rebuilds of that version, don't require full testsuite to be run # run only "main" suite -%global last_tested_version 10.11.17 +%global last_tested_version 10.11.18 # Set to 1 to force run the testsuite even if it was already tested in current version %global force_run_testsuite 0 @@ -1812,6 +1812,9 @@ fi %endif %changelog +* Wed Jun 03 2026 Pavol Sloboda - 3:10.11.18-1 +- Rebase to 10.11.18 + * Tue May 26 2026 Pavol Sloboda - 3:10.11.17-1 - Rebase to 10.11.17 diff --git a/rh-skipped-tests-base.list b/rh-skipped-tests-base.list index 4dcdb71..d982c60 100644 --- a/rh-skipped-tests-base.list +++ b/rh-skipped-tests-base.list @@ -18,6 +18,8 @@ sys_vars.slave_parallel_threads_basic : # Expected to fail, the plugin is not build with server, but 'mariadb-connector-c' instead plugins.auth_ed25519 : plugins.multiauth : +plugins.mdev38431 : +plugins.mdev38550 : # ------------------------------ perfschema.nesting : #1399847 @@ -125,3 +127,6 @@ encryption.compressed_import_tablespace : # Unstable since 10.11.11 parts.partition_alter1_1_2_innodb : + +# Fails since 10.11.17 +main.chained_ssl_certificates : diff --git a/sources b/sources index 1f929a3..3b860e6 100755 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (mariadb-10.11.17.tar.gz) = 788803b15afbb6193111774a233d0db0604f27ebae3b4b439368e2d7caeffb662846e530fa65f453a6d77541cedb99112ea319c7c0c2ce5074c32aefb06a51aa +SHA512 (mariadb-10.11.18.tar.gz) = 45fa3c746138aa51b55d61efe11d44b0476fdcb104d5a40929ca2910145668ae749664e2afed7f9d59825d5b2b14e920c012513a4efa4eb0f8af1607d44ae31b SHA512 (fmt-11.0.2.zip) = 06eba9a2a8d1c2269801e10a00ed26a9344b79bca0391a6b10f35e9716682f8345125fceb96e9ca36ffbd4c0558b0e63e4c45a9dff09a8ee186458ec68e34198 SHA512 (pcre2-10.47.zip) = e71fdb0d2d84d215ffd4c8ab4fe665a11e8fcc7db18fd4f43c655bca767665064fd65a8982a83d4f375f25f24c7482345dcb52e0bf427a14ff12d103222e1023 From e4e547d11278f105b4cb507f83b83487763c0529 Mon Sep 17 00:00:00 2001 From: Pavol Sloboda Date: Wed, 10 Jun 2026 09:23:29 +0200 Subject: [PATCH 4/4] Added the adjust setting the dbver context to mariadb-10.11 to ensure that mariadb-11.8 only tests are not being run Related: RHEL-183086 --- plans.fmf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plans.fmf b/plans.fmf index f86a978..8e064e1 100644 --- a/plans.fmf +++ b/plans.fmf @@ -13,6 +13,8 @@ /centos-stream: environment: BUILD_PACKAGE: mariadb-server + context: + dbver: mariadb-10.11 plan: import: url: https://gitlab.com/redhat/centos-stream/tests/mariadb @@ -25,4 +27,3 @@ import: url: https://gitlab.com/redhat/centos-stream/tests/mariadb name: /plans/versioned/galera-single-host -