[or-cvs] r19136: {torvm} Be less sloppy when binding socks port, remove geoip for now (torvm/trunk/build/kamikaze/patches)

[coderman at seul.org]

Author: coderman
Date: 2009-03-26 02:32:22 -0400 (Thu, 26 Mar 2009)
New Revision: 19136

Modified:
   torvm/trunk/build/kamikaze/patches/001-kamikaze-tor-package.patch
Log:
Be less sloppy when binding socks port, remove geoip for now; Vidalia is the geo aware app for now.

Modified: torvm/trunk/build/kamikaze/patches/001-kamikaze-tor-package.patch
===================================================================
--- torvm/trunk/build/kamikaze/patches/001-kamikaze-tor-package.patch	2009-03-26 04:23:07 UTC (rev 19135)
+++ torvm/trunk/build/kamikaze/patches/001-kamikaze-tor-package.patch	2009-03-26 06:32:22 UTC (rev 19136)
@@ -313,8 +313,8 @@
 +
 diff -Naur a/package/tor/files/tor.init b/package/tor/files/tor.init
 --- a/package/tor/files/tor.init	1970-01-01 00:00:00.000000000 +0000
-+++ b/package/tor/files/tor.init	2009-03-26 03:54:19.952640296 +0000
-@@ -0,0 +1,136 @@
++++ b/package/tor/files/tor.init	2009-03-26 06:23:42.161177504 +0000
+@@ -0,0 +1,137 @@
 +#!/bin/sh 
 +# make sure we check the system bin dirs
 +export PATH=/usr/sbin:/sbin:$PATH
@@ -370,16 +370,17 @@
 +	fi; \
 +	echo $ARGS | grep ' CTLSOCK=' >/dev/null 2>&1 ; \
 +	if [ $? -eq 0 ]; then \
-+	  CTLSOCK=`echo $ARGS | sed 's/.* CTLSOCK=//' | sed 's/ .*//'`; \
-+	  CTLPORT=`echo $CTLSOCK | sed 's/.*://'`; \
++	  CTLADDR=`echo $ARGS | sed 's/.* CTLSOCK=//' | sed 's/ .*//'`; \
++	  CTLPORT=`echo $CTLADDR | sed 's/.*://'`; \
 +	  cat $CONF_F | grep -v 'ControlListenAddress' | grep -v ControlPort > $TMP_F; \
 +	  echo "ControlPort ${CTLPORT}" >> $TMP_F; \
-+	  echo "ControlListenAddress ${CTLSOCK}" >> $TMP_F; \
++	  echo "ControlListenAddress ${CTLADDR}" >> $TMP_F; \
++	  echo "SocksListenAddress ${CTLADDR}" >> $TMP_F; \
 +	  mv -f $TMP_F $CONF_F; \
 +	fi; \
 +	chown $RUN_USER:$RUN_GROUP $CONF_F ; \
 +	if [ $FOLLOWTOR -eq 1 ]; then \
-+	  /etc/init.d/tor dofollow >/dev/null 2>&1 &; \
++	  /etc/init.d/tor dofollow >/dev/null 2>&1 & \
 +        else \
 +	  $BIN --runasdaemon 1 -f $CONF_F > $SLOG_F 2>&1 ; \
 +	fi; 
@@ -453,26 +454,15 @@
 +exit 0
 diff -Naur a/package/tor/files/torrc b/package/tor/files/torrc
 --- a/package/tor/files/torrc	1970-01-01 00:00:00.000000000 +0000
-+++ b/package/tor/files/torrc	2009-03-15 04:22:14.280865096 +0000
-@@ -0,0 +1,27 @@
++++ b/package/tor/files/torrc	2009-03-26 06:18:45.619258728 +0000
+@@ -0,0 +1,19 @@
 +# Configuration for Tor VM
-+RunAsDaemon 1
 +User tor
 +Group tor
 +PidFile /var/run/tor/pid
 +DataDirectory /home/tor/data
 +Log notice file /var/log/tor/notices.log
-+GeoIPFile /home/tor/geoip
 +
-+# XXX For now rely on netfilter for access control to transproxy ports
-+SocksListenAddress 0.0.0.0
-+SocksPort 9050
-+TransListenAddress 0.0.0.0
-+TransPort 9095
-+DNSListenAddress 0.0.0.0
-+DNSPort 9093
-+
-+
 +# This needs to be a network available via host default route
 +VirtualAddrNetwork 10.254.0.0/16
 +
@@ -482,3 +472,6 @@
 +AutomapHostsOnResolve 1
 +
 +# options appended from command line placed below:
++SocksPort 9050
++DNSPort 9093
++TransPort 9095