From 81b24969113a86e4625863e03d47d0be094ef68b Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Wed, 14 Aug 2024 02:34:28 +0200 Subject: [PATCH] Rebase to 10.11.9 --- mariadb-libfmt.patch | 6 +++--- mariadb10.11.spec | 15 +++++++++------ rh-skipped-tests-base.list | 4 ++++ rh-skipped-tests-s390.list | 3 +++ sources | 4 ++-- 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/mariadb-libfmt.patch b/mariadb-libfmt.patch index ee97d2c..d5dabf1 100644 --- a/mariadb-libfmt.patch +++ b/mariadb-libfmt.patch @@ -24,8 +24,8 @@ We pre-download the sources archive and supply the CMake with it, instead of the ExternalProject_Add( libfmt PREFIX "${dir}" -- URL "https://github.com/fmtlib/fmt/archive/refs/tags/8.0.1.zip" -+ URL "file:///${dir}/8.0.1.zip" - URL_MD5 e77873199e897ca9f780479ad68e25b1 +- URL "https://github.com/fmtlib/fmt/releases/download/11.0.1/fmt-11.0.1.zip" ++ URL "file:///${dir}/fmt-11.0.1.zip" + URL_MD5 5f3915e2eff60e7f70c558120592100d INSTALL_COMMAND "" CONFIGURE_COMMAND "" diff --git a/mariadb10.11.spec b/mariadb10.11.spec index f1a586a..592a3a1 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.8 +%define package_version 10.11.9 %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.8 +%global last_tested_version 10.11.9 # Set to 1 to force run the testsuite even if it was already tested in current version %global force_run_testsuite 0 @@ -120,14 +120,14 @@ %bcond_without unbundled_pcre %else %bcond_with unbundled_pcre -%global pcre_bundled_version 10.43 +%global pcre_bundled_version 10.44 %endif # 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. %bcond bundled_fmt 1 %if %{with bundled_fmt} -%global fmt_bundled_version 8.0.1 +%global fmt_bundled_version 11.0.1 %endif # Include systemd files @@ -157,7 +157,7 @@ Name: %{majorname}%{majorversion} Version: %{package_version} -Release: 5%{?with_debug:.debug}%{?dist} +Release: 1%{?with_debug:.debug}%{?dist} Epoch: 3 Summary: A very fast and robust SQL database server @@ -166,7 +166,7 @@ License: ( GPL-2.0-only OR Apache-2.0 ) AND ( GPL-2.0-or-later OR Apach Source0: https://downloads.mariadb.org/interstitial/mariadb-%{version}/source/mariadb-%{version}.tar.gz %if %{with bundled_fmt} -Source1: https://github.com/fmtlib/fmt/archive/refs/tags/8.0.1.zip +Source1: https://github.com/fmtlib/fmt/releases/download/%{fmt_bundled_version}/fmt-%{fmt_bundled_version}.zip %endif Source2: mysql_config_multilib.sh Source3: my.cnf.in @@ -1783,6 +1783,9 @@ fi %endif %changelog +* Tue Aug 13 2024 Michal Schorm - 3:10.11.9-1 +- Rebase to 10.11.9 + * Tue Jul 23 2024 Lumír Balhar - 3:10.11.8-5 - Add new systemtap-sdt-dtrace to build deps diff --git a/rh-skipped-tests-base.list b/rh-skipped-tests-base.list index aebba13..917a139 100644 --- a/rh-skipped-tests-base.list +++ b/rh-skipped-tests-base.list @@ -111,3 +111,7 @@ spider/bugfix.udf_mysql_func_early_init_file : # Fails since 10.11.8 rpl.rpl_get_lock : + +# Fails since 10.11.9 +plugins.feedback_plugin_load : +main.init_connect : diff --git a/rh-skipped-tests-s390.list b/rh-skipped-tests-s390.list index ca850a2..150e3e7 100644 --- a/rh-skipped-tests-s390.list +++ b/rh-skipped-tests-s390.list @@ -10,3 +10,6 @@ innodb_gis.rtree_rollback1 : mariabackup.encrypted_page_corruption : mariabackup.huge_lsn : mariabackup.xb_file_key_management : + +# Fails since 10.11.9 +main.having_cond_pushdown : diff --git a/sources b/sources index 6f65b0c..9f26238 100755 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (mariadb-10.11.8.tar.gz) = 61bdbe4a51adb438335c22bfcf75f59864fa0412c7ed6e938ef73fd602c2ef27131dbeef83cd314f2bea54135c6e8f8646608ff96a7ce6ce2c74f34ef6a8675f -SHA512 (8.0.1.zip) = 53f781e33ffb3bc38d743b81c5755a7d71dce95dcf5cdf23d5b4cf880a8f29189ca1b790272ee8586cbcd552648bae040247e572b2a97cd8b3631c284873f57d +SHA512 (mariadb-10.11.9.tar.gz) = a51680babed106ad52a8a9d57fb1db82fca02fd3eff7ef3f2cc3dd89bd9608e9f78ca5a11335a6be8d22950ca8caf1e859bd19550ab3fe129b73b856674cfdc0 +SHA512 (fmt-11.0.1.zip) = 77aa8371f1cb7f4bbac694fab7612bfba646c9ea784b18f5bfcf84187222e57f60c92f62c30096b9d6d2733790ff0f6ec55d7c024cbbbb3d0c51d9511cc67c19