[vtun/f16] removed xinetd and sysvinit support

[Gabriel L. Somlo]

commit 2315b9e6b1146405efecb989e211a344e5bb854c
Author: Gabriel L. Somlo <somlo at hedwig.ini.cmu.edu>
Date:   Sat Sep 10 18:20:44 2011 -0400

    removed xinetd and sysvinit support

 vtun.spec  |   29 +++++----------
 vtund.init |  110 ------------------------------------------------------------
 2 files changed, 10 insertions(+), 129 deletions(-)
---
diff --git a/vtun.spec b/vtun.spec
index 4d4c20a..1821e3c 100644
--- a/vtun.spec
+++ b/vtun.spec
@@ -1,18 +1,14 @@
 Name: vtun
 Version: 3.0.1
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: Virtual tunnel over TCP/IP networks
 License: GPLv2+
 Group: System Environment/Daemons
 Url: http://vtun.sourceforge.net
 Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Source1: vtund.init
-Source2: vtun.socket
-Source3: vtun.service
+Source1: vtun.socket
+Source2: vtun.service
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: xinetd
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 Requires(preun): systemd-units
 Requires(postun): /sbin/service 
@@ -38,11 +34,8 @@ require modification to any kernel parts.
 
 %install
 %{__rm} -rf %{buildroot}
-%{__install} -D -m 0755 -p %{SOURCE1} %{buildroot}/%{_initrddir}/vtund
-%{__install} -D -m 0644 -p %{SOURCE2} %{buildroot}/%{_unitdir}/vtun.socket
+%{__install} -D -m 0644 -p %{SOURCE1} %{buildroot}/%{_unitdir}/vtun.socket
 %{__install} -D -m 0644 -p %{SOURCE2} %{buildroot}/%{_unitdir}/vtun.service
-%{__install} -D -m 0644 -p scripts/vtund.xinetd %{buildroot}/%{_sysconfdir}/xinetd.d/vtun
-%{__sed} -i 's:/usr/local:%{_prefix}:' %{buildroot}/%{_sysconfdir}/xinetd.d/vtun
 %{__make} install DESTDIR=%{buildroot} INSTALL_OWNER= INSTALL="/usr/bin/install -p"
 
 %clean
@@ -50,22 +43,19 @@ require modification to any kernel parts.
 
 %post
 if [ $1 -eq 1 ]; then
-	/sbin/chkconfig --add vtund || :
+	/bin/systemctl daemon-reload >/dev/null 2>&1 || :
 fi
 
 %preun
 if [ $1 -eq 0 ]; then
-	/sbin/service vtund stop >/dev/null 2>&1 || :
-	/sbin/chkconfig --del vtund || :
-	/bin/systemctl disable vtun.socket >/dev/null 2>&1 || :
+	/bin/systemctl --no-reload disable vtun.socket >/dev/null 2>&1 || :
+	/bin/systemctl --no-reload disable vtun.service >/dev/null 2>&1 || :
 	/bin/systemctl stop vtun.socket >/dev/null 2>&1 || :
-	/bin/systemctl disable vtun.service >/dev/null 2>&1 || :
 	/bin/systemctl stop vtun.service >/dev/null 2>&1 || :
 fi
 
 %postun
 if [ $1 -eq 1 ]; then
-	/sbin/service vtund condrestart >/dev/null 2>&1 || :
 	/bin/systemctl try-restart vtun.socket >/dev/null 2>&1 || :
 	/bin/systemctl try-restart vtun.service >/dev/null 2>&1 || :
 fi
@@ -74,8 +64,6 @@ fi
 %defattr(-,root,root,-)
 %doc ChangeLog Credits FAQ README README.LZO README.Setup README.Shaper TODO vtund.conf
 %config(noreplace) %{_sysconfdir}/vtund.conf
-%config(noreplace) %{_sysconfdir}/xinetd.d/vtun
-%{_initrddir}/vtund
 /lib/systemd/system/vtun.socket
 /lib/systemd/system/vtun.service
 %{_sbindir}/vtund
@@ -86,6 +74,9 @@ fi
 %{_mandir}/man8/vtund.8*
 
 %changelog
+* Sat Sep 10 2011 Gabriel Somlo <somlo at cmu.edu> 3.0.1-12
+- removed xinetd and sysvinit support
+
 * Sat Sep 10 2011 Gabriel Somlo <somlo at cmu.edu> 3.0.1-11
 - update support for systemd (#737195)