From owner-svn-ports-branches@freebsd.org Tue Oct 18 18:19:11 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3AA5DC17368; Tue, 18 Oct 2016 18:19:11 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id ECA4ACF; Tue, 18 Oct 2016 18:19:10 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9IIJAc6015970; Tue, 18 Oct 2016 18:19:10 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9IIJ9Nt015964; Tue, 18 Oct 2016 18:19:09 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201610181819.u9IIJ9Nt015964@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Tue, 18 Oct 2016 18:19:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r424198 - in branches/2016Q4/security: tor tor-devel tor/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Oct 2016 18:19:11 -0000 Author: rene Date: Tue Oct 18 18:19:09 2016 New Revision: 424198 URL: https://svnweb.freebsd.org/changeset/ports/424198 Log: MFH: r424187 Update security/tor to 0.2.8.9 Update security/tor-devel to 0.2.9.4-alpha For security/tor: - fix directory permissions - mark the TOR2WEB option as "expert" PR: 212952 Submitted by: Neel Chauhan Approved by: maintainer Security: c1dc55dc-9556-11e6-b154-3065ec8fd3ec Approved by: ports-secteam (feld) Modified: branches/2016Q4/security/tor-devel/Makefile branches/2016Q4/security/tor-devel/distinfo branches/2016Q4/security/tor/Makefile branches/2016Q4/security/tor/distinfo branches/2016Q4/security/tor/files/tor.in branches/2016Q4/security/tor/pkg-plist Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/security/tor-devel/Makefile ============================================================================== --- branches/2016Q4/security/tor-devel/Makefile Tue Oct 18 18:15:58 2016 (r424197) +++ branches/2016Q4/security/tor-devel/Makefile Tue Oct 18 18:19:09 2016 (r424198) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= tor -DISTVERSION= 0.2.9.2-alpha -PORTREVISION= 1 +DISTVERSION= 0.2.9.4-alpha CATEGORIES= security net ipv6 MASTER_SITES= TOR PKGNAMESUFFIX= -devel Modified: branches/2016Q4/security/tor-devel/distinfo ============================================================================== --- branches/2016Q4/security/tor-devel/distinfo Tue Oct 18 18:15:58 2016 (r424197) +++ branches/2016Q4/security/tor-devel/distinfo Tue Oct 18 18:19:09 2016 (r424198) @@ -1,3 +1,3 @@ -TIMESTAMP = 1472083233 -SHA256 (tor-0.2.9.2-alpha.tar.gz) = dd93cf6b8531acf68152adbfa2f693cebd1b3254bc6190c920a99cc587944922 -SIZE (tor-0.2.9.2-alpha.tar.gz) = 5294923 +TIMESTAMP = 1476741065 +SHA256 (tor-0.2.9.4-alpha.tar.gz) = fc5664fff4c86d3644043a068f11b17c57f9a295c37b7186bf90bb237913e400 +SIZE (tor-0.2.9.4-alpha.tar.gz) = 5481286 Modified: branches/2016Q4/security/tor/Makefile ============================================================================== --- branches/2016Q4/security/tor/Makefile Tue Oct 18 18:15:58 2016 (r424197) +++ branches/2016Q4/security/tor/Makefile Tue Oct 18 18:19:09 2016 (r424198) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= tor -PORTVERSION= 0.2.8.7 -PORTREVISION= 1 +PORTVERSION= 0.2.8.9 CATEGORIES= security net ipv6 MASTER_SITES= TOR @@ -29,13 +28,15 @@ OPTIONS_DEFINE= STATIC_TOR TCMALLOC TOR2 STATIC_TOR_DESC= Build a static tor TCMALLOC_DESC= Use the tcmalloc memory allocation library -TOR2WEB_DESC= Faster but non-anonymous hidden services +TOR2WEB_DESC= (EXPERT OPTION) Faster but non-anonymous hidden services TRANSPARENT_DESC= Transparent proxy support OPTIONS_DEFAULT= TRANSPARENT USE_RC_SUBR= tor SUB_FILES= pkg-message +SUB_LIST= USER="${USERS}" GROUP="${GROUPS}" +PLIST_SUB= USER="${USERS}" GROUP="${GROUPS}" GROUPS= _tor USERS= _tor @@ -88,6 +89,16 @@ CONFIGURE_ARGS+= --enable-transparent CONFIGURE_ARGS+= --disable-transparent .endif +pre-everything:: +.if ${PORT_OPTIONS:MTOR2WEB} + @${ECHO_MSG} + @${ECHO_MSG} "Warning: The expert option 'tor2web' is chosen." + @${ECHO_MSG} " With this option tor cannot be used for regular traffic," + @${ECHO_MSG} " only for non-anonymous hidden service traffic." + @${ECHO_MSG} " Please make sure you understand this option." + @${ECHO_MSG} +.endif + post-patch: @${REINPLACE_CMD} -E -e "s@(-z) (relro|now)@-Wl,\1,\2@g" \ ${WRKSRC}/configure @@ -109,7 +120,7 @@ post-configure: ${WRKSRC}/Makefile post-install: - @${MKDIR} ${STAGEDIR}/var/log/tor ${STAGEDIR}/var/run/tor + @${MKDIR} ${STAGEDIR}/var/log/tor ${STAGEDIR}/var/run/tor ${STAGEDIR}/var/db/tor .if ! ${PORT_OPTIONS:MTOR2WEB} check regression-test test: build Modified: branches/2016Q4/security/tor/distinfo ============================================================================== --- branches/2016Q4/security/tor/distinfo Tue Oct 18 18:15:58 2016 (r424197) +++ branches/2016Q4/security/tor/distinfo Tue Oct 18 18:19:09 2016 (r424198) @@ -1,3 +1,3 @@ -TIMESTAMP = 1472080840 -SHA256 (tor-0.2.8.7.tar.gz) = ae44e2b699e82db7ff318432fd558dfa941ad154e4055f16d208514951742fc6 -SIZE (tor-0.2.8.7.tar.gz) = 5179093 +TIMESTAMP = 1476740628 +SHA256 (tor-0.2.8.9.tar.gz) = 3f5c273bb887be4aff11f4d99b9e2e52d293b81ff4f6302b730161ff16dc5316 +SIZE (tor-0.2.8.9.tar.gz) = 5306773 Modified: branches/2016Q4/security/tor/files/tor.in ============================================================================== --- branches/2016Q4/security/tor/files/tor.in Tue Oct 18 18:15:58 2016 (r424197) +++ branches/2016Q4/security/tor/files/tor.in Tue Oct 18 18:19:09 2016 (r424198) @@ -26,7 +26,7 @@ load_rc_config ${name} : ${tor_enable="NO"} : ${tor_conf="%%PREFIX%%/etc/tor/torrc"} -: ${tor_user="_tor"} +: ${tor_user="%%USER%%"} : ${tor_pidfile="/var/run/tor/tor.pid"} : ${tor_datadir="/var/db/tor"} Modified: branches/2016Q4/security/tor/pkg-plist ============================================================================== --- branches/2016Q4/security/tor/pkg-plist Tue Oct 18 18:15:58 2016 (r424197) +++ branches/2016Q4/security/tor/pkg-plist Tue Oct 18 18:19:09 2016 (r424198) @@ -9,5 +9,6 @@ man/man1/tor.1.gz man/man1/torify.1.gz %%DATADIR%%/geoip %%DATADIR%%/geoip6 -@dir(_tor,_tor,750) /var/run/tor -@dir(_tor,_tor,750) /var/log/tor +@dir(%%USER%%,%%GROUP%%,700) /var/run/tor +@dir(%%USER%%,%%GROUP%%,700) /var/log/tor +@dir(%%USER%%,%%GROUP%%,700) /var/db/tor