From nobody Thu Jan 6 18:55:22 2022 X-Original-To: dev-commits-ports-branches@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 EBB3F194200A; Thu, 6 Jan 2022 18:55:22 +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 4JVFsk4lXrz4j6v; Thu, 6 Jan 2022 18:55:22 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 839AA25162; Thu, 6 Jan 2022 18:55:22 +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 206ItMCI040040; Thu, 6 Jan 2022 18:55:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 206ItMiT040039; Thu, 6 Jan 2022 18:55:22 GMT (envelope-from git) Date: Thu, 6 Jan 2022 18:55:22 GMT Message-Id: <202201061855.206ItMiT040039@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Fechner Subject: git: e201bec79bd2 - 2022Q1 - devel/libgit2: fix linking with libressl List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q1 X-Git-Reftype: branch X-Git-Commit: e201bec79bd22afa624cea27910268c4137945ef Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641495322; 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=HgOTO10zmHOpT80M0B+QCc/x0mH+Rzfc4Ewr1/bjNOk=; b=XhXfR7LVPv5WhldjHY4t1nLPQxhpLiK6mkwZLw/XzAjyqe+0q1bMEegEnw/6n/JwdzIlay 3lFOgz6jkkmrkRTgPw6E1K0i6p03ud74KHHONU6xGXWqjuSi45YBmkUysW03N8qlw2yKAc X5Ix0EQS54tjQMebUW09NfzSVMMPV5m5cIh7oZ94NSoqeGuEPnsXdquw2qwtVxfzSfm6sq MboSMusJeo44kT4QM6TGj9/h5k0ckan0ANNdpaDhAtmXxs5Iag+/S2KNAB20MXPUgWMbGk TSeXBgqNOGrWUnYwoBvncGq/Zqje+0ERsuJD4av3yRGpWcZkp7xoFqSRYZNstQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641495322; a=rsa-sha256; cv=none; b=rh23HuV/2Kq5Yi9C2leuF5dw1b03a0I/tpL6OmkY8qbJJS2dU8lfLbYIRd5f3E8Xs6zR1Y ZKIl/lN+B06tANVkbFlSZ7dhjRFzgC02jOrLxM4MS+Nq2FCPG+yPqp1+NKwtYfDgQG6byD oatxY3libNRxuduQysBDM1xfSr0r0Fx/5pfABOUmIYXEKlvdd0A5RXj5OxIf1AJ+S1V5/u e78z6xhHtAVMuSfDrZUMOOeYq2V+QIQNrfS6XaKapiJf0HvSus2py3mSMSHPFhq4U3E/uF Rjx04karAJnTTTN5yAz7iaQupPnmgMHlDUUYgisPIdqqdQ8giJRlq2nQOEbdTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=e201bec79bd22afa624cea27910268c4137945ef commit e201bec79bd22afa624cea27910268c4137945ef Author: Matthias Fechner AuthorDate: 2022-01-06 08:19:44 +0000 Commit: Matthias Fechner CommitDate: 2022-01-06 18:55:06 +0000 devel/libgit2: fix linking with libressl Patch upstream: https://github.com/libgit2/libgit2/pull/6157 PR: 260216 Reported by: lysfjord.daniel@smokepit.net (cherry picked from commit 7679b30c466be8599a546a85bed877cb7128508d) --- devel/libgit2/files/patch-deps_ntlmclient_crypt__openssl.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/devel/libgit2/files/patch-deps_ntlmclient_crypt__openssl.c b/devel/libgit2/files/patch-deps_ntlmclient_crypt__openssl.c new file mode 100644 index 000000000000..883042b4c659 --- /dev/null +++ b/devel/libgit2/files/patch-deps_ntlmclient_crypt__openssl.c @@ -0,0 +1,11 @@ +--- deps/ntlmclient/crypt_openssl.c.orig 2022-01-06 08:12:56 UTC ++++ deps/ntlmclient/crypt_openssl.c +@@ -44,7 +44,7 @@ static inline void HMAC_CTX_free(HMAC_CTX *ctx) + + #endif + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(CRYPT_OPENSSL_DYNAMIC) ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !LIBRESSL_VERSION_NUMBER) || defined(CRYPT_OPENSSL_DYNAMIC) + + static inline void HMAC_CTX_cleanup(HMAC_CTX *ctx) + {