From nobody Thu Nov 24 11:13:11 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 4NHwMq328fz4hwTk; Thu, 24 Nov 2022 11:13:11 +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 4NHwMq2ZYYz41Fs; Thu, 24 Nov 2022 11:13:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669288391; 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=+T1uar0oLvWsZg0+EljPEkMmH2MBYhRbxbDpv9P4vhg=; b=gjo9kLuc+Giq/yPkpjfk0dlZac2MI6d6FbOV5qzhEJUWwBoUOxRhePnnAhwVZeetq0NojJ 8nwP0EQdEmciKGC6wweg9aJ2NDePkzF8KZd2vb9YU+AXhjCaw+x0uABg93ECVKw/AMFjTN owzp7vMKtgo4Oc8ScQPUMjLpUBkxlrK96bUtpRUzq84A+a7DnEtK7qIwYYaebyNcxsggyc 4KZDTmKrsyRxfUeqbdSaLCIr12E014IWBOmzC/gxxzLgXP0SBFiSkwpdjtkWYkwTejVOXi HKEO1qb4fH5x8wyqMdqrf8ozE+aNofWT05ipqGXmvqNX2WK+VuYT0CQc3kjdwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669288391; 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=+T1uar0oLvWsZg0+EljPEkMmH2MBYhRbxbDpv9P4vhg=; b=wRtt1CyTpBUO7kY+Pwi/O4E1oz3ve+klXSeW5SOpPTql63FirSK+kVffIc1tB4CETxxThb hZbZMlmT1tdR7ZrGRiQFmL0N1yKujp41UV3det/5I58H1/O1YSh4mrOE09AGaUCfPnyE+Z HHUfSrTljovlcILr2QL4iB2YF2EXI1VZnN0MfWAyM4JeC8hcF9/aYHbteh14x60QYRzeoa rVWeiQJAMGmy5EdHJEUkMl8eEdzKgLay4LxcvpWwWMq36LdIshLd5D8WliAYrxd54rVwsy zZW/ZX2m71BVamV2pSiP0gZTFB0a79fvy63+/7PIEDbcInL7kMktMuDQNC6WgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669288391; a=rsa-sha256; cv=none; b=Ht4dsz1dYMqxqfcCkZfNGIj6MPXMNWuP18MXT9GKtMWt/8qHCXT/20A9QP2pJZH13v2c3r 84QYs8epKOVs9X+Iky9fA6BAXPAE2lCRlOTZRznONTYqg2TiWgdTDVAVIhGbKDK/Ww6Bno LReSy8w45sRzd92WPjgfogT494Q3ElAqzxk/6whUUKT4efSR7WOIKAdu6CHx+T7Z/n4mc+ TfbOJjkuPbUPI/IjZ59l/xqjwtNuDGjOPJRksx3y5ieCYPre8ENa5FdnRIa1YPVO3QQ/yQ DtkCq3MV8WiimXVm7gMy85GZcmT4c6jgLWl1N1aADa0dCbPDHpOHt6TKqpe4FQ== 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 4NHwMq1f8Zz10Xg; Thu, 24 Nov 2022 11:13:11 +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 2AOBDBMh083627; Thu, 24 Nov 2022 11:13:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AOBDBI9083626; Thu, 24 Nov 2022 11:13:11 GMT (envelope-from git) Date: Thu, 24 Nov 2022 11:13:11 GMT Message-Id: <202211241113.2AOBDBI9083626@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: 742d2cce37f9 - main - security/libssh2: Import upstream libressl-3.5 fix 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: 742d2cce37f9b3cbbe80452fa572a75a1fe441d5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=742d2cce37f9b3cbbe80452fa572a75a1fe441d5 commit 742d2cce37f9b3cbbe80452fa572a75a1fe441d5 Author: Felix Palmen AuthorDate: 2022-11-05 07:29:30 +0000 Commit: Felix Palmen CommitDate: 2022-11-24 11:12:04 +0000 security/libssh2: Import upstream libressl-3.5 fix Backport upstream commit instead of using own local patch. Also bump port revision, it will change the binary when built with libressl. Approved by: sbz (maintainer, timeout), tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D37278 --- security/libssh2/Makefile | 1 + security/libssh2/files/patch-src_openssl.c | 12 ------------ security/libssh2/files/patch-src_openssl.h | 11 ++++++++--- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/security/libssh2/Makefile b/security/libssh2/Makefile index 9c113be1c278..53396fd8b69b 100644 --- a/security/libssh2/Makefile +++ b/security/libssh2/Makefile @@ -1,5 +1,6 @@ PORTNAME= libssh2 PORTVERSION= 1.10.0 +PORTREVISION= 1 PORTEPOCH= 3 CATEGORIES= security devel MASTER_SITES= https://www.libssh2.org/download/ \ diff --git a/security/libssh2/files/patch-src_openssl.c b/security/libssh2/files/patch-src_openssl.c deleted file mode 100644 index 3e167ab08da8..000000000000 --- a/security/libssh2/files/patch-src_openssl.c +++ /dev/null @@ -1,12 +0,0 @@ ---- 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 index 0bbca531c2c7..efde2680c54d 100644 --- a/security/libssh2/files/patch-src_openssl.h +++ b/security/libssh2/files/patch-src_openssl.h @@ -1,12 +1,17 @@ ---- src/openssl.h.orig 2022-10-17 08:18:24 UTC +Backported from upstream commit + + +--- src/openssl.h.orig 2021-05-14 21:36:06 UTC +++ src/openssl.h -@@ -57,8 +57,7 @@ +@@ -57,8 +57,9 @@ #include #include -#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \ - !defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && \ ++ !defined(LIBRESSL_VERSION_NUMBER)) || \ ++ LIBRESSL_VERSION_NUMBER >= 0x3050000fL # define HAVE_OPAQUE_STRUCTS 1 #endif