diff --git a/security/tor/Makefile b/security/tor/Makefile index 1b469e42357a..84a5b0380a5e 100644 --- a/security/tor/Makefile +++ b/security/tor/Makefile @@ -1,125 +1,125 @@ PORTNAME= tor -DISTVERSION= 0.4.7.13 +DISTVERSION= 0.4.8.5 CATEGORIES= security net MASTER_SITES= TOR MAINTAINER= yuri@FreeBSD.org COMMENT= Anonymizing overlay network for TCP WWW= https://www.torproject.org/ 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_EXCLUDE_FreeBSD_12=DOCS MANPAGES # XXX(rene) a2x somehow broken there OPTIONS_SUB= yes STATIC_TOR_DESC= Build a static tor 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 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 2b1607ad8f0d..7cf5c70da74f 100644 --- a/security/tor/distinfo +++ b/security/tor/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1673698675 -SHA256 (tor-0.4.7.13.tar.gz) = 2079172cce034556f110048e26083ce9bea751f3154b0ad2809751815b11ea9d -SIZE (tor-0.4.7.13.tar.gz) = 8031948 +TIMESTAMP = 1693427495 +SHA256 (tor-0.4.8.5.tar.gz) = 6957cfd14a29eee7555c52f8387a46f2ce2f5fe7dadf93547f1bc74b1657e119 +SIZE (tor-0.4.8.5.tar.gz) = 8237202 diff --git a/security/tor/files/patch-doc_asciidoc-helper.sh b/security/tor/files/patch-doc_asciidoc-helper.sh index 2dcd9cd7fc2a..966f76b73f35 100644 --- a/security/tor/files/patch-doc_asciidoc-helper.sh +++ b/security/tor/files/patch-doc_asciidoc-helper.sh @@ -1,10 +1,12 @@ ---- doc/asciidoc-helper.sh.orig 2022-02-04 16:24:11 UTC +--- doc/asciidoc-helper.sh.orig 2023-08-30 12:58:59 UTC +++ doc/asciidoc-helper.sh -@@ -12,7 +12,6 @@ if [ $# != 3 ]; then - exit 1; +@@ -12,9 +12,6 @@ if [ $# != 3 ]; then + exit 1 fi --SOURCE_DATE_EPOCH="$(git show --no-patch --format='%ct')" - export SOURCE_DATE_EPOCH - +-SOURCE_DATE_EPOCH="$(git -C "$(dirname "$0")" show --no-patch --format='%ct')" +-export SOURCE_DATE_EPOCH +- output=$3 + + if [ "$1" = "html" ]; then diff --git a/security/tor/files/patch-src_lib_crypt__ops_compat__openssl.h b/security/tor/files/patch-src_lib_crypt__ops_compat__openssl.h deleted file mode 100644 index fae008ba2224..000000000000 --- a/security/tor/files/patch-src_lib_crypt__ops_compat__openssl.h +++ /dev/null @@ -1,19 +0,0 @@ ---- src/lib/crypt_ops/compat_openssl.h.orig 2022-10-17 12:38:04 UTC -+++ src/lib/crypt_ops/compat_openssl.h -@@ -25,14 +25,13 @@ - #error "We require OpenSSL >= 1.0.1" - #endif - --#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) && \ -- ! defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) - /* We define this macro if we're trying to build with the majorly refactored - * API in OpenSSL 1.1 */ - #define OPENSSL_1_1_API - #endif /* OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) && ... */ - --#ifndef OPENSSL_1_1_API -+#if !defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER) - #define OpenSSL_version(v) SSLeay_version(v) - #define tor_OpenSSL_version_num() SSLeay() - #define RAND_OpenSSL() RAND_SSLeay() diff --git a/security/tor/files/patch-src_lib_crypt__ops_crypto__openssl__mgt.h b/security/tor/files/patch-src_lib_crypt__ops_crypto__openssl__mgt.h deleted file mode 100644 index 153ef20eb890..000000000000 --- a/security/tor/files/patch-src_lib_crypt__ops_crypto__openssl__mgt.h +++ /dev/null @@ -1,12 +0,0 @@ ---- src/lib/crypt_ops/crypto_openssl_mgt.h.orig 2022-10-17 12:37:26 UTC -+++ src/lib/crypt_ops/crypto_openssl_mgt.h -@@ -54,8 +54,7 @@ - #define DISABLE_ENGINES - #endif - --#if OPENSSL_VERSION_NUMBER >= OPENSSL_VER(1,1,0,0,5) && \ -- !defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER >= OPENSSL_VER(1,1,0,0,5) - /* OpenSSL as of 1.1.0pre4 has an "new" thread API, which doesn't require - * setting up various callbacks. - *