rpms/ip-sentinel/devel ip-sentinel.upstart, NONE, 1.1 ip-sentinel.spec, 1.16, 1.17
Enrico Scholz
ensc at fedoraproject.org
Sun Mar 1 16:49:42 UTC 2009
Author: ensc
Update of /cvs/extras/rpms/ip-sentinel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3286
Modified Files:
ip-sentinel.spec
Added Files:
ip-sentinel.upstart
Log Message:
updated
--- NEW FILE ip-sentinel.upstart ---
# NOTE: you will have to create an 'ips.cfg' file in ~ip-sentinel/
# before service can be enabled
### Uncomment the 'start' lines below
#start on starting\ local
#start on starting local
stop on runlevel 0
stop on runlevel 1
stop on runlevel 6
respawn
exec /usr/sbin/ip-sentinel -u ip-sentinel -g ip-sentinel -n eth0
Index: ip-sentinel.spec
===================================================================
RCS file: /cvs/extras/rpms/ip-sentinel/devel/ip-sentinel.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ip-sentinel.spec 25 Feb 2009 07:37:30 -0000 1.16
+++ ip-sentinel.spec 1 Mar 2009 16:49:11 -0000 1.17
@@ -41,7 +41,7 @@
Summary: Tool to prevent unauthorized usage of IP addresses
Name: ip-sentinel
Version: 0.12
-Release: %release_func 13
+Release: %release_func 14
License: GPLv2
Group: System Environment/Daemons
URL: http://www.nongnu.org/ip-sentinel/
@@ -50,35 +50,48 @@
Patch0: ip-sentinel-0.12-pidfile.patch
BuildRoot: %_tmppath/%name-%version-%release-buildroot
Requires: init(ip-sentinel)
-Provides: user(%username)
-Provides: group(%username)
+Provides: user(%username) = 1
+Provides: group(%username) = 1
BuildRequires: which
BuildRequires: fedora-usermgmt-devel
%{?FE_USERADD_REQ}
%{?with_dietlibc:BuildRequires: dietlibc}
-
-%package sysv
+%package sysvinit
Summary: SysV initscripts for ip-sentinel
Group: System Environment/Base
-Provides: init(ip-sentinel)
+Provides: init(ip-sentinel) = sysv
Requires(preun): %name = %version-%release
Requires(postun): %name = %version-%release
Requires(preun): initscripts
Requires(postun): initscripts
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig
+Provides: %name-sysv = %version-%release
+Obsoletes: %name-sysv < %version-%release
+BuildArch: noarch
+%package upstart
+Summary: upstart initscripts for ip-sentinel
+Group: System Environment/Base
+Source10: ip-sentinel.upstart
+Provides: init(%name) = upstart
+Requires: %name = %version-%release
+# implicates a conflict with upstart 0.5+
+Requires(pre): /etc/event.d
+Requires(post): /usr/bin/killall
+Requires(postun): /sbin/initctl
+BuildArch: noarch
%package minit
Summary: minit initscripts for ip-sentinel
Group: System Environment/Base
-Provides: init(ip-sentinel)
+Provides: init(%name) = minit
Requires: %name = %version-%release
Requires(pre): minit-setup
Requires(postun): minit-setup
-
+BuildArch: noarch
%description
@@ -89,7 +102,7 @@
invalid MAC, rendering the IP unreachable.
-%description sysv
+%description sysvinit
IP Sentinel is a tool that tries to prevent unauthorized usage of IP
addresses.
@@ -97,6 +110,14 @@
with a SysV initconcept.
+%description upstart
+IP Sentinel is a tool that tries to prevent unauthorized usage of IP
+addresses.
+
+This package provides the scripts which can be used to start ip-sentinel
+with the upstart initconcept.
+
+
%description minit
IP Sentinel is a tool that tries to prevent unauthorized usage of IP
addresses.
@@ -122,6 +143,7 @@
%__make DESTDIR=$RPM_BUILD_ROOT install install-contrib
%__install -m750 -d $RPM_BUILD_ROOT%homedir
+%__install -pD -m 0644 %SOURCE10 $RPM_BUILD_ROOT/etc/event.d/ip-sentinel
%{!?with_minit:rm -rf $RPM_BUILD_ROOT%minitsvcdir}
@@ -145,19 +167,26 @@
%__fe_groupdel %username &>/dev/null || :
-%post sysv
+%post sysvinit
/sbin/chkconfig --add %service
-%preun sysv
+%preun sysvinit
if test "$1" = "0"; then
%_initrddir/%service stop >/dev/null
/sbin/chkconfig --del %service
fi
-%postun sysv
+%postun sysvinit
test "$1" = 0 || %_initrddir/%service condrestart &>/dev/null
+%post upstart
+/usr/bin/killall -u %username ip-sentinel 2>/dev/null || :
+
+%preun upstart
+test "$1" != "0" || /sbin/initctl -q stop ip-sentinel || :
+
+
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README THANKS
@@ -166,12 +195,17 @@
%attr(-,root,%username) %homedir
-%files sysv
+%files sysvinit
%defattr(-,root,root,-)
%config %_initrddir/*
%config(noreplace) %_sysconfdir/sysconfig/*
+%files upstart
+%defattr(-,root,root,-)
+%config(noreplace) /etc/event.d/*
+
+
%if 0%{?with_minit:1}
%files minit
@@ -185,6 +219,11 @@
%changelog
+* Sun Mar 1 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.12-14
+- added -upstart subpackage
+- renamed -sysv subpackage to -sysvinit to let -upstart win the
+ default dependency resolving
+
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
More information about the scm-commits
mailing list