diff options
-rw-r--r-- | security/tor/Makefile | 2 | ||||
-rw-r--r-- | security/tor/distinfo | 6 | ||||
-rw-r--r-- | security/tor/files/tor.in | 10 |
3 files changed, 10 insertions, 8 deletions
diff --git a/security/tor/Makefile b/security/tor/Makefile index f202440489f7..7108cd0a2924 100644 --- a/security/tor/Makefile +++ b/security/tor/Makefile @@ -6,7 +6,7 @@ # PORTNAME= tor -PORTVERSION= 0.1.1.20 +PORTVERSION= 0.1.1.23 CATEGORIES= security net MASTER_SITES= http://tor.eff.org/dist/ \ http://mirror.onionland.org/dist/ diff --git a/security/tor/distinfo b/security/tor/distinfo index 998c80895a6b..ad22abf57373 100644 --- a/security/tor/distinfo +++ b/security/tor/distinfo @@ -1,3 +1,3 @@ -MD5 (tor-0.1.1.20.tar.gz) = 51aac1749ff2549e8f3e1a172dc66992 -SHA256 (tor-0.1.1.20.tar.gz) = b251fd9079a40345beb5b67bcdf30c3292ee9220d2d062d583b89f3526015138 -SIZE (tor-0.1.1.20.tar.gz) = 828833 +MD5 (tor-0.1.1.23.tar.gz) = 33ce7155f545c4d30cb846d7017cc6c2 +SHA256 (tor-0.1.1.23.tar.gz) = a2ac0b10089902c2de8649e07823dc46b8876cd3e0236505e5e7f1f49ee11025 +SIZE (tor-0.1.1.23.tar.gz) = 847906 diff --git a/security/tor/files/tor.in b/security/tor/files/tor.in index e99b5c126733..81cc72e9161c 100644 --- a/security/tor/files/tor.in +++ b/security/tor/files/tor.in @@ -6,7 +6,9 @@ # REQUIRE: NETWORKING SERVERS USR # BEFORE: LOGIN # -# Add the following lines to /etc/rc.conf to enable tor +# Add the following lines to /etc/rc.conf to enable tor. +# All these options will overide any settings in your local torrc as +# they are command line options. # # tor_enable (bool): Set to "NO" by default # Set it to "YES" to enable tor @@ -15,8 +17,7 @@ # tor_user (str): Tor Daemon user. Default _tor # tor_group (str): Tor Daemon group. Default _tor # tor_datadir (str): Tor DataDir. Defaults /var/db/tor -# This will overide your torrc as it is -# a command line option. +# tor_logfile (str): Tor Log File. Defaults /var/log/tor # . %%RC_SUBR%% @@ -36,8 +37,9 @@ load_rc_config ${name} required_files=${tor_conf} required_dirs=${tor_datadir} +pidfile=${tor_pidfile} command="%%PREFIX%%/bin/${name}" -command_args="-f ${tor_conf} --pidfile ${tor_pidfile} --runasdaemon 1 --datadirectory ${tor_datadir} --user ${tor_user} --group ${tor_group}" +command_args="-f ${tor_conf} --pidfile ${tor_pidfile} --runasdaemon 1 --datadirectory ${tor_datadir} --user ${tor_user} --group ${tor_group} --log \"notice file ${tor_logfile}\"" extra_commands="log" log_cmd="${name}_log" |