diff options
| author | Jochen Neumeister <joneum@FreeBSD.org> | 2017-06-17 10:54:54 +0000 |
|---|---|---|
| committer | Jochen Neumeister <joneum@FreeBSD.org> | 2017-06-17 10:54:54 +0000 |
| commit | 325ef4e8435a2a27a728ada7bb0a6932a97ace78 (patch) | |
| tree | 86ca2af22e6c67b39db48149d9ba70cd32ace5cf /security/tor | |
| parent | c671e477bfa0e3e5a504a40d73ad371482618665 (diff) | |
| download | ports-325ef4e8435a2a27a728ada7bb0a6932a97ace78.tar.gz ports-325ef4e8435a2a27a728ada7bb0a6932a97ace78.zip | |
Notes
Diffstat (limited to 'security/tor')
| -rw-r--r-- | security/tor/Makefile | 1 | ||||
| -rw-r--r-- | security/tor/files/tor.in | 14 |
2 files changed, 15 insertions, 0 deletions
diff --git a/security/tor/Makefile b/security/tor/Makefile index e0c34c22da01..52d6942d39d0 100644 --- a/security/tor/Makefile +++ b/security/tor/Makefile @@ -3,6 +3,7 @@ PORTNAME= tor PORTVERSION= 0.3.0.8 +PORTREVISION= 1 CATEGORIES= security net ipv6 MASTER_SITES= TOR diff --git a/security/tor/files/tor.in b/security/tor/files/tor.in index 185d9fe3370f..48374620e1b5 100644 --- a/security/tor/files/tor.in +++ b/security/tor/files/tor.in @@ -21,6 +21,7 @@ # tor_disable_default_instance (str): Doesn't run the default instance. # Only valid when tor_instances is used. # Default: NO +# tor_setuid (str): Runtime setuid. Default: NO # # The instance definition that tor_instances expects: # 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_datadir="/var/db/tor"} : ${tor_disable_default_instance="NO"} +: ${tor_setuid="NO"} instance=${slave_instance} 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}" 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 exit_code=1 fi |