drop all Upstart hacks

diff --git a/radsecproxy.init b/radsecproxy.init
index 27978ac08b06e160f6b1b9be022f106ea331024f..f8f2b7b889dbd3a796628628328024b3b927ea57 100644 (file)
--- a/radsecproxy.init
+++ b/radsecproxy.init
@@ -20,8 +20,6 @@
 # Get service config
 [ -f /etc/sysconfig/radsecproxy ] && . /etc/sysconfig/radsecproxy
 
-upstart_controlled
-
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
        if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then

diff --git a/radsecproxy.spec b/radsecproxy.spec
index 2fc775c612ac484f7a1a031303067d39036f398a..ceaf149d902b6bd70e220103bab69597e3c5a7d6 100644 (file)
--- a/radsecproxy.spec
+++ b/radsecproxy.spec
@@ -3,14 +3,13 @@
 Summary:       RADIUS proxy that in addition to to usual RADIUS UDP transport, also supports TLS (RadSec)
 Name:          radsecproxy
 Version:       1.6.1
-Release:       1
+Release:       2
 License:       GPLv2+ or BSD-like
 Group:         Networking/Daemons/Radius
 Source0:       http://software.uninett.no/radsecproxy/%{name}-%{version}.tar.gz
 # Source0-md5: 841ec9b1492a7c7ae301a05ab035d85d
 Source1:       %{name}.init
 Source2:       %{name}.logrotate
-Source3:       %{name}.upstart
 Patch0:                %{name}-docbook2x.patch
 URL:           http://software.uninett.no/radsecproxy/
 # For manual creation:
@@ -69,7 +68,6 @@ cp -p radsecproxy.conf-example $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
 
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
-cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/init/%{name}.conf
 
 install -p radsecproxy.conf.5 $RPM_BUILD_ROOT/%{_mandir}/man5
 
@@ -86,12 +84,6 @@ if [ "$1" = "0" ]; then
        /sbin/chkconfig --del %{name}
 fi
 
-%post upstart
-%upstart_post %{name}
-
-%postun upstart
-%upstart_postun %{name}
-
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README
@@ -104,7 +96,3 @@ fi
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
 %{_mandir}/man1/*
 %{_mandir}/man5/*
-
-%files upstart
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) /etc/init/%{name}.conf

diff --git a/radsecproxy.upstart b/radsecproxy.upstart
deleted file mode 100644 (file)
index 9076338..0000000
--- a/radsecproxy.upstart
+++ /dev/null
@@ -1,9 +0,0 @@
-description "RADIUS proxy that in addition to to usual RADIUS UDP transport, also supports TLS (RadSec)"
-
-start on pld.sysinit-done
-stop on pld.shutdown-started
-
-respawn
-exec /usr/sbin/radsecproxy -i /var/run/radsecproxy.pid
-expect daemon
-