From nobody Sat Oct 29 15:03:02 2022 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 4N02j22tvJz4g3X7; Sat, 29 Oct 2022 15:03:02 +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 4N02j22P9cz3l1q; Sat, 29 Oct 2022 15:03:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667055782; 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=dv2If53k/sWix8AMQdgA/WTdVpO/q3gDBA7eE+rE8nA=; b=s5ekbZZQPx6B/Pp1H8yNMUKwwme6x8wcHmKpxSdn9fBTU54+krgzytvR0mRtqJkeTbcQTc UWbtKH0UDkWYJCFh0rRQMJTJxXN0mtbn1AKOpPibX8Kvb6bXOm+ObBaQ4330hVKN4/npJY HgOBBGK/DPEgCxdDsdoGXbEpJFI/8gzDjcsUkYaPiOlO4loycDVSb6oN0LuHuhrG9E/y4b Wdw8EoQIEHf3hRD/QmFBhkr6DljL2422y3iJoVUrVnx4nOF6IxgI0yZjiwyQcrRWG6yrz8 cogYuN0lswMYxBn4gJXVza9l2Oyz3BPSM+8UkajPEMjStvUsyhC/9PS0woLtUw== 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 4N02j21SNpzM0x; Sat, 29 Oct 2022 15:03:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29TF32kn048587; Sat, 29 Oct 2022 15:03:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29TF32Tv048586; Sat, 29 Oct 2022 15:03:02 GMT (envelope-from git) Date: Sat, 29 Oct 2022 15:03:02 GMT Message-Id: <202210291503.29TF32Tv048586@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: 8e5a867d733f - main - security/tor: Fix build with libressl 3.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: 8e5a867d733f837a27ea72e0dae1e01f9bb524fd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667055782; 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=dv2If53k/sWix8AMQdgA/WTdVpO/q3gDBA7eE+rE8nA=; b=NUG7svUVA/01I6L9ubxK3gie+whF+Q+cLpNWHRboaERBCsmwmDIcFdSZSD97DbCiJ5N4yH PuGascPphfm0y/YsPUqju9RbxDgS8Q92zHrqbT2jdct+5w/No8Y+mAmr8NCXZJzKIj80nv CgEnViEoW9ytrIDj/doM5FkokitE5EnjGi2MF6od852W/b/dNFfx0TrBNYvw2KzJc7vQlM Q1W1ZGHCLDZX04YWciXcXsKUHQVrt86GhwTVNJaVVwm9FFXGZtvF8GyAE9sI+xrVQESkjt G+lUW1uon/98ujvQOkylEImcI/AuAj6KcgiBu0JWmLkkAJMgN15hFbaNpt6WmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667055782; a=rsa-sha256; cv=none; b=aIlC5q+um5//SMADX7ECpQODdYzyNoYK/jPH4iji1rhQ2shMUMPGu7Zv5/7KB5HGSglqDL ISTQrupdjuCzFcWtA6TizEP1FOCmXnSYF8JE3RV8jUAPpNOTvBlYZEhWIHa17ETjOfvwtP xvaeQ4I4Puw/WPo04mJkwVGmCvIBb8euT/p/KnCwu1BPZELEduvTEhIfXb+g6LVnLwij09 Ilzex9Yh0m2j26HEi1CZsrOIGShWtocmTpQJsU/JE4OgSWGYbBjMMV/sQdTMnQzl3xQBfQ faWiYlbov+HfQQiyRjiiamQ+HiQVgiCiRx/RMh0W0T7MlGzY2Wxex4p+slWs+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=8e5a867d733f837a27ea72e0dae1e01f9bb524fd commit 8e5a867d733f837a27ea72e0dae1e01f9bb524fd Author: Felix Palmen AuthorDate: 2022-10-29 15:01:58 +0000 Commit: Yuri Victorovich CommitDate: 2022-10-29 15:02:59 +0000 security/tor: Fix build with libressl 3.5 Differential Revision: https://reviews.freebsd.org/D37054 --- .../files/patch-src_lib_crypt__ops_compat__openssl.h | 19 +++++++++++++++++++ .../patch-src_lib_crypt__ops_crypto__openssl__mgt.h | 12 ++++++++++++ 2 files changed, 31 insertions(+) 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 new file mode 100644 index 000000000000..fae008ba2224 --- /dev/null +++ b/security/tor/files/patch-src_lib_crypt__ops_compat__openssl.h @@ -0,0 +1,19 @@ +--- 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 new file mode 100644 index 000000000000..153ef20eb890 --- /dev/null +++ b/security/tor/files/patch-src_lib_crypt__ops_crypto__openssl__mgt.h @@ -0,0 +1,12 @@ +--- 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. + *