Created attachment 229894 [details] poudriere build log for devel/libgit2-1.3.0 libgit2-1.3.0 fails to build, probably due to DEFAULT_VERSIONS+= ssl=libressl, with the following error: /wrkdirs/usr/ports/devel/libgit2/work/libgit2-1.3.0/deps/ntlmclient/crypt_openssl.c:49:20: error: static declaration of 'HMAC_CTX_cleanup' follows non-static declaration static inline void HMAC_CTX_cleanup(HMAC_CTX *ctx) ^ /usr/local/include/openssl/hmac.h:90:6: note: previous declaration is here void HMAC_CTX_cleanup(HMAC_CTX *ctx); ^ Attached is build log from poudriere.
Seems like openssl deprecated the HMAC_CTX_cleanup for public use, and it was removed from hmac.h in ... 2015? The last commit to libressl hmac.h was four years ago. 'though, this code, as a lot of other code, is littered with explicit OPENSSL_VERSION_NUMBER checks *sigh* Issue caused by commit 5158b0b70ade89268b22b7c388802b5f5b6debce in libgit2.
Created attachment 229899 [details] quick and dirty patch It compiles, but if the ntlm part works? I don't know..
Created attachment 229900 [details] patch-deps_ntlmclient_crypt__openssl.c Probably a heaps better way of doing it..
Could you please try to get this fixed upstream (please add a link to the merge request and maybe issue here)? If they accept it, I will include it and will do a new release, so we do not have to wait for a new version of libgit2. Thanks.
Bug report@ https://github.com/libgit2/libgit2/issues/6134
> #ifndef HMAC_CTX_cleanup This patch does not work! Function is not define and this will always FALSE.
Created attachment 230051 [details] working patch.. Working patch, but a less-than elegant solution..
Confirming this is still present. (Using Q12022)
Fix merged upstream: https://github.com/libgit2/libgit2/pull/6157
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=7679b30c466be8599a546a85bed877cb7128508d commit 7679b30c466be8599a546a85bed877cb7128508d Author: Matthias Fechner <mfechner@FreeBSD.org> AuthorDate: 2022-01-06 08:19:44 +0000 Commit: Matthias Fechner <mfechner@FreeBSD.org> 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 .../files/patch-deps_ntlmclient_crypt__openssl.c (new) | 11 +++++++++++ 1 file changed, 11 insertions(+)
A commit in branch 2022Q1 references this bug: 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) .../files/patch-deps_ntlmclient_crypt__openssl.c (new) | 11 +++++++++++ 1 file changed, 11 insertions(+)
(In reply to lysfjord.daniel from comment #9) Thanks a lot for the effort! I added the patch.
^Triage: Track MFH. @Matthias could you mark head commits intended to be merged with `MFH: <branch> (<reason>)` to assist future commit/merge review and discovery, thanks!
(In reply to Kubilay Kocak from comment #13) I can, but I do test build every commit I merge into quarterly. If the testbuild fails, I will not merge, so we can have the situation, that commits are marked with a merge line, but they will never be merged. I'm not sure, what of the cases is better.