Date: Sat, 10 Mar 2018 13:48:14 +0000 (UTC) From: Mark Felder <feld@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r464074 - in branches/2018Q1/security/tor: . files Message-ID: <201803101348.w2ADmE7s021129@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: feld Date: Sat Mar 10 13:48:14 2018 New Revision: 464074 URL: https://svnweb.freebsd.org/changeset/ports/464074 Log: MFH: r458993 r463489 security/tor: Update to 0.3.2.9 This release contains many new features and many bugfixes. Plesee see the complete list here: https://blog.torproject.org/tor-0329-released-we-have-new-stable-series Additionally, this update adds "#include <osreldate.h>" to qualm the compiler warning that was caused by the previous fix. Now security/tor and security/tor-devel are identical. security/tor: Update to 0.3.2.10 Backport of countermeasures to mitigate denial-of-service attacks against the Tor network. Changelog is in: https://gitweb.torproject.org/tor.git/tree/ChangeLog None of these fixes appear to be essential for clients, but relays should upgrade. Port changes: * Changed the implementation of 'tor_setuid': now it is done through the command line argument, instead of the torrc file. Modified: branches/2018Q1/security/tor/Makefile branches/2018Q1/security/tor/distinfo branches/2018Q1/security/tor/files/patch-orconfig.h.in branches/2018Q1/security/tor/files/tor.in Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/security/tor/Makefile ============================================================================== --- branches/2018Q1/security/tor/Makefile Sat Mar 10 13:12:26 2018 (r464073) +++ branches/2018Q1/security/tor/Makefile Sat Mar 10 13:48:14 2018 (r464074) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= tor -PORTVERSION= 0.3.1.9 -PORTREVISION= 1 +DISTVERSION= 0.3.2.10 CATEGORIES= security net ipv6 MASTER_SITES= TOR Modified: branches/2018Q1/security/tor/distinfo ============================================================================== --- branches/2018Q1/security/tor/distinfo Sat Mar 10 13:12:26 2018 (r464073) +++ branches/2018Q1/security/tor/distinfo Sat Mar 10 13:48:14 2018 (r464074) @@ -1,3 +1,3 @@ -TIMESTAMP = 1512146746 -SHA256 (tor-0.3.1.9.tar.gz) = 6e1b04f7890e782fd56014a0de5075e4ab29b52a35d8bca1f6b80c93f58f3d26 -SIZE (tor-0.3.1.9.tar.gz) = 6092702 +TIMESTAMP = 1520087667 +SHA256 (tor-0.3.2.10.tar.gz) = 60df77c31dcf94fdd686c8ca8c34f3b70243b33a7344ecc0b719d5ca2617cbee +SIZE (tor-0.3.2.10.tar.gz) = 6421984 Modified: branches/2018Q1/security/tor/files/patch-orconfig.h.in ============================================================================== --- branches/2018Q1/security/tor/files/patch-orconfig.h.in Sat Mar 10 13:12:26 2018 (r464073) +++ branches/2018Q1/security/tor/files/patch-orconfig.h.in Sat Mar 10 13:48:14 2018 (r464074) @@ -1,9 +1,10 @@ --- orconfig.h.in.orig 2017-11-30 20:34:49 UTC +++ orconfig.h.in -@@ -517,7 +517,9 @@ +@@ -517,7 +517,10 @@ #undef HAVE_TIME_H /* Define to 1 if you have the `timingsafe_memcmp' function. */ ++#include <osreldate.h> +#if __FreeBSD_version >= 1200000 // disabled: timingsafe_memcmp(3) has been added only in 12.0, and isn't yet available on older systems #undef HAVE_TIMINGSAFE_MEMCMP +#endif Modified: branches/2018Q1/security/tor/files/tor.in ============================================================================== --- branches/2018Q1/security/tor/files/tor.in Sat Mar 10 13:12:26 2018 (r464073) +++ branches/2018Q1/security/tor/files/tor.in Sat Mar 10 13:48:14 2018 (r464074) @@ -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?201803101348.w2ADmE7s021129>