Index: head/security/tor/Makefile =================================================================== --- head/security/tor/Makefile (revision 489647) +++ head/security/tor/Makefile (revision 489648) @@ -1,132 +1,117 @@ # Created by: peter.thoenen@yahoo.com # $FreeBSD$ PORTNAME= tor -DISTVERSION= 0.3.4.9 -PORTREVISION= 1 +DISTVERSION= 0.3.5.7 CATEGORIES= security net ipv6 MASTER_SITES= TOR MAINTAINER= yuri@FreeBSD.org COMMENT= Anonymizing overlay network for TCP LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE USES= compiler:c11 cpe gmake pkgconfig # should be compiler:c99 or compiler:gnu99 USE_CSTD= gnu99 # until this bug report is closed: https://trac.torproject.org/projects/tor/ticket/27900 CPE_VENDOR= torproject GNU_CONFIGURE= yes 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= MANPAGES DOCS STATIC_TOR TCMALLOC TOR2WEB +OPTIONS_DEFINE= MANPAGES DOCS STATIC_TOR TCMALLOC OPTIONS_GROUP= COMPRESSION OPTIONS_GROUP_COMPRESSION=ZSTD LZMA OPTIONS_DEFAULT=MANPAGES ZSTD LZMA 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 COMPRESSION_DESC= Supported compression libraries 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_INSTALL= tor-devel-[0-9]* STATIC_TOR_USES= ssl:build STATIC_TOR_USES_OFF= ssl -TOR2WEB_CONFIGURE_ENABLE= tor2web-mode ZSTD_CONFIGURE_ENABLE= zstd ZSTD_CONFIGURE_ENV=TOR_ZSTD_LIBS="${TOR_ZSTD_LIBS}" LZMA_CONFIGURE_ENABLE= lzma .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) 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 . if ${PORT_OPTIONS:MZSTD} BUILD_DEPENDS+= ${LOCALBASE}/lib/libzstd.a:archivers/zstd TOR_ZSTD_LIBS= ${LOCALBASE}/lib/libzstd.a . endif .else CONFIGURE_ARGS+= --enable-linker-hardening LIB_DEPENDS+= libevent.so:devel/libevent TOR_LIBEVENT_LIBS= -levent . if ${PORT_OPTIONS:MZSTD} LIB_DEPENDS+= libzstd.so:archivers/zstd TOR_ZSTD_LIBS= -lzstd . endif .endif .if ${PORT_OPTIONS:MTCMALLOC} -CONFIGURE_ARGS+= --with-tcmalloc +CONFIGURE_ARGS+= --with-malloc=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 -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-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} \ + @cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_ARGS} check -.endif .include Index: head/security/tor/distinfo =================================================================== --- head/security/tor/distinfo (revision 489647) +++ head/security/tor/distinfo (revision 489648) @@ -1,3 +1,3 @@ -TIMESTAMP = 1541177990 -SHA256 (tor-0.3.4.9.tar.gz) = 1a171081f02b9a6ff9e28c0898defb7670e5bbb3bdbcaddfcf4e4304aedd164a -SIZE (tor-0.3.4.9.tar.gz) = 6695931 +TIMESTAMP = 1546931112 +SHA256 (tor-0.3.5.7.tar.gz) = 1b0887fc21ac535befea7243c5d5f1e31394d7458d64b30807a3e98cca0d839e +SIZE (tor-0.3.5.7.tar.gz) = 6934521 Index: head/security/tor/pkg-plist =================================================================== --- head/security/tor/pkg-plist (revision 489647) +++ head/security/tor/pkg-plist (revision 489648) @@ -1,18 +1,21 @@ bin/tor bin/tor-gencert +bin/tor-print-ed-signing-cert bin/tor-resolve bin/torify @sample etc/tor/torrc.sample %%MANPAGES%%man/man1/tor-gencert.1.gz +%%MANPAGES%%man/man1/tor-print-ed-signing-cert.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-print-ed-signing-cert.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