From d9f9c9c58e04b0386ec9d6af8362c7eb9a4cfea8 Mon Sep 17 00:00:00 2001 From: Honza Horak Date: Fri, 13 Jul 2018 09:23:38 +0200 Subject: [PATCH] Move mysqld back to /usr/libexec, and create a symlink in /usr/sbin This is done to make SELinux happy again (because correct context is only defined for /usr/libexec/mysqld) and also because of back-ward compatibility, that users might have /usr/libexec/mysqld path hard-coded already). --- community-mysql.spec | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/community-mysql.spec b/community-mysql.spec index 298385a..1456cfd 100644 --- a/community-mysql.spec +++ b/community-mysql.spec @@ -80,7 +80,7 @@ Name: community-mysql Version: 8.0.11 -Release: 3%{?with_debug:.debug}%{?dist} +Release: 4%{?with_debug:.debug}%{?dist} Summary: MySQL client programs and shared libraries URL: http://www.mysql.com @@ -594,8 +594,14 @@ chmod 644 %{buildroot}%{logrotateddir}/%{daemon_name} mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d echo "%{_libdir}/mysql" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf +# for back-ward compatibility and SELinux, let's keep the mysqld in libexec +# and just create a symlink in /usr/sbin +mv %{buildroot}%{_bindir}/mysqld %{buildroot}%{_libexecdir}/mysqld +mkdir -p %{buildroot}%{_sbindir} +ln -s %{_libexecdir}/mysqld %{buildroot}%{_sbindir}/mysqld + %if %{with debug} -mv %{buildroot}%{_bindir}/mysqld-debug %{buildroot}%{_bindir}/mysqld +mv %{buildroot}%{_bindir}/mysqld-debug %{buildroot}%{_libexecdir}/mysqld %endif # Back to src dir @@ -833,7 +839,8 @@ fi %config(noreplace) %{_sysconfdir}/my.cnf.d/%{pkg_name}-server.cnf -%{_bindir}/mysqld +%{_sbindir}/mysqld +%{_libexecdir}/mysqld %{_libdir}/mysql/INFO_SRC %{_libdir}/mysql/INFO_BIN @@ -922,6 +929,9 @@ fi %endif %changelog +* Thu Jul 12 2018 Honza Horak - 8.0.11-4 +- Move mysqld back to /usr/libexec, and create a symlink in /usr/sbin + * Thu Jul 12 2018 Fedora Release Engineering - 8.0.11-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild