From nobody Thu Jan 6 09:24:28 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 E505E193611E; Thu, 6 Jan 2022 09:24:28 +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 4JV1C03z0Hz3DlP; Thu, 6 Jan 2022 09:24:28 +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 6811F1D14A; Thu, 6 Jan 2022 09:24:28 +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 2069OS0s078488; Thu, 6 Jan 2022 09:24:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2069OStV078487; Thu, 6 Jan 2022 09:24:28 GMT (envelope-from git) Date: Thu, 6 Jan 2022 09:24:28 GMT Message-Id: <202201060924.2069OStV078487@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: 7679b30c466b - main - devel/libgit2: fix linking with libressl 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: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7679b30c466be8599a546a85bed877cb7128508d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641461068; 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=tb7XcFr1HaEsrSUmMmGUXxWASvVEs62VoZSToZdZ5Aw=; b=ZOjUvWfxK2eEvQpsCAVh8cVsksPGuKkbjcJ87IB+1AWyEl5tsTt5N/YBgdUlfB0aP6NIV/ 09cJoH6sU4wcrI+idr56zzdt1dKQMJZFvaH430q3TAsGGQaL74U+7NIDAzxeNt2BQ+FJda SEoNAnXOlSDWB7H5jLbfMUE4bSSai+G062PLlcO/zcAg/pBulNXwprW2zYDSX11n1iRkdT HZlySZf3vTPqS1rPACguEZ+iDlIVItIL8v8EcryJJm7Dc5ui5aBduls2YVXDRFdqgjVVeJ L+9/kjBoW7t6rv4TH3GHapBsbnNDWRMbBc4ZsG24vwbV1VK3OCvw70lQfBCirw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641461068; a=rsa-sha256; cv=none; b=GTETHbBorlTqe0ZSU6Buc5eMiUnT9INhi6OzxC6lsNxHNszyd/EL+jEPuZxj4eOEed0gdW PdpI1OTKn7JSQ6LuaDb0sbxQ+DT3Z7bjefwO3fqMvBalZDruOTZ9g5wHYBPIVtEBQp+D/Y 9Fu5VoKdwb7yjhIH/nss27fQSpo2YC+tfLijeiY4+Nrqw1RHEjjiFnxsY6kNV/YDL35L+e RlDhldnRZG0DegsXgmKkQ75SJPxOOzTKfiSNm3+MKG4PvFTP2enfiJb5o4Og+B1Fbpk5VR +YVtooLXyyfV60WsLW+YmKcbMDvlSpuSUDjAh4TT/MY/9S4MVKY5EzT0OJ1djA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=7679b30c466be8599a546a85bed877cb7128508d commit 7679b30c466be8599a546a85bed877cb7128508d Author: Matthias Fechner AuthorDate: 2022-01-06 08:19:44 +0000 Commit: Matthias Fechner CommitDate: 2022-01-06 09:24:23 +0000 devel/libgit2: fix linking with libressl Patch upstream: https://github.com/libgit2/libgit2/pull/6157 PR: 260216 Reported by: lysfjord.daniel@smokepit.net --- 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) + {