summaryrefslogtreecommitdiff
path: root/package/tor/patches/patch-contrib_torctl
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-04-04 10:34:02 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2010-04-04 10:34:02 +0200
commit5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch)
treecd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /package/tor/patches/patch-contrib_torctl
parent401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff)
parent4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts: BUGS package/autoconf/Makefile
Diffstat (limited to 'package/tor/patches/patch-contrib_torctl')
-rw-r--r--package/tor/patches/patch-contrib_torctl27
1 files changed, 27 insertions, 0 deletions
diff --git a/package/tor/patches/patch-contrib_torctl b/package/tor/patches/patch-contrib_torctl
new file mode 100644
index 000000000..b531711db
--- /dev/null
+++ b/package/tor/patches/patch-contrib_torctl
@@ -0,0 +1,27 @@
+--- tor-0.2.1.20.orig/contrib/torctl 2009-10-15 18:16:22.000000000 +0200
++++ tor-0.2.1.20/contrib/torctl 2009-12-03 23:45:44.000000000 +0100
+@@ -24,19 +24,19 @@
+ EXEC=tor
+ #
+ # the path to your binary, including options if necessary
+-TORBIN="/usr/local/bin/$EXEC"
++TORBIN="/usr/bin/$EXEC"
+ #
+ # the path to the configuration file
+-TORCONF="/usr/local/etc/tor/torrc"
++TORCONF="/etc/tor/torrc"
+ #
+ # the path to your PID file
+-PIDFILE="/usr/local/var/run/tor/tor.pid"
++PIDFILE="/var/run/tor/tor.pid"
+ #
+ # The path to the log file
+-LOGFILE="/usr/local/var/log/tor/tor.log"
++LOGFILE="/var/log/tor/tor.log"
+ #
+ # The path to the datadirectory
+-TORDATA="/usr/local/var/lib/tor"
++TORDATA="/var/lib/tor"
+ #
+ TORARGS="--pidfile $PIDFILE --log \"notice file $LOGFILE\" --runasdaemon 1"
+ TORARGS="$TORARGS --datadirectory $TORDATA"