Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 10 Jun 2023 11:42:46 GMT
From:      Eugene Grosbein <eugen@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 51e672e854a7 - main - security/gost-engine: be ready for OpenSSL 3.0 in base system
Message-ID:  <202306101142.35ABgkT0037416@gitrepo.freebsd.org>

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

URL: https://cgit.FreeBSD.org/ports/commit/?id=51e672e854a7a2288007c387c499ee46186c1160

commit 51e672e854a7a2288007c387c499ee46186c1160
Author:     Eugene Grosbein <eugen@FreeBSD.org>
AuthorDate: 2023-06-10 11:37:53 +0000
Commit:     Eugene Grosbein <eugen@FreeBSD.org>
CommitDate: 2023-06-10 11:42:37 +0000

    security/gost-engine: be ready for OpenSSL 3.0 in base system
    
    This is temporary hack until __FreeBSD_version updated.
    PORTREVISION not bumped intentionally.
---
 security/gost-engine/Makefile | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/security/gost-engine/Makefile b/security/gost-engine/Makefile
index 22881074bb70..4bbc16383612 100644
--- a/security/gost-engine/Makefile
+++ b/security/gost-engine/Makefile
@@ -25,15 +25,20 @@ USE_GITHUB=	yes
 GH_ACCOUNT=     gost-engine
 GH_PROJECT=     engine
 
-.if ${FLAVOR:U} == openssl30
+BASE_OPENSSL_VSTR!= /usr/bin/openssl version
+BASE_OPENSSL_VER=${BASE_OPENSSL_VSTR:C/^OpenSSL //W:C/\..*//gW}
+
+.if ${FLAVOR:U} == openssl30 || ${BASE_OPENSSL_VER:U} == 3
 GH_TAGNAME=     2b22503
 GH_TUPLE+=      provider-corner:libprov:e9f3e6a:libprov
 GH_SUBDIR=      libprov:libprov
 DISTVERSION=	g20230106
-BROKEN_SSL+=	base # openssl31
 EDIR?=		lib/engines-12
 EDIRV?=		@comment unused
-DISTINFO_FILE=	${.CURDIR}/distinfo.${FLAVOR}
+DISTINFO_FILE=	${.CURDIR}/distinfo.openssl30
+.if ${BASE_OPENSSL_VER:U} != 3
+BROKEN_SSL+=	base # openssl31
+.endif
 .else
 GH_TAGNAME=	739f957
 DISTVERSION=	g20220520



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