From owner-svn-ports-branches@freebsd.org Mon Feb 15 18:56:12 2021 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 868755360D1; Mon, 15 Feb 2021 18:56:12 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DfYGh3TCZz3CTW; Mon, 15 Feb 2021 18:56:12 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6A56B22850; Mon, 15 Feb 2021 18:56:12 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 11FIuCHw051725; Mon, 15 Feb 2021 18:56:12 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 11FIuCYE051723; Mon, 15 Feb 2021 18:56:12 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <202102151856.11FIuCYE051723@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Mon, 15 Feb 2021 18:56:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r565326 - branches/2021Q1/security/tor X-SVN-Group: ports-branches X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: branches/2021Q1/security/tor X-SVN-Commit-Revision: 565326 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Feb 2021 18:56:12 -0000 Author: yuri Date: Mon Feb 15 18:56:11 2021 New Revision: 565326 URL: https://svnweb.freebsd.org/changeset/ports/565326 Log: MFH: r563905 r565148 r565324 security/tor: Update 0.4.4.6 -> 0.4.4.7 Reported by: upstream notification security/tor: Fix build with LibreSSL 3.2 PR: 253486 Submitted by: brnrd security/tor: Update 0.4.4.7 -> 0.4.5.6 Changelog: https://lists.torproject.org/pipermail/tor-announce/2021-February/000214.html - contains major and minor bugfixes and new features. Port options LTTNG,USDT,LOG_DEBUG backported from security/tor-devel. LIB_DEPENDS is fixes in STATIC_TOR option. Reported by: upstream notification Modified: branches/2021Q1/security/tor/Makefile branches/2021Q1/security/tor/distinfo Directory Properties: branches/2021Q1/ (props changed) Modified: branches/2021Q1/security/tor/Makefile ============================================================================== --- branches/2021Q1/security/tor/Makefile Mon Feb 15 18:55:43 2021 (r565325) +++ branches/2021Q1/security/tor/Makefile Mon Feb 15 18:56:11 2021 (r565326) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= tor -DISTVERSION= 0.4.4.6 -PORTREVISION= 1 +DISTVERSION= 0.4.5.6 CATEGORIES= security net MASTER_SITES= TOR @@ -24,13 +23,15 @@ CONFIGURE_ENV= TOR_CPPFLAGS_libevent="-I${LOCALBASE}/i TOR_LIBEVENT_LIBS="${TOR_LIBEVENT_LIBS}" OPTIONS_DEFINE= MANPAGES DOCS STATIC_TOR TCMALLOC -OPTIONS_GROUP= COMPRESSION -OPTIONS_GROUP_COMPRESSION=ZSTD LZMA +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 @@ -45,10 +46,23 @@ 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} @@ -72,6 +86,7 @@ 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 @@ -86,7 +101,8 @@ TOR_ZSTD_LIBS= -lzstd .if ${PORT_OPTIONS:MTCMALLOC} CONFIGURE_ARGS+= --with-malloc=tcmalloc .if ${PORT_OPTIONS:MSTATIC_TOR} -BUILD_DEPENDS+= ${LOCALBASE}/lib/libtcmalloc.a:devel/google-perftools +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 @@ -102,8 +118,8 @@ post-patch: ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|lib/tor|db/tor|' \ ${WRKSRC}/src/config/torrc.*.in \ - ${WRKSRC}/doc/tor.1.* \ - ${WRKSRC}/doc/tor.html.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 Modified: branches/2021Q1/security/tor/distinfo ============================================================================== --- branches/2021Q1/security/tor/distinfo Mon Feb 15 18:55:43 2021 (r565325) +++ branches/2021Q1/security/tor/distinfo Mon Feb 15 18:56:11 2021 (r565326) @@ -1,3 +1,3 @@ -TIMESTAMP = 1605221558 -SHA256 (tor-0.4.4.6.tar.gz) = 5f154c155803adf5c89e87cab53017b6908c5ebe50c65839e8cf4fbd2abe1fdc -SIZE (tor-0.4.4.6.tar.gz) = 7806477 +TIMESTAMP = 1613411993 +SHA256 (tor-0.4.5.6.tar.gz) = 22cba3794fedd5fa87afc1e512c6ce2c21bc20b4e1c6f8079d832dc1e545e733 +SIZE (tor-0.4.5.6.tar.gz) = 7926711