rpms/tor/devel tor.upstart, 1.2, 1.3 tor.spec, 1.38, 1.39 tor.lsb, 1.3, 1.4 tor.logrotate, 1.2, 1.3 update-geoip, 1.1, NONE tor-0.2.1.19-geoippath.patch, 1.1, NONE netfilter-ipv4.h, 1.1, NONE

[ensc]

Author: ensc

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

Modified Files:
	tor.upstart tor.spec tor.lsb tor.logrotate 
Removed Files:
	update-geoip tor-0.2.1.19-geoippath.patch netfilter-ipv4.h 
Log Message:
updated



Index: tor.upstart
===================================================================
RCS file: /cvs/extras/rpms/tor/devel/tor.upstart,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- tor.upstart	26 Jun 2009 08:05:11 -0000	1.2
+++ tor.upstart	14 Nov 2009 20:47:07 -0000	1.3
@@ -11,5 +11,7 @@ stop  on runlevel 0
 stop  on runlevel 1
 stop  on runlevel 6
 
+limit nofile 4096
+
 respawn
 exec /usr/bin/tor --quiet


Index: tor.spec
===================================================================
RCS file: /cvs/extras/rpms/tor/devel/tor.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- tor.spec	25 Oct 2009 20:53:09 -0000	1.38
+++ tor.spec	14 Nov 2009 20:47:07 -0000	1.39
@@ -13,7 +13,7 @@
 
 Name:		tor
 Version:	0.2.1.20
-Release:	%release_func 1
+Release:	%release_func 1300
 Group:		System Environment/Daemons
 License:	BSD
 Summary:	Anonymizing overlay network for TCP (The onion router)
@@ -25,13 +25,10 @@ Requires:	%name-lsb  = %version-%release
 %package core
 Summary:	Core programs for tor
 Group:		System Environment/Daemons
-URL:		http://tor.eff.org
-Source0:	http://tor.eff.org/dist/%name-%version.tar.gz
-Source1:	http://tor.eff.org/dist/%name-%version.tar.gz.asc
+URL:		http://www.torproject.org
+Source0:	https://www.torproject.org/dist/%name-%version.tar.gz
+Source1:	https://www.torproject.org/dist/%name-%version.tar.gz.asc
 Source2:	tor.logrotate
-Source3:	update-geoip
-Source4:	netfilter-ipv4.h
-Patch1:		tor-0.2.1.19-geoippath.patch
 BuildRoot:	%_tmppath/%name-%version-%release-root
 
 BuildRequires:	libevent-devel openssl-devel transfig ghostscript
@@ -111,26 +108,18 @@ Tor is a connection-based low-latency an
 This package contains the upstart compliant initscripts to start the "tor"
 daemon.
 
-
 %prep
 %setup -q
-%patch1 -p1 -b .geoippath
-
-install -p -m0644 %SOURCE3 .
 
 sed -i -e 's!^\(\# *\)\?DataDirectory .*!DataDirectory %homedir/.tor!' src/config/torrc.sample.in
 cat <<EOF >>src/config/torrc.sample.in
 User  %username
 EOF
 
-mkdir -p linux
-install -p -m0644 %SOURCE4 linux/netfilter_ipv4.h
-
 
 %build
-export ac_cv_header_linux_netfilter_ipv4_h=yes
 export LDFLAGS='-Wl,--as-needed'
-%configure
+%configure --enable-gcc-warnings
 make %{?_smp_mflags}
 make -C doc/design-paper tor-design.pdf
 
@@ -148,8 +137,6 @@ install -p -m0644 %SOURCE2  $RPM_BUILD_R
 
 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
-
 
 %pre core
 %__fe_groupadd %uid -r %username &>/dev/null || :
@@ -179,8 +166,8 @@ test "$1" != 0 || /usr/lib/lsb/remove_in
 test "$1"  = 0 || env -i %_initrddir/tor try-restart &>/dev/null
 
 
-%post upstart
-/usr/bin/killall -u %username tor 2>/dev/null || :
+%postun upstart
+/usr/bin/killall -u %username -s INT tor 2>/dev/null || :
 
 %preun upstart
 test "$1" != "0" || /sbin/initctl -q stop tor || :
@@ -212,7 +199,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS LICENSE README ChangeLog
 %doc ReleaseNotes
-%doc update-geoip
 %dir               %_sysconfdir/tor
 %config(noreplace) %_sysconfdir/logrotate.d/tor
 %attr(0700,%username,%username) %dir %homedir
