Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 21 Jul 2023 17:20:20 GMT
From:      Muhammad Moinur Rahman <bofh@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 54aa044064f6 - main - security/git-crypt: Fix build with openssl3
Message-ID:  <202307211720.36LHKK29084545@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=54aa044064f6b7100dde8828007462bf8ca37ee8

commit 54aa044064f6b7100dde8828007462bf8ca37ee8
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-07-21 17:18:36 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-07-21 17:20:05 +0000

    security/git-crypt: Fix build with openssl3
    
    Approved by:    portmgr (blanket)
    Sponsored by:   The FreeBSD Foundation
---
 security/git-crypt/Makefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/security/git-crypt/Makefile b/security/git-crypt/Makefile
index ab35a8b53881..c34a05ed9814 100644
--- a/security/git-crypt/Makefile
+++ b/security/git-crypt/Makefile
@@ -11,9 +11,6 @@ WWW=		https://www.agwa.name/projects/git-crypt/
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_SSL=	openssl30 openssl31
-BROKEN_SSL_REASON=	error: field has incomplete type 'HMAC_CTX'
-
 RUN_DEPENDS=	git:devel/git \
 		gpg:security/gnupg
 
@@ -40,6 +37,10 @@ CXXFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}
 .endif
 
+.if ( ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400092 && ${SSL_DEFAULT} == base ) || ${SSL_DEFAULT:Mopenssl3*}
+CXXFLAGS+=	-DOPENSSL_API_COMPAT=0x30000000L"
+.endif
+
 post-extract:
 	@${GREP} -Rl '"gpg"' ${WRKSRC} |${XARGS} ${REINPLACE_CMD} -e 's,"gpg","${LOCALBASE}/bin/gpg",'
 	@${GREP} -Rl '"git"' ${WRKSRC} |${XARGS} ${REINPLACE_CMD} -e 's,"git","${LOCALBASE}/bin/git",'



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307211720.36LHKK29084545>