rpms/tor/devel tor.upstart,NONE,1.1 tor.spec,1.29,1.30

[Enrico Scholz]

Author: ensc

Update of /cvs/extras/rpms/tor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11437

Modified Files:
	tor.spec 
Added Files:
	tor.upstart 
Log Message:
updated


--- NEW FILE tor.upstart ---
### Uncomment matching 'start' lines below.

### 'starting\ local' and 'starting local' should be uncommented
### together as former is required due to broken Fedora initscripts
### and latter is the correct one

#start on starting\ local
#start on starting local

stop  on runlevel 0
stop  on runlevel 1
stop  on runlevel 6

respawn
exec /usr/bin/tor


Index: tor.spec
===================================================================
RCS file: /cvs/extras/rpms/tor/devel/tor.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- tor.spec	25 Feb 2009 21:21:43 -0000	1.29
+++ tor.spec	7 Mar 2009 13:17:05 -0000	1.30
@@ -11,7 +11,7 @@
 
 Name:		tor
 Version:	0.2.0.34
-Release:	%release_func 2
+Release:	%release_func 3
 Group:		System Environment/Daemons
 License:	BSD
 Summary:	Anonymizing overlay network for TCP (The onion router)
@@ -50,13 +50,26 @@
 Provides:	init(%name) = lsb
 Requires:	%name-core =  %version-%release
 Source10:	tor.lsb
-#BuildArch:		noarch
+BuildArch:		noarch
 Requires(pre):		%name-core
 Requires(postun):	lsb-core-noarch %name-core
 Requires(post):		lsb-core-noarch
 Requires(preun):	lsb-core-noarch
 
 
+%package upstart
+Summary:		upstart initscripts for %name
+Group:			System Environment/Base
+Source20:		%name.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
+
+
 %description
 Tor is a connection-based low-latency anonymous communication system.
 
@@ -90,6 +103,13 @@
 daemon.
 
 
+%description upstart
+Tor is a connection-based low-latency anonymous communication system.
+
+This package contains the upstart compliant initscripts to start the "tor"
+daemon.
+
+
 %prep
 %setup -q
 %patch1 -p1 -b .geoippath
@@ -125,6 +145,8 @@
 install -p -m0755 %SOURCE10 $RPM_BUILD_ROOT%_initrddir/tor
 install -p -m0644 %SOURCE2  $RPM_BUILD_ROOT%_sysconfdir/logrotate.d/tor
 
+install -pD -m 0644 %SOURCE20 $RPM_BUILD_ROOT/etc/event.d/tor
+
 ln -s %_datadir/tor/geoip $RPM_BUILD_ROOT%_var/lib/tor-data/geoip
 
 
@@ -149,6 +171,13 @@
 test "$1"  = 0 || env -i %_initrddir/tor try-restart &>/dev/null
 
 
+%post upstart
+/usr/bin/killall -u %username tor 2>/dev/null || :
+
+%preun upstart
+test "$1" != "0" || /sbin/initctl -q stop tor || :
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -197,7 +226,16 @@
   %attr(0755,%username,%username) %dir %_var/run/%name
 
 
+%files upstart
+%defattr(-,root,root,-)
+%config(noreplace) /etc/event.d/*
+
+
 %changelog
+* Sat Mar  7 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.0.34-3
+- added -upstart subpackage (-lsb still wins by default as there exists
+  no end-user friendly solution for managing upstart initscripts)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.0.34-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild