rpms/tor/F-11 .cvsignore, 1.7, 1.8 lastver, 1.7, 1.8 sources, 1.16, 1.17 tor.lsb, 1.2, 1.3 tor.spec, 1.30, 1.31 tor.upstart, 1.1, 1.2

[ensc]

Author: ensc

Update of /cvs/extras/rpms/tor/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6972

Modified Files:
	.cvsignore lastver sources tor.lsb tor.spec tor.upstart 
Log Message:
updated


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tor/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	9 Feb 2009 23:49:29 -0000	1.7
+++ .cvsignore	26 Jun 2009 19:06:49 -0000	1.8
@@ -1,2 +1,2 @@
-tor-0.2.0.34.tar.gz
-tor-0.2.0.34.tar.gz.asc
+tor-0.2.0.35.tar.gz
+tor-0.2.0.35.tar.gz.asc


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/tor/F-11/lastver,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- lastver	9 Feb 2009 23:49:29 -0000	1.7
+++ lastver	26 Jun 2009 19:06:49 -0000	1.8
@@ -1 +1 @@
-0.2.0.34
+0.2.0.35


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tor/F-11/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	9 Feb 2009 23:49:29 -0000	1.16
+++ sources	26 Jun 2009 19:06:49 -0000	1.17
@@ -1,2 +1,2 @@
-f20011be23d5a76988233df12c346f41  tor-0.2.0.34.tar.gz
-b62ccfa27e2f9128a88c3e7a0c3b0c47  tor-0.2.0.34.tar.gz.asc
+d4841e1b4d54866495fd373e865b2d44  tor-0.2.0.35.tar.gz
+39b6934d8918f78aec986b9538546fa9  tor-0.2.0.35.tar.gz.asc


Index: tor.lsb
===================================================================
RCS file: /cvs/extras/rpms/tor/F-11/tor.lsb,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- tor.lsb	13 Feb 2008 11:20:03 -0000	1.2
+++ tor.lsb	26 Jun 2009 19:06:49 -0000	1.3
@@ -17,7 +17,7 @@
 
 f=/etc/sysconfig/tor
 
-TOR_OPTS=
+TOR_OPTS=--quiet
 TOR_PIDFILE=/var/run/tor/tor.pid
 TOR_USER=toranon
 test ! -r "$f" || . "$f"


Index: tor.spec
===================================================================
RCS file: /cvs/extras/rpms/tor/F-11/tor.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- tor.spec	7 Mar 2009 13:17:05 -0000	1.30
+++ tor.spec	26 Jun 2009 19:06:49 -0000	1.31
@@ -10,8 +10,8 @@
 %{!?release_func:%global release_func() %1%{?dist}}
 
 Name:		tor
-Version:	0.2.0.34
-Release:	%release_func 3
+Version:	0.2.0.35
+Release:	%release_func 1
 Group:		System Environment/Daemons
 License:	BSD
 Summary:	Anonymizing overlay network for TCP (The onion router)
@@ -161,7 +161,10 @@ ln -s %_datadir/tor/geoip $RPM_BUILD_ROO
 
 
 %post lsb
-/usr/lib/lsb/install_initd %_initrddir/tor
+/usr/lib/lsb/install_initd %_initrddir/tor || {
+	echo "install_initd broken; falling back to chkconfig" >&2
+	/sbin/chkconfig --add tor
+}
 
 %preun lsb
 test "$1" != 0 || %_initrddir/tor stop &>/dev/null || :
@@ -184,7 +187,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc doc/HACKING doc/TODO
+%doc doc/HACKING
 %doc doc/spec/*.txt
 %doc doc/design-paper/tor-design.pdf
 %doc %lang(de) doc/website/*.de
@@ -192,6 +195,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc %lang(es) doc/website/*.es
 %doc %lang(fr) doc/website/*.fr
 %doc %lang(it) doc/website/*.it
+%doc %lang(ko) doc/website/*.ko
 %doc %lang(pl) doc/website/*.pl
 %doc %lang(pt) doc/website/*.pt
 %doc %lang(ru) doc/website/*.ru
@@ -232,6 +236,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jun 26 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.0.35-1
+- updated to 0.2.0.35
+- added '--quiet' to startup options (bug #495987)
+- added workaround for broken install_initd
+- updated %%doc entries
+
 * 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)


Index: tor.upstart
===================================================================
RCS file: /cvs/extras/rpms/tor/F-11/tor.upstart,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tor.upstart	7 Mar 2009 13:17:05 -0000	1.1
+++ tor.upstart	26 Jun 2009 19:06:49 -0000	1.2
@@ -12,4 +12,4 @@ stop  on runlevel 1
 stop  on runlevel 6
 
 respawn
-exec /usr/bin/tor
+exec /usr/bin/tor --quiet