[packages/radsecproxy] drop all Upstart hacks
jajcus
jajcus at pld-linux.org
Thu Apr 23 09:38:51 CEST 2015
commit 6ddfbbd0321fff9b646a49cf76255779f9e070c4
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date: Thu Apr 23 09:35:45 2015 +0200
drop all Upstart hacks
radsecproxy.init | 2 --
radsecproxy.spec | 14 +-------------
radsecproxy.upstart | 9 ---------
3 files changed, 1 insertion(+), 24 deletions(-)
---
diff --git a/radsecproxy.spec b/radsecproxy.spec
index 2fc775c..ceaf149 100644
--- 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.init b/radsecproxy.init
index 27978ac..f8f2b7b 100644
--- 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.upstart b/radsecproxy.upstart
deleted file mode 100644
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
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/radsecproxy.git/commitdiff/97b0f481013af9e0b37a9256cd245f2a948a799d
More information about the pld-cvs-commit
mailing list