Date: Sat, 3 Mar 2018 16:09:28 +0000 (UTC) From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r463490 - in head/security/tor-devel: . files Message-ID: <201803031609.w23G9Sw7096543@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yuri Date: Sat Mar 3 16:09:28 2018 New Revision: 463490 URL: https://svnweb.freebsd.org/changeset/ports/463490 Log: 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) Modified: head/security/tor-devel/Makefile head/security/tor-devel/distinfo head/security/tor-devel/files/tor.in Modified: head/security/tor-devel/Makefile ============================================================================== --- head/security/tor-devel/Makefile Sat Mar 3 16:00:48 2018 (r463489) +++ head/security/tor-devel/Makefile Sat Mar 3 16:09:28 2018 (r463490) @@ -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 Modified: head/security/tor-devel/distinfo ============================================================================== --- head/security/tor-devel/distinfo Sat Mar 3 16:00:48 2018 (r463489) +++ head/security/tor-devel/distinfo Sat Mar 3 16:09:28 2018 (r463490) @@ -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 Modified: head/security/tor-devel/files/tor.in ============================================================================== --- head/security/tor-devel/files/tor.in Sat Mar 3 16:00:48 2018 (r463489) +++ head/security/tor-devel/files/tor.in Sat Mar 3 16:09:28 2018 (r463490) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803031609.w23G9Sw7096543>