@@ -222,7 +208,6 @@ rm -rf $RPM_BUILD_ROOT
 %_mandir/man1/*
 %_datadir/tor
 %dir %_var/lib/tor-data
-%config(noreplace) %_var/lib/tor-data/geoip
 
 %exclude %_bindir/torify
 %exclude %_mandir/man1/torify*
@@ -241,6 +226,18 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Nov 14 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.1.20-1300
+- updated URLs (#532373)
+- removed (inactive) update mechanism for GeoIP data; this might reduce anonimity (#532373)
+- use pidfile at various places in the LSB initscript to operate on the correct process (#532373)
+- set a higher 'nofile' limit in the upstart initscript to allow fast
+  relays; LSB users will have to add a 'ulimit -n' into /etc/sysconfig/tor
+  to get a similar effect (#532373)
+- use %%postun, not %%post as a -upstart scriptlet and send INT, not
+  TERM signal to stop/restart daemon
+- let the LSB initscript wait until process within a certain time;
+  this fixes shutdown/restart problems when working as a server (#532373)
+
 * Sun Oct 25 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.1.20-1
 - updated to 0.2.1.20
 


Index: tor.lsb
===================================================================
RCS file: /cvs/extras/rpms/tor/devel/tor.lsb,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- tor.lsb	26 Jun 2009 08:05:11 -0000	1.3
+++ tor.lsb	14 Nov 2009 20:47:07 -0000	1.4
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Init file for tor - An Anonymizing overlay network for TCP
 #
@@ -17,6 +17,7 @@
 
 f=/etc/sysconfig/tor
 
+TOR_SHUTDOWN_WAIT=30
 TOR_OPTS=--quiet
 TOR_PIDFILE=/var/run/tor/tor.pid
 TOR_USER=toranon
@@ -43,7 +44,22 @@ start() {
 
 stop() {
     echo -n $"Stopping $prog: "
-    killproc $prog -INT && log_success_msg || log_failure_msg
+    if ! killproc -p "$pidfile" $prog -INT; then
+	log_failure_msg
+    else
+	cnt=$TOR_SHUTDOWN_WAIT
+	while test $cnt -gt 0 && killproc -p "$pidfile" $prog -0; do
+	    sleep 1
+	    let --cnt
+	done
+
+	if test $cnt -ne 0 || killproc -p "$pidfile" $prog; then
+	    log_success_msg
+	else
+	    log_failure_msg
+	fi
+    fi
+
     rm -f $pidfile $lockfile
 }
 
@@ -54,11 +70,11 @@ restart() {
 
 reload() {
     echo -n $"Reloading $prog: "
-    killproc $prog -HUP && log_success_msg || log_failure_msg
+    killproc -p "$pidfile" $prog -HUP && log_success_msg || log_failure_msg
 }
 
 status() {
-    pidofproc -p "$TOR_PIDFILE" "$prog" >/dev/null 2>&1
+    pidofproc -p "$pidfile" "$prog" >/dev/null 2>&1
     rc=$?
     case $rc in
       (0) echo $"$prog is running";;


Index: tor.logrotate
===================================================================
RCS file: /cvs/extras/rpms/tor/devel/tor.logrotate,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- tor.logrotate	13 Feb 2008 12:13:04 -0000	1.2
+++ tor.logrotate	14 Nov 2009 20:47:07 -0000	1.3
@@ -4,8 +4,8 @@
 	sharedscripts
 	missingok
 	postrotate
-		test ! -f /etc/init.d/tor         || /etc/init.d/tor reload         >/dev/null 2>/dev/null || :
-		test ! -f /etc/initng/damon/tor.i || /sbin/ngc --restart daemon/tor >/dev/null 2>/dev/null || :
-		test ! -d /etc/minit/services/tor || /bin/msvc -h services/tor      >/dev/null 2>/dev/null || :
+		test ! -f /etc/init.d/tor          || /etc/init.d/tor reload         >/dev/null 2>/dev/null || :
+		test ! -f /etc/initng/daemon/tor.i || /sbin/ngc --restart daemon/tor >/dev/null 2>/dev/null || :
+		test ! -d /etc/minit/services/tor  || /bin/msvc -h services/tor      >/dev/null 2>/dev/null || :
         endscript
 }


--- update-geoip DELETED ---


--- tor-0.2.1.19-geoippath.patch DELETED ---


--- netfilter-ipv4.h DELETED ---