From 6bfb03fe57c61a942d1ab322287429c4d3af4f5ea3458868c0ac321ec93888cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 14 Jun 2017 11:44:16 +0000 Subject: [PATCH] - Conditionally install xinetd service only on older releases * On current distributions we support the same functionality via systemd socket activation OBS-URL: https://build.opensuse.org/package/show/network/vsftpd?expand=0&rev=113 --- vsftpd.changes | 7 +++++++ vsftpd.spec | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/vsftpd.changes b/vsftpd.changes index 8b20585..c4f2b0c 100644 --- a/vsftpd.changes +++ b/vsftpd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jun 14 11:42:26 UTC 2017 - tchvatal@suse.com + +- Conditionally install xinetd service only on older releases + * On current distributions we support the same functionality + via systemd socket activation + ------------------------------------------------------------------- Mon Jun 12 17:57:38 UTC 2017 - daniel.molkentin@suse.com diff --git a/vsftpd.spec b/vsftpd.spec index df8f66c..6f2f3dc 100644 --- a/vsftpd.spec +++ b/vsftpd.spec @@ -138,7 +138,9 @@ mkdir -p %{buildroot}%{_datadir}/empty cp %{SOURCE4} . install -D -m 755 %{name} %{buildroot}%{_sbindir}/%{name} install -D -m 600 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf +%if 0%{?suse_version} < 1330 install -D -m 600 xinetd.d/%{name} %{buildroot}%{_sysconfdir}/xinetd.d/%{name} +%endif install -D -m 644 $RPM_SOURCE_DIR/%{name}.pam %{buildroot}%{_sysconfdir}/pam.d/%{name} install -D -m 644 $RPM_SOURCE_DIR/%{name}.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name} install -D -m 644 %{name}.conf.5 %{buildroot}/%{_mandir}/man5/%{name}.conf.5 @@ -196,7 +198,9 @@ getent passwd ftpsecure >/dev/null || useradd -r -g nobody -s /bin/false -c "Sec %{_sbindir}/%{name} %{_sbindir}/rc%{name} %dir %{_datadir}/empty +%if 0%{?suse_version} < 1330 %config(noreplace) %{_sysconfdir}/xinetd.d/%{name} +%endif %config(noreplace) %{_sysconfdir}/%{name}.conf %config %{_sysconfdir}/pam.d/%{name} %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}