From nobody Sat Sep 02 00:50:43 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RcxCS1nVlz4s7D3; Sat, 2 Sep 2023 00:50:44 +0000 (UTC) (envelope-from git@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 4RcxCR5XjBz3Mck; Sat, 2 Sep 2023 00:50:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693615843; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZS6Txga6HUdvbPJij7qkt7wILPEn52mQxn/QNzxZtJc=; b=wFUNs38TUKyFyFz1UDrGmI8Yv7UfpffqOuLawq5BrpR0aW6mpO8Ujq+KFna0cdxfqH1RjP U4M2EyZDhDAxoNsHUw5kfUYn88fYJQUmQtIodOxfjR9TYd4EpGwqr9WLtS9HRZQsHN/Kdk L9PHXy1WBobwhRcTupwHxMkqdhPQnIeAqj3ng1Z5gBijrWJQqb/QnxJimHC3lnLc7x8Dw3 httTJUEb9YKTRJdChO/EQhoXHwVfD6ONYtUNk9AFBDgIq7rIvWW3ArU05GZV2owF4L0P4F pv8RoBDmrubQgW/XRyF50MUOK7Sf0Z2DDcoghM5VhvmsNjF4wEG246AIHxFduQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693615843; a=rsa-sha256; cv=none; b=ffTObt8XZC3M7CGsZZ4fyiqXxNe4xfjxG8Y1tD8rRlBHDyzWrVM8a/v9YXJ9jv9i5g2NBX AfCLzgqojqyRtSoUrFHzGKhExIstKWPIdvxmjGsxVSqKCGy0p0aPyirfdStHi4/nZUWpT+ fS6DD04p2nvwWZ22LwBfIT391V/grCkfjd/Nyx77qOzrZ8zgb6qStra2bOG75/qtG5Pjl6 egOFBaR0dW/RVFl9KJw/OU2XxSxrgfkVl2QdkrhduLhbbuVOAxOfnT/0luOQnNmA7hiOkc K0rHPrYuWWok42kpoJ5XE88mYIt0psV05a9Hunl7v9p6rkUlTdlg7flPh6Ub+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693615843; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZS6Txga6HUdvbPJij7qkt7wILPEn52mQxn/QNzxZtJc=; b=AnlZVY1u6KJH9mzbqIiN5QxtdgYiYXQADyWZm2IR8oeWTBxDfmGso89dfeqjdCQgeKKAx1 KagEyLrhkRKu2kneZcIlJ8CnwgKTXX1R8mLjza1xBH2BRt8gVa6di0vU7RknyGrCzCjTx7 mFGTx7mJCGuBGMlHwUdnYFlTr5wRUmM42Haf8kjc6XRE2bI76w/J2DwPDWmsCKBgbWMB2S q9L8EWmF8Pw56L6EnZJtUcalVLb461unKYWd/7+EBIzQ05iqS2wrAgLGg9/ILg5ee5agno 9wcrjh32Wz6XFW3v4THoZatvcJpAoaapbpK724biECLp29aJhL3SV7FSIQn+7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RcxCR4d4Pz7PB; Sat, 2 Sep 2023 00:50:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3820oho5059064; Sat, 2 Sep 2023 00:50:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3820oh54059061; Sat, 2 Sep 2023 00:50:43 GMT (envelope-from git) Date: Sat, 2 Sep 2023 00:50:43 GMT Message-Id: <202309020050.3820oh54059061@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 94ed6cbc3e83 - main - security/tor: update 0.4.7.13 =?utf-8?Q?=E2=86=92?= 0.4.8.5 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 94ed6cbc3e83edb1d7bc48ce7b6251b3cf87365a Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=94ed6cbc3e83edb1d7bc48ce7b6251b3cf87365a commit 94ed6cbc3e83edb1d7bc48ce7b6251b3cf87365a Author: Rene Ladan AuthorDate: 2023-09-02 00:47:16 +0000 Commit: Yuri Victorovich CommitDate: 2023-09-02 00:50:39 +0000 security/tor: update 0.4.7.13 → 0.4.8.5 PR: 273471 --- security/tor/Makefile | 2 +- security/tor/distinfo | 6 +++--- security/tor/files/patch-doc_asciidoc-helper.sh | 14 ++++++++------ .../files/patch-src_lib_crypt__ops_compat__openssl.h | 19 ------------------- .../patch-src_lib_crypt__ops_crypto__openssl__mgt.h | 12 ------------ 5 files changed, 12 insertions(+), 41 deletions(-) diff --git a/security/tor/Makefile b/security/tor/Makefile index 1b469e42357a..84a5b0380a5e 100644 --- a/security/tor/Makefile +++ b/security/tor/Makefile @@ -1,5 +1,5 @@ PORTNAME= tor -DISTVERSION= 0.4.7.13 +DISTVERSION= 0.4.8.5 CATEGORIES= security net MASTER_SITES= TOR 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. - *