rpms/tor/devel tor.sysv, 1.1, 1.2 tor.spec, 1.52, 1.53 tor.lsb, 1.5, 1.6 sources, 1.24, 1.25 lastver, 1.15, 1.16 .cvsignore, 1.15, 1.16

[ensc]

Author: ensc

Update of /cvs/extras/rpms/tor/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30223

Modified Files:
	tor.sysv tor.spec tor.lsb sources lastver .cvsignore 
Log Message:
- updated to 0.2.1.26
- log to syslog as request by upstream (#532373#19)
- removed workaround to install lsb initscript because parts of the
  underlying problem have been fixed in redhat-lsb and the remaining
  ones were solved by previous commit
- removed $local_fs dependency in -lsb initscript to workaround
  buggy redhat-lsb; $remote_fs should imply it and has been moved to
  Should-Start:



Index: tor.sysv
===================================================================
RCS file: /cvs/extras/rpms/tor/devel/tor.sysv,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tor.sysv	28 Mar 2010 21:15:13 -0000	1.1
+++ tor.sysv	1 Jun 2010 17:32:41 -0000	1.2
@@ -78,7 +78,9 @@ case $1 in
 	    restart
 	fi
 	;;
+    (-*)
+	exit 2
     (*)
-	echo $"Usage: $0 {start|stop|force-reload|reload|try-restart|status}"
+	echo $"Usage: $0 {start|stop|force-reload|reload|try-restart|status}" >&2
 	exit 3
 esac


Index: tor.spec
===================================================================
RCS file: /cvs/extras/rpms/tor/devel/tor.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- tor.spec	1 Jun 2010 17:00:51 -0000	1.52
+++ tor.spec	1 Jun 2010 17:32:41 -0000	1.53
@@ -12,7 +12,7 @@
 %{!?release_func:%global release_func() %%{?prerelease:0.}%1%%{?prerelease:.%%prerelease}%%{?dist}}
 
 Name:		tor
-Version:	0.2.1.25
+Version:	0.2.1.26
 Release:	%release_func 1400
 Group:		System Environment/Daemons
 License:	BSD
@@ -150,6 +150,7 @@ daemon.
 
 sed -i -e 's!^\(\# *\)\?DataDirectory .*!DataDirectory %homedir/.tor!' src/config/torrc.sample.in
 cat <<EOF >>src/config/torrc.sample.in
+Log notice syslog
 User  %username
 EOF
 
@@ -186,14 +187,7 @@ install -pD -m 0644 %SOURCE20 $RPM_BUILD
 
 
 %post lsb
-/usr/lib/lsb/install_initd %_initrddir/tor || {
-	cat <<EOF >&2
-oouch... redhat-lsb is still broken. See the report
-https://bugzilla.redhat.com/show_bug.cgi?id=522053
-for details.
-EOF
-	/sbin/chkconfig --add tor
-}
+/usr/lib/lsb/install_initd %_initrddir/tor
 
 %preun lsb
 test "$1" != 0 || %_initrddir/tor stop &>/dev/null || :
@@ -281,6 +275,16 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jun  1 2010 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.1.26-1400
+- updated to 0.2.1.26
+- log to syslog as request by upstream (#532373#19)
+- removed workaround to install lsb initscript because parts of the
+  underlying problem have been fixed in redhat-lsb and the remaining
+  ones were solved by previous commit
+- removed $local_fs dependency in -lsb initscript to workaround
+  buggy redhat-lsb; $remote_fs should imply it and has been moved to
+  Should-Start:
+
 * Tue Jun  1 2010 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
 - created -doc subpackage and moved most (all) files from main into it
 


Index: tor.lsb
===================================================================
RCS file: /cvs/extras/rpms/tor/devel/tor.lsb,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- tor.lsb	15 Nov 2009 11:08:48 -0000	1.5
+++ tor.lsb	1 Jun 2010 17:32:41 -0000	1.6
@@ -9,8 +9,8 @@
 # Default-Stop:		0 1 2 6
 # Short-Description:	An Anonymizing overlay network for TCP
 # Description:		An Anonymizing overlay network for TCP
-# Required-Start:	$network $remote_fs $local_fs
-# Should-Start:		$syslog $time
+# Required-Start:	$network
+# Should-Start:		$syslog $time $remote_fs
 ### END INIT INFO
 
 . /lib/lsb/init-functions


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tor/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	18 Mar 2010 20:42:43 -0000	1.24
+++ sources	1 Jun 2010 17:32:41 -0000	1.25
@@ -1,2 +1,2 @@
-f58540b3c5835ac4f5de1b02bbddc703  tor-0.2.1.25.tar.gz
-a5b9a9f51d54fade1f84a1d7d9c96403  tor-0.2.1.25.tar.gz.asc
+f7b30a144e1da41aa43f496bd47ffba7  tor-0.2.1.26.tar.gz
+c41c1bf61cb883303fb4cb8f7b477fae  tor-0.2.1.26.tar.gz.asc


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/tor/devel/lastver,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- lastver	18 Mar 2010 20:42:43 -0000	1.15
+++ lastver	1 Jun 2010 17:32:42 -0000	1.16
@@ -1 +1 @@
-0.2.1.25
+0.2.1.26


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tor/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	18 Mar 2010 20:42:42 -0000	1.15
+++ .cvsignore	1 Jun 2010 17:32:42 -0000	1.16
@@ -1,2 +1,2 @@
-tor-0.2.1.25.tar.gz
-tor-0.2.1.25.tar.gz.asc
+tor-0.2.1.26.tar.gz
+tor-0.2.1.26.tar.gz.asc