diff options
| author | Yuri Victorovich <yuri@FreeBSD.org> | 2018-03-03 16:09:28 +0000 |
|---|---|---|
| committer | Yuri Victorovich <yuri@FreeBSD.org> | 2018-03-03 16:09:28 +0000 |
| commit | fca04550f17626f258d12d4c86686ed7432d158f (patch) | |
| tree | abba09a79012d92f54eddaa578628e698e3870a6 /security/tor-devel | |
| parent | 5c3a344f6e591f1182c6f452467103cef27b5ac8 (diff) | |
| download | ports-fca04550f17626f258d12d4c86686ed7432d158f.tar.gz ports-fca04550f17626f258d12d4c86686ed7432d158f.zip | |
security/tor-devel: Update to 0.3.3.3
Changelog is in:
https://gitweb.torproject.org/tor.git/tree/ChangeLog
Port changes:
* Changed the implementation of 'tor_setuid': now it is done through
the command line argument, instead of the torrc file.
Reported by: Nick Mathewson <nickm@torproject.org> (notification)
Approved by: tcberner (mentor, implicit)
Notes
Notes:
svn path=/head/; revision=463490
Diffstat (limited to 'security/tor-devel')
| -rw-r--r-- | security/tor-devel/Makefile | 2 | ||||
| -rw-r--r-- | security/tor-devel/distinfo | 6 | ||||
| -rw-r--r-- | security/tor-devel/files/tor.in | 13 |
3 files changed, 10 insertions, 11 deletions
diff --git a/security/tor-devel/Makefile b/security/tor-devel/Makefile index a3d005d3c9a1..b0efafc14fb5 100644 --- a/security/tor-devel/Makefile +++ b/security/tor-devel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= tor -DISTVERSION= 0.3.3.2 +DISTVERSION= 0.3.3.3 DISTVERSIONSUFFIX= -alpha CATEGORIES= security net ipv6 MASTER_SITES= TOR diff --git a/security/tor-devel/distinfo b/security/tor-devel/distinfo index 1e5fd187a348..3a77c77003f0 100644 --- a/security/tor-devel/distinfo +++ b/security/tor-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1518285397 -SHA256 (tor-0.3.3.2-alpha.tar.gz) = 381135a59f4ca48a1eaeaaf2a94eb27ba61c73c196030e481d868e8f0d94beb4 -SIZE (tor-0.3.3.2-alpha.tar.gz) = 6487418 +TIMESTAMP = 1520092979 +SHA256 (tor-0.3.3.3-alpha.tar.gz) = 1c79b9711cb0dacf09fd905e74682d9010a0f0a4892aeeb22faacd0a5c2daf0a +SIZE (tor-0.3.3.3-alpha.tar.gz) = 6486946 diff --git a/security/tor-devel/files/tor.in b/security/tor-devel/files/tor.in index 48374620e1b5..d78dd2e2df68 100644 --- a/security/tor-devel/files/tor.in +++ b/security/tor-devel/files/tor.in @@ -114,16 +114,15 @@ command="%%PREFIX%%/bin/${name}" command_args="-f ${tor_conf} --PidFile ${tor_pidfile} --RunAsDaemon 1 --DataDirectory ${tor_datadir}" extra_commands="reload" +# clear user setting in conf file: it should be done through the command line +if grep -q "^User ${tor_user}$" ${tor_conf}; then + sed -i '' -e "s/^User ${tor_user}$//" ${tor_conf} +fi + if [ $tor_setuid = "YES" ]; then - if ! grep -q "^User ${tor_user}$" ${tor_conf}; then - echo "User ${tor_user}" >> ${tor_conf} - fi + command_args="${command_args} --User ${tor_user}" 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 |