From a8573409c61f86fdae7e8eb3197cfb19d4e6aa4ddc16930fe1394c08cb5b15f5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 May 2018 15:29:38 +0000 Subject: [PATCH 1/2] Don't start/stop parameterized systemd units in pre/post actions. These units cannot be used in such a way and the attempt leads to a confusing "failed to try-restart" error message. [bsc#1089088] OBS-URL: https://build.opensuse.org/package/show/network/vsftpd?expand=0&rev=128 --- vsftpd.changes | 7 +++++++ vsftpd.spec | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/vsftpd.changes b/vsftpd.changes index f284929..e2461d7 100644 --- a/vsftpd.changes +++ b/vsftpd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed May 16 15:25:02 UTC 2018 - psimons@suse.com + +- Don't start/stop parameterized systemd units in pre/post actions. + These units cannot be used in such a way and the attempt leads to + a confusing "failed to try-restart" error message. [bsc#1089088] + ------------------------------------------------------------------- Wed Apr 25 06:32:25 UTC 2018 - psimons@suse.com diff --git a/vsftpd.spec b/vsftpd.spec index 15cc783..8f60847 100644 --- a/vsftpd.spec +++ b/vsftpd.spec @@ -185,19 +185,19 @@ install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/s %pre getent passwd ftpsecure >/dev/null || useradd -r -g nobody -s /bin/false -c "Secure FTP User" -d %{_localstatedir}/lib/empty ftpsecure %if %{with_systemd} -%service_add_pre %{name}.service %{name}@.service %{name}.socket +%service_add_pre %{name}.service %{name}.socket %endif %preun %if %{with_systemd} -%service_del_preun %{name}.service %{name}@.service %{name}.socket +%service_del_preun %{name}.service %{name}.socket %else %stop_on_removal %{name} %endif %post %if %{with_systemd} -%service_add_post %{name}.service %{name}@.service %{name}.socket +%service_add_post %{name}.service %{name}.socket %else %insserv_cleanup %restart_on_update %{name} @@ -208,7 +208,7 @@ getent passwd ftpsecure >/dev/null || useradd -r -g nobody -s /bin/false -c "Sec %postun %if %{with_systemd} -%service_del_postun %{name}.service %{name}@.service %{name}.socket +%service_del_postun %{name}.service %{name}.socket %else %insserv_cleanup %restart_on_update %{name} From de62ebfe5cb03ccdc7eae69b48fdbb9d0de12c241d21582238fc11af6f467410 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 May 2018 15:36:35 +0000 Subject: [PATCH 2/2] Fix change log. OBS-URL: https://build.opensuse.org/package/show/network/vsftpd?expand=0&rev=129 --- vsftpd.changes | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/vsftpd.changes b/vsftpd.changes index e2461d7..33b0f9f 100644 --- a/vsftpd.changes +++ b/vsftpd.changes @@ -2,8 +2,9 @@ Wed May 16 15:25:02 UTC 2018 - psimons@suse.com - Don't start/stop parameterized systemd units in pre/post actions. - These units cannot be used in such a way and the attempt leads to - a confusing "failed to try-restart" error message. [bsc#1089088] + These units cannot be used without an explicit parameter and + attempts to do so lead to a confusing "failed to try-restart" + error message. [bsc#1093179, bsc#1010177] ------------------------------------------------------------------- Wed Apr 25 06:32:25 UTC 2018 - psimons@suse.com