From nobody Fri Nov 04 11:13:37 2022 X-Original-To: dev-commits-ports-main@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 4N3dKZ095fz4hkhl; Fri, 4 Nov 2022 11:13:38 +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 4N3dKY6ksJz3lm4; Fri, 4 Nov 2022 11:13:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667560418; 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=a3tz38SiKfWcGpnfkrj3u/NGgW96fBHNcmRQ/hpfVGk=; b=lxsQSXC5S3Ae9byPXSGAJxnztmw6GeHpccR8ejFAF+Xp614b4xv4aOd75V/6UtvMZt56kY L0iSvR559VGqL5DyszQqlDMKi+DiOGzDNG2R+68vXqgUx4gKEGl91kT41nLScPoozK3RA7 hC6AmsgSm3K9CjkPT7Pf1tKvus+VZChqhM9MRODIbH4FQwZWQ9TnzrC8g1mJJfSpP9zN+i sCwMVczVQijW7Bf9/R4D4FgKVrrpx9EEb5sZiFGJIHjXvLVnynfzfybRorzp/hsXBdfV1a kMvrUB5I9REbqfxxqVInQQLfNCWPmdYCPA7MalruYOBcONmo+fOSftCCd0vbOQ== 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 4N3dKY5m6Nz1DdT; Fri, 4 Nov 2022 11:13:37 +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 2A4BDbG2042358; Fri, 4 Nov 2022 11:13:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A4BDbp9042357; Fri, 4 Nov 2022 11:13:37 GMT (envelope-from git) Date: Fri, 4 Nov 2022 11:13:37 GMT Message-Id: <202211041113.2A4BDbp9042357@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Felix Palmen Subject: git: 1f7edad4ceda - main - security/libssh2: Fix build with libressl-3.5 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zirias X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f7edad4ceda225d95f13ea187316b3d3b05f8e4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667560417; 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=a3tz38SiKfWcGpnfkrj3u/NGgW96fBHNcmRQ/hpfVGk=; b=Q4xrw29aNIcqbTB5l4SA6Hh5UkoZPyqwrIO7xex3pLnOvFVznKhSQulphC13D9hY0m6+au SfRhyV0QkYTlVXYW4PEIqufcS1jJ0p+e3g5ag4AOp8m5I7xReisuZ6PxCFtBgR/NHiYexD VHZFpc7bbB4YdsqiXHUGaFaMNY2d1ZLSuSnPTZAxX2hFTDGJMio3y9VqTPzkuyc3HA57WT lnkLq6w7fxXMphTX6cfTCGh+JBr27a6YwcgPvsCSgtOtQuIis9LZzfLHFBPU/hpNbBjrSe NhSEXa4yVuFMLa1c2byxP3BWQmL7TJjrsUdFIr013byjNErj9wLemeOsg9ckIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667560417; a=rsa-sha256; cv=none; b=CX5YlhtauAjsQbUwpQPmde1l5FBjoVc1RJGc70I3/PBzWLE8qJc1dG9iT4ZDnPTf+waoul DI3rFP3OQjeOYGiCduL8S+TT7WFgiCscMbXEl2/bkh/aUPVCtu1T8Jz+UOwBFIPpdFoQM2 jNQWJ5FxtojqkY/iiSLYFx/vHsXTYRobt85Eai8GWlNBqhxj9AmA06mynPYZX+ARmJ962O 9jMPGsaMeikQcg7T+3h0qB/5j1CLOEOp5Lt+oeNoFzORdeFPcutY9NnVvkCveIfO0Z7HjB GZMtHtd3VGu8EhtaSPDWpeLRx7mTmnHG2hw32hfthi4eKpaQ/x+WPj7n4iBUEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=1f7edad4ceda225d95f13ea187316b3d3b05f8e4 commit 1f7edad4ceda225d95f13ea187316b3d3b05f8e4 Author: Felix Palmen AuthorDate: 2022-10-17 08:31:18 +0000 Commit: Felix Palmen CommitDate: 2022-11-04 11:13:13 +0000 security/libssh2: Fix build with libressl-3.5 Approved by: sbz (maintainer, timeout), tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D37045 --- security/libssh2/files/patch-src_openssl.c | 12 ++++++++++++ security/libssh2/files/patch-src_openssl.h | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/security/libssh2/files/patch-src_openssl.c b/security/libssh2/files/patch-src_openssl.c new file mode 100644 index 000000000000..3e167ab08da8 --- /dev/null +++ b/security/libssh2/files/patch-src_openssl.c @@ -0,0 +1,12 @@ +--- src/openssl.c.orig 2022-10-17 08:20:24 UTC ++++ src/openssl.c +@@ -653,8 +653,7 @@ _libssh2_EVP_aes_256_ctr(void) + + void _libssh2_openssl_crypto_init(void) + { +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \ +- !defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L + #ifndef OPENSSL_NO_ENGINE + ENGINE_load_builtin_engines(); + ENGINE_register_all_complete(); diff --git a/security/libssh2/files/patch-src_openssl.h b/security/libssh2/files/patch-src_openssl.h new file mode 100644 index 000000000000..0bbca531c2c7 --- /dev/null +++ b/security/libssh2/files/patch-src_openssl.h @@ -0,0 +1,12 @@ +--- src/openssl.h.orig 2022-10-17 08:18:24 UTC ++++ src/openssl.h +@@ -57,8 +57,7 @@ + #include + #include + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \ +- !defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L + # define HAVE_OPAQUE_STRUCTS 1 + #endif +