From 00f95f1b04bc5688f1606470be8576c322b36fd3 Mon Sep 17 00:00:00 2001 From: AlmaLinux RelEng Bot Date: Thu, 25 Jun 2026 07:20:21 -0400 Subject: [PATCH] import CS git mysql-8.4.9-1.el9 --- .gitignore | 2 +- .mysql.metadata | 2 +- SOURCES/mysql-check-socket.sh | 0 SOURCES/mysql-prepare-db-dir.sh | 0 SOURCES/mysql-scripts-common.sh | 0 SOURCES/mysql-wait-stop.sh | 0 SOURCES/mysql.tmpfiles.d.in | 7 +++++++ SOURCES/mysql_config_multilib.sh | 0 SPECS/mysql.spec | 23 +++++++++++++++++++++-- 9 files changed, 30 insertions(+), 4 deletions(-) mode change 100755 => 100644 SOURCES/mysql-check-socket.sh mode change 100755 => 100644 SOURCES/mysql-prepare-db-dir.sh mode change 100755 => 100644 SOURCES/mysql-scripts-common.sh mode change 100755 => 100644 SOURCES/mysql-wait-stop.sh mode change 100755 => 100644 SOURCES/mysql_config_multilib.sh diff --git a/.gitignore b/.gitignore index 6086e81..4e445ea 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/mysql-8.4.8.tar.gz +SOURCES/mysql-8.4.9.tar.gz diff --git a/.mysql.metadata b/.mysql.metadata index 978a8bc..26d5120 100644 --- a/.mysql.metadata +++ b/.mysql.metadata @@ -1 +1 @@ -c5f62e6f4dce6371c4c17f450e4a3334e359b47d SOURCES/mysql-8.4.8.tar.gz +e24591769c63e1317de79e6d2b25ebf81a3ae447 SOURCES/mysql-8.4.9.tar.gz diff --git a/SOURCES/mysql-check-socket.sh b/SOURCES/mysql-check-socket.sh old mode 100755 new mode 100644 diff --git a/SOURCES/mysql-prepare-db-dir.sh b/SOURCES/mysql-prepare-db-dir.sh old mode 100755 new mode 100644 diff --git a/SOURCES/mysql-scripts-common.sh b/SOURCES/mysql-scripts-common.sh old mode 100755 new mode 100644 diff --git a/SOURCES/mysql-wait-stop.sh b/SOURCES/mysql-wait-stop.sh old mode 100755 new mode 100644 diff --git a/SOURCES/mysql.tmpfiles.d.in b/SOURCES/mysql.tmpfiles.d.in index d2c4b31..097295c 100644 --- a/SOURCES/mysql.tmpfiles.d.in +++ b/SOURCES/mysql.tmpfiles.d.in @@ -1 +1,8 @@ d @PID_FILE_DIR@ 0755 mysql mysql - + +# Rules for ephemeral file systems (ImageMode) +d /var/lib/mysql 0755 mysql mysql - +d /var/log/mysql 0750 mysql mysql - +f /var/log/mysql/mysql.log 0640 mysql mysql - +d /var/lib/mysql-files 0750 mysql mysql - +d /var/lib/mysql-keyring 0700 mysql mysql - diff --git a/SOURCES/mysql_config_multilib.sh b/SOURCES/mysql_config_multilib.sh old mode 100755 new mode 100644 diff --git a/SPECS/mysql.spec b/SPECS/mysql.spec index 37d682f..2d3e962 100644 --- a/SPECS/mysql.spec +++ b/SPECS/mysql.spec @@ -2,7 +2,7 @@ ExcludeArch: %{ix86} # Name of the package without any prefixes %global majorname mysql -%global package_version 8.4.8 +%global package_version 8.4.9 %global majorversion %(echo %{package_version} | cut -d'.' -f1-2 ) %global pkgnamepatch mysql @@ -21,7 +21,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.4.8 +%global last_tested_version 8.4.9 # Set to 1 to force run the testsuite even if it was already tested in current version %global force_run_testsuite 0 @@ -673,6 +673,13 @@ install -D -p -m 644 %{_vpath_builddir}/scripts/mysql@.service %{buildroot}%{_un install -D -p -m 0644 %{_vpath_builddir}/scripts/mysql.tmpfiles.d %{buildroot}%{_tmpfilesdir}/%{daemon_name}.conf rm -r %{buildroot}%{_tmpfilesdir}/mysql.conf +# Create a sysusers.d config file +# We no longer enforce the hardcoded UID/GID 27 +mkdir -p %{buildroot}%{_sysusersdir} +cat > %{buildroot}%{_sysusersdir}/%{name}.conf << EOF +u mysql 27 'MariaDB and MySQL Server' %{dbdatadir} - +EOF + # helper scripts for service starting install -D -p -m 755 %{_vpath_builddir}/scripts/mysql-prepare-db-dir %{buildroot}%{_libexecdir}/mysql-prepare-db-dir install -p -m 755 %{_vpath_builddir}/scripts/mysql-wait-stop %{buildroot}%{_libexecdir}/mysql-wait-stop @@ -992,11 +999,15 @@ popd %{_libexecdir}/mysql-scripts-common %{_tmpfilesdir}/%{daemon_name}.conf +%{_sysusersdir}/%{name}.conf + +# Remember to also update the mysql.tmpfiles.d.in file when updating these permissions %attr(0755,mysql,mysql) %dir %{dbdatadir} %attr(0750,mysql,mysql) %dir %{_localstatedir}/lib/mysql-files %attr(0700,mysql,mysql) %dir %{_localstatedir}/lib/mysql-keyring %attr(0755,mysql,mysql) %dir %{pidfiledir} %attr(0750,mysql,mysql) %dir %{logfiledir} + %config(noreplace) %{logrotateddir}/%{daemon_name} %if %{with devel} @@ -1061,6 +1072,8 @@ popd %{_libdir}/mysql/plugin/component_test_sensitive_system_variables.so %{_libdir}/mysql/plugin/component_test_server_telemetry_metrics.so %{_libdir}/mysql/plugin/component_test_server_telemetry_traces.so +%{_libdir}/mysql/plugin/component_test_server_telemetry_logs_client.so +%{_libdir}/mysql/plugin/component_test_server_telemetry_logs_export.so %{_libdir}/mysql/plugin/component_test_status_var_reader.so %{_libdir}/mysql/plugin/component_test_status_var_service_int.so %{_libdir}/mysql/plugin/component_test_status_var_service_reg_only.so @@ -1132,9 +1145,15 @@ popd %endif %changelog +* Wed May 06 2026 Michal Schorm - 8.4.9-1 +- Rebase to 8.4.9 + * Thu Mar 05 2026 Michal Schorm - 8.4.8-1 - Rebase to 8.4.8 +* Mon Mar 02 2026 Lukas Javorsky - 8.4.7-2 +- Revert to soft static allocation of MariaDB and MySQL sysusers.d files + * Thu Oct 30 2025 Pavol Sloboda - 8.4.7-1 - Rebase to 8.4.7