From 93810c2b4fb676e9f8864c143f2c7add3440522a Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Thu, 20 Feb 2025 03:21:05 +0300 Subject: [PATCH] import mysql-8.0.41-2.el9_5 --- .gitignore | 2 +- .mysql.metadata | 2 +- SOURCES/boost-1.58.0-pool.patch | 8 ++--- ...fix_multiprecision_issue_419-ppc64le.patch | 4 +-- SOURCES/mysql-flush-logrotate.patch | 35 +++++++++++++++++++ SOURCES/mysql-mtr.patch | 8 ++--- SOURCES/rh-skipped-tests-list-base.list | 3 ++ SPECS/mysql.spec | 33 +++++++++++++---- 8 files changed, 76 insertions(+), 19 deletions(-) create mode 100644 SOURCES/mysql-flush-logrotate.patch diff --git a/.gitignore b/.gitignore index 1bb222a..fff2a11 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/mysql-boost-8.0.36.tar.gz +SOURCES/mysql-boost-8.0.41.tar.gz diff --git a/.mysql.metadata b/.mysql.metadata index 2efe297..466e5ea 100644 --- a/.mysql.metadata +++ b/.mysql.metadata @@ -1 +1 @@ -fdbf5b1b37a5d882643695593ca25d0a75eb69ed SOURCES/mysql-boost-8.0.36.tar.gz +7950b1494deb5fbabed8bf0ff09b2d38cac77066 SOURCES/mysql-boost-8.0.41.tar.gz diff --git a/SOURCES/boost-1.58.0-pool.patch b/SOURCES/boost-1.58.0-pool.patch index ed8449e..21be0cc 100644 --- a/SOURCES/boost-1.58.0-pool.patch +++ b/SOURCES/boost-1.58.0-pool.patch @@ -1,7 +1,7 @@ Index: boost/pool/pool.hpp =================================================================== ---- boost/pool/pool.hpp (revision 78317) -+++ boost/pool/pool.hpp (revision 78326) +--- a/boost/pool/pool.hpp (revision 78317) ++++ b/boost/pool/pool.hpp (revision 78326) @@ -27,4 +27,6 @@ #include @@ -88,8 +88,8 @@ Index: boost/pool/pool.hpp // insert it into the list, Index: libs/pool/test/test_bug_6701.cpp =================================================================== ---- libs/pool/test/test_bug_6701.cpp (revision 78326) -+++ libs/pool/test/test_bug_6701.cpp (revision 78326) +--- a/libs/pool/test/test_bug_6701.cpp (revision 78326) ++++ b/libs/pool/test/test_bug_6701.cpp (revision 78326) @@ -0,0 +1,27 @@ +/* Copyright (C) 2012 Étienne Dupuis +* diff --git a/SOURCES/boost-1.76.0-fix_multiprecision_issue_419-ppc64le.patch b/SOURCES/boost-1.76.0-fix_multiprecision_issue_419-ppc64le.patch index 5cd6d40..71552bf 100644 --- a/SOURCES/boost-1.76.0-fix_multiprecision_issue_419-ppc64le.patch +++ b/SOURCES/boost-1.76.0-fix_multiprecision_issue_419-ppc64le.patch @@ -10,8 +10,8 @@ Subject: [PATCH] Update gcc Intel intrinsic usage config. Fixes diff --git a/include/boost/multiprecision/cpp_int/intel_intrinsics.hpp b/include/boost/multiprecision/cpp_int/intel_intrinsics.hpp index eb4624bb4..37717cd51 100644 ---- a/include/boost/multiprecision/cpp_int/intel_intrinsics.hpp -+++ b/include/boost/multiprecision/cpp_int/intel_intrinsics.hpp +--- a/boost/multiprecision/cpp_int/intel_intrinsics.hpp ++++ b/boost/multiprecision/cpp_int/intel_intrinsics.hpp @@ -19,7 +19,11 @@ // If this is GCC/clang, then check that the actual intrinsic exists: // diff --git a/SOURCES/mysql-flush-logrotate.patch b/SOURCES/mysql-flush-logrotate.patch new file mode 100644 index 0000000..48eff40 --- /dev/null +++ b/SOURCES/mysql-flush-logrotate.patch @@ -0,0 +1,35 @@ +--- mysql-8.0.40/packaging/rpm-common/mysql.logrotate.in 2024-09-18 12:08:24.000000000 +0200 ++++ mysql-8.0.40/packaging/rpm-common/mysql.logrotate.in_patched 2025-02-13 16:00:32.325677977 +0100 +@@ -5,18 +5,6 @@ + # [mysqld] + # log-error=@LOGFILE_RPM@ + # +-# For the mysqladmin commands below to work, root account +-# password is required. Use mysql_config_editor(1) to store +-# authentication credentials in the encrypted login path file +-# ~/.mylogin.cnf +-# +-# Example usage: +-# +-# mysql_config_editor set --login-path=client --user=root --host=localhost --password +-# +-# When these actions has been done, un-comment the following to +-# enable rotation of mysqld's log error. +-# + + #@LOGFILE_RPM@ { + # create 640 mysql mysql +@@ -26,11 +14,7 @@ + # missingok + # compress + # postrotate +-# # just if mysqld is really running +-# if test -x @bindir@/mysqladmin && \ +-# @bindir@/mysqladmin ping &>/dev/null +-# then +-# @bindir@/mysqladmin flush-logs +-# fi ++# # SIGUSR1 makes the daemon to flush the logs, no need to connect through mysqladmin ++# @bindir@/kill -USR1 $(systemctl show --property MainPID --value mysqld) + # endscript + #} diff --git a/SOURCES/mysql-mtr.patch b/SOURCES/mysql-mtr.patch index f16d6c0..cb847bd 100644 --- a/SOURCES/mysql-mtr.patch +++ b/SOURCES/mysql-mtr.patch @@ -82,9 +82,9 @@ I'm not sure whether the output is synchronous, but even if it wasn'tit still lo diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 26e6c92c..9d85c6d6 100755 ---- a/mysql-test/mysql-test-run.pl -+++ b/mysql-test/mysql-test-run.pl -@@ -3533,17 +3533,6 @@ sub setup_vardir() { +--- mysql-8.0.39/mysql-test/mysql-test-run.pl 2024-08-11 01:20:12.207260860 +0200 ++++ mysql-8.0.39/mysql-test/mysql-test-run.pl_patched 2024-08-11 20:44:42.230145160 +0200 +@@ -3560,17 +3560,6 @@ sub setup_vardir() { mkpath("$opt_vardir/tmp"); mkpath($opt_tmpdir) if ($opt_tmpdir ne "$opt_vardir/tmp"); @@ -92,7 +92,7 @@ index 26e6c92c..9d85c6d6 100755 - # UNIX domain socket's path far below PATH_MAX. Don't allow that - # to happen. - my $res = -- check_socket_path_length("$opt_tmpdir/mysqld.NN.sock", $opt_parallel); +- check_socket_path_length("$opt_tmpdir/mysqld.NN.sock", $opt_parallel, $tmpdir_path_updated); - if ($res) { - mtr_error("Socket path '$opt_tmpdir' too long, it would be ", - "truncated and thus not possible to use for connection to ", diff --git a/SOURCES/rh-skipped-tests-list-base.list b/SOURCES/rh-skipped-tests-list-base.list index 5d68ba5..7ef4531 100644 --- a/SOURCES/rh-skipped-tests-list-base.list +++ b/SOURCES/rh-skipped-tests-list-base.list @@ -33,3 +33,6 @@ rpl.rpl_fips : BUG#0 binlog.binlog_mysqlbinlog_linux : BUG#0 perfschema.idx_session_connect_attrs : BUG#0 rpl_gtid.mysqldump_bug33630199 : BUG#0 + +# Failing since MySQL 8.0.40 +main.time_zone : BUG#0 diff --git a/SPECS/mysql.spec b/SPECS/mysql.spec index 0e9df91..0bb79da 100644 --- a/SPECS/mysql.spec +++ b/SPECS/mysql.spec @@ -16,7 +16,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 8.0.36 +%global last_tested_version 8.0.41 # Set to 1 to force run the testsuite even if it was already tested in current version %global force_run_testsuite 0 # Aditional SELinux rules @@ -77,8 +77,8 @@ ExcludeArch: %{ix86} %global sameevr %{?epoch:%{epoch}:}%{version}-%{release} Name: mysql -Version: 8.0.36 -Release: 1%{?with_debug:.debug}%{?dist} +Version: 8.0.41 +Release: 2%{?with_debug:.debug}%{?dist} Summary: MySQL client programs and shared libraries URL: http://www.mysql.com @@ -121,6 +121,7 @@ Patch52: %{pkgnamepatch}-rpath.patch Patch53: %{pkgnamepatch}-mtr.patch Patch54: %{pkgnamepatch}-arm32-timer.patch Patch55: %{pkgnamepatch}-c99.patch +Patch56: %{pkgnamepatch}-flush-logrotate.patch # Patches taken from boost 1.59 Patch111: boost-1.58.0-pool.patch @@ -394,12 +395,13 @@ the MySQL sources. %patch -P53 -p1 %patch -P54 -p1 %patch -P55 -p1 +%patch -P56 -p1 # Patch Boost pushd boost/boost_$(echo %{boost_bundled_version}| tr . _) -%patch -P111 -p0 +%patch -P111 -p1 %patch -P112 -p1 -%patch -P113 -p2 +%patch -P113 -p1 popd # generate a list of tests that fail, but are not disabled by upstream @@ -441,7 +443,6 @@ cp %{SOURCE2} %{SOURCE3} %{SOURCE10} %{SOURCE11} %{SOURCE12} \ # so we can't use %%{_datadir} and so forth here. %cmake \ -DBUILD_CONFIG=mysql_release \ - -DFEATURE_SET="community" \ -DINSTALL_LAYOUT=RPM \ -DDAEMON_NAME="%{daemon_name}" \ -DDAEMON_NO_PREFIX="%{daemon_no_prefix}" \ @@ -489,7 +490,6 @@ cp %{SOURCE2} %{SOURCE3} %{SOURCE10} %{SOURCE11} %{SOURCE12} \ %{?with_debug: -DWITH_DEBUG=1} \ %{?with_debug: -DMYSQL_MAINTAINER_MODE=0} \ -DTMPDIR=/var/tmp \ - -DWITH_MYSQLD_LDFLAGS="%{build_ldflags}" \ -DCMAKE_C_LINK_FLAGS="%{build_ldflags}" \ -DCMAKE_CXX_LINK_FLAGS="%{build_ldflags}" \ -DCMAKE_SKIP_INSTALL_RPATH=YES \ @@ -986,6 +986,25 @@ fi %endif %changelog +* Thu Feb 13 2025 Lukas Javorsky - 8.0.41-2 +- Fix patching of logrotate + +* Fri Feb 07 2025 Lukas Javorsky - 8.0.41-1 +- Update to MySQL 8.0.41 + +* Thu Feb 06 2025 Lukas Javorsky - 8.0.40-1 +- Update to MySQL 8.0.40 + +* Thu Feb 06 2025 Lukas Javorsky - 8.0.39-1 +- Rebase to version 8.0.39 + +* Fri Apr 19 2024 Honza Horak - 8.0.37-2 +- Use signal to flush logs when rotating + +* Thu Apr 18 2024 Lars Tangvald - 8.0.37-1 +- Update to MySQL 8.0.37 +- Remove some legacy cmake options + * Wed Jan 03 2024 Lars Tangvald - 8.0.36-1 - Update to MySQL 8.0.36