Index: branches/2017Q2/security/tor/Makefile =================================================================== --- branches/2017Q2/security/tor/Makefile (revision 443668) +++ branches/2017Q2/security/tor/Makefile (revision 443669) @@ -1,127 +1,122 @@ # Created by: peter.thoenen@yahoo.com # $FreeBSD$ PORTNAME= tor -PORTVERSION= 0.2.9.10 +PORTVERSION= 0.3.0.8 CATEGORIES= security net ipv6 MASTER_SITES= TOR MAINTAINER= yuri@rawbw.com 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}" PLIST_SUB= USER="${USERS}" GROUP="${GROUPS}" GROUPS= _tor USERS= _tor CONFLICTS= tor-devel-[0-9]* STATIC_TOR_USES= ssl:build 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 .else CONFIGURE_ARGS+= --disable-gcc-hardening .endif .if ${PORT_OPTIONS:MSTATIC_TOR} BUILD_DEPENDS += ${LOCALBASE}/lib/libevent.a:devel/libevent CONFIGURE_ARGS+= --enable-static-tor \ --with-zlib-dir=/usr/lib --disable-linker-hardening TOR_LIBEVENT_LIBS= ${LOCALBASE}/lib/libevent.a .else CONFIGURE_ARGS+= --enable-linker-hardening LIB_DEPENDS+= libevent.so:devel/libevent TOR_LIBEVENT_LIBS= -levent .endif .if ${PORT_OPTIONS:MTCMALLOC} CONFIGURE_ARGS+= --with-tcmalloc .if ${PORT_OPTIONS:MSTATIC_TOR} BUILD_DEPENDS+= ${LOCALBASE}/lib/libtcmalloc.a:devel/google-perftools .else LIB_DEPENDS+= libtcmalloc.so:devel/google-perftools .endif .endif .if ${PORT_OPTIONS:MTOR2WEB} 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} @${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 @${REINPLACE_CMD} -e 's|lib/tor|db/tor|' \ ${WRKSRC}/src/config/torrc.*.in \ ${WRKSRC}/doc/tor.1.* \ ${WRKSRC}/doc/tor.html.in post-patch-STATIC_TOR-off: @${REINPLACE_CMD} -e "s@-ltcmalloc@${LOCALBASE}/lib/libtcmalloc.so@" \ ${WRKSRC}/configure 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 .if ! ${PORT_OPTIONS:MTOR2WEB} check regression-test test: build @cd ${BUILD_WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_ARGS} check .endif .include Index: branches/2017Q2/security/tor/distinfo =================================================================== --- branches/2017Q2/security/tor/distinfo (revision 443668) +++ branches/2017Q2/security/tor/distinfo (revision 443669) @@ -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 Index: branches/2017Q2/security/tor/pkg-descr =================================================================== --- branches/2017Q2/security/tor/pkg-descr (revision 443668) +++ branches/2017Q2/security/tor/pkg-descr (revision 443669) @@ -1,13 +1,13 @@ Tor: an anonymizing overlay network for TCP Tor is a connection-based low-latency anonymous communication system which addresses many flaws in the original onion routing design. Tor is a toolset for a wide range of organizations and people that want to improve their safety and security on the Internet. Using Tor can help you anonymize web browsing and publishing, instant 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/ Index: branches/2017Q2/security/tor/pkg-plist =================================================================== --- branches/2017Q2/security/tor/pkg-plist (revision 443668) +++ branches/2017Q2/security/tor/pkg-plist (revision 443669) @@ -1,14 +1,18 @@ bin/tor 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 @dir(%%USER%%,%%GROUP%%,700) /var/log/tor @dir(%%USER%%,%%GROUP%%,700) /var/db/tor