diff --git a/security/tor/Makefile b/security/tor/Makefile index d7aa3a07628e..5222e2636f4c 100644 --- a/security/tor/Makefile +++ b/security/tor/Makefile @@ -1,130 +1,130 @@ # Created by: peter.thoenen@yahoo.com PORTNAME= tor -DISTVERSION= 0.4.5.8 +DISTVERSION= 0.4.6.5 CATEGORIES= security net 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 OPTIONS_GROUP= COMPRESSION TRACING OPTIONS_GROUP_COMPRESSION= ZSTD LZMA OPTIONS_GROUP_TRACING= LTTNG USDT LOG_DEBUG OPTIONS_DEFAULT=MANPAGES ZSTD LZMA OPTIONS_SUB= yes STATIC_TOR_DESC= Build a static tor TCMALLOC_DESC= Use the tcmalloc memory allocation library COMPRESSION_DESC= Supported compression libraries TRACING_DESC= Tracing 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 STATIC_TOR_USES= ssl:build STATIC_TOR_USES_OFF= ssl # compression options ZSTD_CONFIGURE_ENABLE= zstd ZSTD_CONFIGURE_ENV=TOR_ZSTD_LIBS="${TOR_ZSTD_LIBS}" LZMA_CONFIGURE_ENABLE= lzma # tracing options LTTNG_DESC= Build with LTTng-UST instrumentation LTTNG_USES= localbase LTTNG_CONFIGURE_ENABLE= tracing-instrumentation-lttng LTTNG_LIB_DEPENDS= liblttng-ust.so:sysutils/lttng-ust USDT_DESC= Build with tracing USDT instrumentation USDT_CONFIGURE_ENABLE= tracing-instrumentation-usdt USDT_LIB_DEPENDS= liblttng-ust.so:sysutils/lttng-ust USDT_BROKEN= error: use of undeclared identifier 'tor_circuit': https://gitlab.torproject.org/tpo/core/tor/-/issues/40174#note_2714275 LOG_DEBUG_DESC= Build with tracing event to debug log LOG_DEBUG_CONFIGURE_ENABLE= tracing-instrumentation-log-debug .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 LDFLAGS+= -lelf # needed by libexecinfo.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-malloc=tcmalloc .if ${PORT_OPTIONS:MSTATIC_TOR} BUILD_DEPENDS+= ${LOCALBASE}/lib/libtcmalloc.a:devel/google-perftools # for static 'tor' executable RUN_DEPENDS+= google-perftool>0:devel/google-perftools # for a still-dynamic 'tor-gencert' executable LDFLAGS+= -lc++ -lm # required by libtcmalloc.a and isn't cocered by google-perftools' `pkg-config --libs libtcmalloc` output .else LIB_DEPENDS+= libtcmalloc.so:devel/google-perftools .endif .endif .if ${SSL_DEFAULT:Mlibressl*} BROKEN= Libressl 3.2.1 with compatibility issues to Tor relays: https://gitlab.torproject.org/tpo/core/tor/-/issues/40128 .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/man/tor.1.* \ ${WRKSRC}/doc/man/tor.html.in post-install: @${MKDIR} ${STAGEDIR}/var/log/tor ${STAGEDIR}/var/run/tor ${STAGEDIR}/var/db/tor check regression-test test: build @cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_ARGS} check .include diff --git a/security/tor/distinfo b/security/tor/distinfo index b53c2ebb696e..b7845c02f153 100644 --- a/security/tor/distinfo +++ b/security/tor/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1620663231 -SHA256 (tor-0.4.5.8.tar.gz) = 57ded091e8bcdcebb0013fe7ef4a4439827cb169358c7874fd05fa00d813e227 -SIZE (tor-0.4.5.8.tar.gz) = 7826458 +TIMESTAMP = 1623691730 +SHA256 (tor-0.4.6.5.tar.gz) = 7b6d354e0d9791eace4b51e92211909308297b7aa257993937163d7ee0694cf9 +SIZE (tor-0.4.6.5.tar.gz) = 7754823