From ee3fc5c515c8ac50565173782240231b7d046945 Mon Sep 17 00:00:00 2001 From: Kurt Jaeger Date: Fri, 16 Jun 2017 06:59:31 +0000 Subject: 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 --- security/tor/Makefile | 33 ++++++++++++++------------------- security/tor/distinfo | 6 +++--- security/tor/pkg-descr | 2 +- security/tor/pkg-plist | 12 ++++++++---- 4 files changed, 26 insertions(+), 27 deletions(-) diff --git a/security/tor/Makefile b/security/tor/Makefile index 8c365df20639..e0c34c22da01 100644 --- a/security/tor/Makefile +++ b/security/tor/Makefile @@ -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,26 +12,25 @@ 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 @@ -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} @@ -111,10 +110,6 @@ 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 diff --git a/security/tor/distinfo b/security/tor/distinfo index 11683edca096..50145ac0ce37 100644 --- a/security/tor/distinfo +++ b/security/tor/distinfo @@ -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 diff --git a/security/tor/pkg-descr b/security/tor/pkg-descr index f221f39cabac..3e6160b1c255 100644 --- a/security/tor/pkg-descr +++ b/security/tor/pkg-descr @@ -10,4 +10,4 @@ messaging, IRC, SSH, and more. Tor also provides a platform on which software developers can build new applications with built-in anonymity, safety, and privacy features. -WWW: http://torproject.org/ +WWW: https://www.torproject.org/ diff --git a/security/tor/pkg-plist b/security/tor/pkg-plist index a676ac5c65d5..f695dd5dffaa 100644 --- a/security/tor/pkg-plist +++ b/security/tor/pkg-plist @@ -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 -- cgit v1.2.3