From 9e17c9d164e11dcc6e9bfb76a61f4ddac60c8d91 Mon Sep 17 00:00:00 2001 From: AlmaLinux RelEng Bot Date: Wed, 1 Jul 2026 09:10:43 -0400 Subject: [PATCH] import CS git mariadb-10.11.18-1.el9 --- .gitignore | 2 +- .mariadb.metadata | 2 +- SOURCES/pcre_bundling.patch | 17 +++++++---------- SOURCES/rh-skipped-tests-base.list | 6 ++++++ SPECS/mariadb.spec | 20 +++++++++++++++----- 5 files changed, 30 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 100aaf3..393bede 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ SOURCES/fmt-11.0.2.zip -SOURCES/mariadb-10.11.15.tar.gz +SOURCES/mariadb-10.11.18.tar.gz diff --git a/.mariadb.metadata b/.mariadb.metadata index 17bda2a..fb9fdf2 100644 --- a/.mariadb.metadata +++ b/.mariadb.metadata @@ -1,2 +1,2 @@ bca4fc0ca0cff346ac2a77a3ae02c415c0e1fce6 SOURCES/fmt-11.0.2.zip -997520ac1c9a0a438d4b9c9df17e73fcee96fc28 SOURCES/mariadb-10.11.15.tar.gz +7c7c0ce535cc5b7e0d29387bb4cae6c79ec75d88 SOURCES/mariadb-10.11.18.tar.gz diff --git a/SOURCES/pcre_bundling.patch b/SOURCES/pcre_bundling.patch index 1ad84c9..c97c838 100644 --- a/SOURCES/pcre_bundling.patch +++ b/SOURCES/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/rh-skipped-tests-base.list b/SOURCES/rh-skipped-tests-base.list index 29797a7..3e493df 100644 --- a/SOURCES/rh-skipped-tests-base.list +++ b/SOURCES/rh-skipped-tests-base.list @@ -74,3 +74,9 @@ innodb.log_file_name : # Related: RHEL-130723 main.ssl_cipher : +# Fails since 10.11.17 +main.chained_ssl_certificates : + +# Fails since 10.11.18 +main.chained_ssl_certificates : +main.ssl_cipher : diff --git a/SPECS/mariadb.spec b/SPECS/mariadb.spec index f4a7e2f..80d6ce1 100644 --- a/SPECS/mariadb.spec +++ b/SPECS/mariadb.spec @@ -14,7 +14,7 @@ ExcludeArch: %{ix86} # 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.18 # Set to 1 to force run the testsuite even if it was already tested in current version %global force_run_testsuite 0 @@ -114,7 +114,7 @@ ExcludeArch: %{ix86} # 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. @@ -160,8 +160,8 @@ ExcludeArch: %{ix86} %global sameevr %{epoch}:%{version}-%{release} Name: mariadb -Version: 10.11.15 -Release: 2%{?with_debug:.debug}%{?dist} +Version: 10.11.18 +Release: 1%{?with_debug:.debug}%{?dist} Epoch: 3 Summary: A very fast and robust SQL database server @@ -1427,7 +1427,6 @@ fi %if %{with galera} %files server-galera -%doc Docs/README-wsrep %license LICENSE.clustercheck %{_bindir}/clustercheck %{_bindir}/galera_new_cluster @@ -1709,6 +1708,8 @@ fi %endif %{_bindir}/{mysql_client_test,mysqltest,mariadb-client-test,mariadb-test} %{_bindir}/my_safe_process +%dir %{_libdir}/%{pkg_name}/plugin +%dir %{_libdir}/%{pkg_name}/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* @@ -1717,6 +1718,15 @@ 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 + +* 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