git: e201bec79bd2 - 2022Q1 - devel/libgit2: fix linking with libressl
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 06 Jan 2022 18:55:22 UTC
The branch 2022Q1 has been updated by mfechner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=e201bec79bd22afa624cea27910268c4137945ef
commit e201bec79bd22afa624cea27910268c4137945ef
Author: Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2022-01-06 08:19:44 +0000
Commit: Matthias Fechner <mfechner@FreeBSD.org>
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)
+ {