From owner-svn-ports-branches@freebsd.org Fri Jun 16 06:59:33 2017 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 3BB87BF8347; Fri, 16 Jun 2017 06:59:33 +0000 (UTC) (envelope-from pi@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 159837349E; Fri, 16 Jun 2017 06:59:33 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5G6xWRA013690; Fri, 16 Jun 2017 06:59:32 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5G6xVJ2013686; Fri, 16 Jun 2017 06:59:31 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201706160659.v5G6xVJ2013686@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Fri, 16 Jun 2017 06:59:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r443669 - branches/2017Q2/security/tor 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: Fri, 16 Jun 2017 06:59:33 -0000 Author: pi Date: Fri Jun 16 06:59:31 2017 New Revision: 443669 URL: https://svnweb.freebsd.org/changeset/ports/443669 Log: security/tor: update 0.2.9.10 -> 0.3.0.8 PR: 219246, 219863 Submitted by: Yuri Victorovich (maintainer) Approved by: ports-secteam (miwi, feld) MFH: 2017Q2 Relnotes: https://gitweb.torproject.org/tor.git/tree/ChangeLog Security: TROVE-2017-002, CVE-2017-0375, CVE-2017-0376 Modified: branches/2017Q2/security/tor/Makefile branches/2017Q2/security/tor/distinfo branches/2017Q2/security/tor/pkg-descr branches/2017Q2/security/tor/pkg-plist Modified: branches/2017Q2/security/tor/Makefile ============================================================================== --- branches/2017Q2/security/tor/Makefile Fri Jun 16 06:45:05 2017 (r443668) +++ branches/2017Q2/security/tor/Makefile Fri Jun 16 06:59:31 2017 (r443669) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= tor -PORTVERSION= 0.2.9.10 +PORTVERSION= 0.3.0.8 CATEGORIES= security net ipv6 MASTER_SITES= TOR @@ -12,27 +12,26 @@ COMMENT= Anonymizing overlay network for TCP LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_mips64= Does not build: error: Need a uint128_t implementation! -BROKEN_powerpc64= Does not build -BROKEN_sparc64= Does not build: error: Need a uint128_t implementation! +BROKEN_mips64= does not build: error: Need a uint128_t implementation! +BROKEN_powerpc64= does not build: error: Need a uint128_t implementation! +BROKEN_sparc64= does not build: error: Need a uint128_t implementation! USES= cpe gmake CPE_VENDOR= torproject GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-openssl-dir="${OPENSSLBASE}" --disable-asciidoc +CONFIGURE_ARGS= --with-openssl-dir="${OPENSSLBASE}" CONFIGURE_ENV= TOR_CPPFLAGS_libevent="-I${LOCALBASE}/include" \ TOR_LDFLAGS_libevent="-L${LOCALBASE}/lib/" \ TOR_LIBEVENT_LIBS="${TOR_LIBEVENT_LIBS}" -OPTIONS_DEFINE= STATIC_TOR TCMALLOC TOR2WEB TRANSPARENT +OPTIONS_DEFINE= MANPAGES DOCS STATIC_TOR TCMALLOC TOR2WEB +OPTIONS_DEFAULT=MANPAGES +OPTIONS_SUB= yes STATIC_TOR_DESC= Build a static tor TCMALLOC_DESC= Use the tcmalloc memory allocation library 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}" @@ -48,6 +47,12 @@ STATIC_TOR_USES_OFF= ssl .include +.if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MMANPAGES} +BUILD_DEPENDS+= asciidoc:textproc/asciidoc +.else +CONFIGURE_ARGS+= --disable-asciidoc +.endif + .if !defined(USE_GCC) && empty(CC:T:M*gcc4*) && \ empty(PORT_OPTIONS:MSTATIC_TOR) && empty(ARCH:Mia64) CONFIGURE_ARGS+= --enable-gcc-hardening @@ -79,12 +84,6 @@ LIB_DEPENDS+= libtcmalloc.so:devel/google-perftools CONFIGURE_ARGS+= --enable-tor2web-mode .endif -.if ${PORT_OPTIONS:MTRANSPARENT} -CONFIGURE_ARGS+= --enable-transparent -.else -CONFIGURE_ARGS+= --disable-transparent -.endif - pre-everything:: .if ${PORT_OPTIONS:MTOR2WEB} @${ECHO_MSG} @@ -110,10 +109,6 @@ post-patch-STATIC_TOR-off: post-patch-STATIC_TOR-on: @${REINPLACE_CMD} -e "s@-ltcmalloc@${LOCALBASE}/lib/libtcmalloc.a@" \ ${WRKSRC}/configure - -post-configure: - @${REINPLACE_CMD} -e '\|^nodist_man1_MANS =|s|$$|$$(install_mans:=.1)|' \ - ${WRKSRC}/Makefile post-install: @${MKDIR} ${STAGEDIR}/var/log/tor ${STAGEDIR}/var/run/tor ${STAGEDIR}/var/db/tor Modified: branches/2017Q2/security/tor/distinfo ============================================================================== --- branches/2017Q2/security/tor/distinfo Fri Jun 16 06:45:05 2017 (r443668) +++ branches/2017Q2/security/tor/distinfo Fri Jun 16 06:59:31 2017 (r443669) @@ -1,3 +1,3 @@ -TIMESTAMP = 1489657341 -SHA256 (tor-0.2.9.10.tar.gz) = d611283e1fb284b5f884f8c07e7d3151016851848304f56cfdf3be2a88bd1341 -SIZE (tor-0.2.9.10.tar.gz) = 5557586 +TIMESTAMP = 1496960659 +SHA256 (tor-0.3.0.8.tar.gz) = 663a3ba7b8a124c0f8a7351eaa2dda6fd518de3f3c4ee28fff869bfb03860d48 +SIZE (tor-0.3.0.8.tar.gz) = 5796845 Modified: branches/2017Q2/security/tor/pkg-descr ============================================================================== --- branches/2017Q2/security/tor/pkg-descr Fri Jun 16 06:45:05 2017 (r443668) +++ branches/2017Q2/security/tor/pkg-descr Fri Jun 16 06:59:31 2017 (r443669) @@ -10,4 +10,4 @@ messaging, IRC, SSH, and more. Tor also provides a pla software developers can build new applications with built-in anonymity, safety, and privacy features. -WWW: http://torproject.org/ +WWW: https://www.torproject.org/ Modified: branches/2017Q2/security/tor/pkg-plist ============================================================================== --- branches/2017Q2/security/tor/pkg-plist Fri Jun 16 06:45:05 2017 (r443668) +++ branches/2017Q2/security/tor/pkg-plist Fri Jun 16 06:59:31 2017 (r443669) @@ -3,10 +3,14 @@ bin/tor-gencert bin/tor-resolve bin/torify @sample etc/tor/torrc.sample -man/man1/tor-gencert.1.gz -man/man1/tor-resolve.1.gz -man/man1/tor.1.gz -man/man1/torify.1.gz +%%MANPAGES%%man/man1/tor-gencert.1.gz +%%MANPAGES%%man/man1/tor-resolve.1.gz +%%MANPAGES%%man/man1/tor.1.gz +%%MANPAGES%%man/man1/torify.1.gz +%%PORTDOCS%%%%DOCSDIR%%/tor-gencert.html +%%PORTDOCS%%%%DOCSDIR%%/tor-resolve.html +%%PORTDOCS%%%%DOCSDIR%%/tor.html +%%PORTDOCS%%%%DOCSDIR%%/torify.html %%DATADIR%%/geoip %%DATADIR%%/geoip6 @dir(%%USER%%,%%GROUP%%,700) /var/run/tor