- Add socket service for vsftpd to avoid the need for xinetd here.

OBS-URL: https://build.opensuse.org/package/show/network/vsftpd?expand=0&rev=62

vsftpd.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon May 26 12:52:56 UTC 2014 - tchvatal@suse.com
+
+- Add socket service for vsftpd to avoid the need for xinetd here.
+
 -------------------------------------------------------------------
 Mon May 26 12:42:21 UTC 2014 - tchvatal@suse.com
 

vsftpd.socket

@@ -0,0 +1,9 @@
+[Unit]
+Conflicts=vsftpd.service
+
+[Socket]
+ListenStream=21
+Accept=yes
+
+[Install]
+WantedBy=sockets.target

vsftpd.spec

@@ -43,7 +43,9 @@ Source4:        README.SUSE
 Source5:        %name.xml
 Source6:        %name.firewall
 Source7:        vsftpd.service
+Source8:        vsftpd@.service
 Source9:        %name.keyring
+Source10:       vsftpd.socket
 Source1000:     https://security.appspot.com/downloads/%{name}-%{version}.tar.gz.asc
 Patch1:         vsftpd-2.0.4-lib64.diff
 Patch3:         vsftpd-2.0.4-xinetd.diff
@@ -135,6 +137,8 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/
 install -m 644 %{S:6} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
 %if 0%{?suse_version} > 1140
 install -D -m 0644 %SOURCE7 %{buildroot}/%{_unitdir}/%{name}.service
+install -D -m 0644 %SOURCE8 %{buildroot}/%{_unitdir}/%{name}@.service
+install -D -m 0644 %SOURCE10 %{buildroot}/%{_unitdir}/%{name}.socket
 %endif
 
 %pre
@@ -175,6 +179,8 @@ fi
 %defattr(-,root,root)
 %if 0%{?suse_version} > 1140
 %{_unitdir}/%{name}.service
+%{_unitdir}/%{name}.socket
+%{_unitdir}/%{name}@.service
 %endif
 /usr/sbin/%name
 /usr/sbin/rc%name

vsftpd@.service

@@ -0,0 +1,8 @@
+[Unit]
+Description=Very Secure FTP Daemon
+
+[Service]
+Type=simple
+ExecStart=/usr/sbin/vsftpd /etc/vsftpd.conf -obackground=NO -olisten=NO -olisten_ipv6=NO
+StandardInput=socket
+SuccessExitStatus=2