security/tor-devel: Update to 0.3.3.1
The announcement and the change log: https://blog.torproject.org/tor-0331-alpha-released-back-unstable-development Also, tor_setuid feature is merged from security/tor. Approved by: tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D14066
This commit is contained in:
parent
9f0efe388b
commit
b8939008d3
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=460146
3 changed files with 19 additions and 4 deletions
|
@ -2,7 +2,8 @@
|
||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
PORTNAME= tor
|
PORTNAME= tor
|
||||||
DISTVERSION= 0.3.2.9
|
DISTVERSION= 0.3.3.1
|
||||||
|
DISTVERSIONSUFFIX= -alpha
|
||||||
CATEGORIES= security net ipv6
|
CATEGORIES= security net ipv6
|
||||||
MASTER_SITES= TOR
|
MASTER_SITES= TOR
|
||||||
PKGNAMESUFFIX= -devel
|
PKGNAMESUFFIX= -devel
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
TIMESTAMP = 1515842195
|
TIMESTAMP = 1517017645
|
||||||
SHA256 (tor-0.3.2.9.tar.gz) = 435a7b91aa98d8b1a0ac1f60ca30c0ff3665b18a02e570bab5fe27935829160f
|
SHA256 (tor-0.3.3.1-alpha.tar.gz) = 0a7c587645045eb37f3733ce75068fb5dea385b988e2a49c572b9e9193b9333a
|
||||||
SIZE (tor-0.3.2.9.tar.gz) = 6250442
|
SIZE (tor-0.3.3.1-alpha.tar.gz) = 6317585
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
# tor_disable_default_instance (str): Doesn't run the default instance.
|
# tor_disable_default_instance (str): Doesn't run the default instance.
|
||||||
# Only valid when tor_instances is used.
|
# Only valid when tor_instances is used.
|
||||||
# Default: NO
|
# Default: NO
|
||||||
|
# tor_setuid (str): Runtime setuid. Default: NO
|
||||||
#
|
#
|
||||||
# The instance definition that tor_instances expects:
|
# The instance definition that tor_instances expects:
|
||||||
# inst_name{:inst_conf:inst_user:inst_group:inst_pidfile:inst_data_dir}
|
# inst_name{:inst_conf:inst_user:inst_group:inst_pidfile:inst_data_dir}
|
||||||
|
@ -42,6 +43,7 @@ load_rc_config ${name}
|
||||||
: ${tor_pidfile="/var/run/tor/tor.pid"}
|
: ${tor_pidfile="/var/run/tor/tor.pid"}
|
||||||
: ${tor_datadir="/var/db/tor"}
|
: ${tor_datadir="/var/db/tor"}
|
||||||
: ${tor_disable_default_instance="NO"}
|
: ${tor_disable_default_instance="NO"}
|
||||||
|
: ${tor_setuid="NO"}
|
||||||
|
|
||||||
instance=${slave_instance}
|
instance=${slave_instance}
|
||||||
if [ -n "${instance}" ]; then
|
if [ -n "${instance}" ]; then
|
||||||
|
@ -112,6 +114,18 @@ command="%%PREFIX%%/bin/${name}"
|
||||||
command_args="-f ${tor_conf} --PidFile ${tor_pidfile} --RunAsDaemon 1 --DataDirectory ${tor_datadir}"
|
command_args="-f ${tor_conf} --PidFile ${tor_pidfile} --RunAsDaemon 1 --DataDirectory ${tor_datadir}"
|
||||||
extra_commands="reload"
|
extra_commands="reload"
|
||||||
|
|
||||||
|
if [ $tor_setuid = "YES" ]; then
|
||||||
|
if ! grep -q "^User ${tor_user}$" ${tor_conf}; then
|
||||||
|
echo "User ${tor_user}" >> ${tor_conf}
|
||||||
|
fi
|
||||||
|
tor_user="root"
|
||||||
|
tor_group="wheel"
|
||||||
|
else
|
||||||
|
if grep -q "^User ${tor_user}$" ${tor_conf}; then
|
||||||
|
sed -i '' -e "s/^User ${tor_user}$//" ${tor_conf}
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
if ! run_rc_command "$1"; then
|
if ! run_rc_command "$1"; then
|
||||||
exit_code=1
|
exit_code=1
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue