git: 12ee7702a0be - main - security/gost-engine: update

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Eugene Grosbein <eugen_at_FreeBSD.org>
Date: Mon, 07 Sep 2026 19:44:52 UTC
The branch main has been updated by eugen:

URL: https://cgit.FreeBSD.org/ports/commit/?id=12ee7702a0be9298b2512556724ce7a4b3214d61

commit 12ee7702a0be9298b2512556724ce7a4b3214d61
Author:     Eugene Grosbein <eugen@FreeBSD.org>
AuthorDate: 2026-09-07 19:32:33 +0000
Commit:     Eugene Grosbein <eugen@FreeBSD.org>
CommitDate: 2026-09-07 19:44:44 +0000

    security/gost-engine: update
    
    openssl111 has gone from Ports and we have no supported
    FreeBSD versions having it in base, so drop 1.1.x support here too.
    
    Update the code upto latest commit targeting OpenSSL 3.0.
    Also, this makes it compatible with CMake 4.
    
    Reported by:    arrowd
    Tested by:      arrowd
---
 security/gost-engine/Makefile             | 60 +++++++++++--------------------
 security/gost-engine/distinfo             |  8 +++--
 security/gost-engine/distinfo.openssl30   |  5 ---
 security/gost-engine/files/pkg-message.in |  2 ++
 security/gost-engine/pkg-plist            | 11 ++++--
 security/gost-engine/pkg-plist-openssl30  | 16 ---------
 6 files changed, 37 insertions(+), 65 deletions(-)

diff --git a/security/gost-engine/Makefile b/security/gost-engine/Makefile
index 2dffe905838a..52c978da8be0 100644
--- a/security/gost-engine/Makefile
+++ b/security/gost-engine/Makefile
@@ -1,30 +1,32 @@
 PORTNAME=	gost-engine
-PORTREVISION=	1
+DISTVERSION=	g20250528
 CATEGORIES=	security
 
 MAINTAINER=	eugen@FreeBSD.org
 COMMENT=	Implementation of the Russian GOST crypto algorithms for OpenSSL
 WWW=		https://github.com/gost-engine/engine/blob/master/README.gost
 
-LICENSE=	OpenSSL
+LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 FLAVORS=	base openssl30
 
+USES=		cmake ssl
+USE_GITHUB=	yes
+GH_ACCOUNT=	gost-engine
+GH_PROJECT=	engine
+
 openssl30_PKGNAMESUFFIX=	-${FLAVOR}
 
-BROKEN_SSL=				libressl libressl-devel openssl31
+BROKEN_SSL=				libressl libressl-devel openssl34 openssl35 openssl36
 BROKEN_SSL_REASON_libressl=		needs features only available in OpenSSL 1.1.1+
 BROKEN_SSL_REASON_libressl-devel=	needs features only available in OpenSSL 1.1.1+
-BROKEN_SSL_REASON_openssl31=		not ready for openssl31
-
-USES=		cmake ssl
-USE_GITHUB=	yes
-GH_ACCOUNT=     gost-engine
-GH_PROJECT=     engine
+BROKEN_SSL_REASON_openssl34=		not ready for openssl34
+BROKEN_SSL_REASON_openssl35=		not ready for openssl35
+BROKEN_SSL_REASON_openssl36=		not ready for openssl36
 
 ENGINESDIR?=	${PREFIX}/${EDIR}
-PLIST_SUB+=     EDIR="${EDIR}"
+PLIST_SUB+=	EDIR="${EDIR}"
 
 CMAKE_ARGS+=	-DOPENSSL_ROOT_DIR=${OPENSSLBASE} \
 		-DOPENSSL_ENGINES_DIR=${ENGINESDIR}
@@ -35,18 +37,12 @@ OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
-.if ${SSL_DEFAULT} == openssl30
-FLAVOR=	openssl30
+.if ${SSL_DEFAULT} == openssl
+.if !defined(FLAVOR)
+FLAVOR=		openssl30
+PKGNAMEPREFIX=	a-
+.endif
 .endif
-
-# For OpenSSL 3.0.x in base (14+) or installed as port/package
-.if ${OPSYS} == FreeBSD || ${FLAVOR:U} == openssl30
-GH_TAGNAME=     2b22503
-GH_TUPLE+=      provider-corner:libprov:e9f3e6a:libprov
-GH_SUBDIR=      libprov:libprov
-DISTVERSION=	g20230106
-DISTINFO_FILE=	${PKGDIR}/distinfo.openssl30
-PLIST=		${PKGDIR}/pkg-plist-openssl30
 
 .if ${FLAVOR:U} == openssl30
 EDIR?=		lib/engines-12
@@ -55,27 +51,15 @@ BROKEN_SSL+=	base
 EDIR?=		lib/engines-3
 .endif
 
+GH_TAGNAME=	806d9ee
+GH_TUPLE+=	provider-corner:libprov:d5d381f:libprov
+GH_SUBDIR=	libprov:libprov
+
 post-patch:
 	${REINPLACE_CMD} \
 	    's|/usr/lib/ssl/engines/libgost.so|${PREFIX}/${EDIR}/gost.so|' \
 	    ${WRKSRC}/INSTALL.md
 
-# For OpenSSL 1.1.x in base or installed as port/package
-.else
-GH_TAGNAME=	739f957
-DISTVERSION=	g20220520
-BROKEN_SSL+=	openssl30 # openssl31
-EDIR?=		lib/engines-1.1
-
-post-patch:
-	${REINPLACE_CMD} 's/-Werror //' ${WRKSRC}/CMakeLists.txt
-
-post-install:
-	cd ${STAGEDIR}${PREFIX}/${EDIR} && \
-	  ${MV} gost.so.1.1 libgost.so.1.1 && ${LN} -s libgost.so.1.1 libgost.so && \
-	  ${RM} gost.so
-.endif
-
 post-install-DOCS-off:
 	cd ${STAGEDIR}${PREFIX}/share/man/man1 && ${RM} gost12sum.1 gostsum.1
 
@@ -83,8 +67,6 @@ post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_MAN} INSTALL.md README.gost README.md \
 		${STAGEDIR}${DOCSDIR}
-.if ${EDIR:M*engines-3}
 	${INSTALL_MAN} ${FILESDIR}/openssl.cnf.diff ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/security/gost-engine/distinfo b/security/gost-engine/distinfo
index 87f2930291f7..e1493c4a09f9 100644
--- a/security/gost-engine/distinfo
+++ b/security/gost-engine/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1678110026
-SHA256 (gost-engine-engine-g20220520-739f957_GH0.tar.gz) = 82c46ca1246e7f2b250fb7749198cad1585d1ed2fb79bb932094ba1ef678f336
-SIZE (gost-engine-engine-g20220520-739f957_GH0.tar.gz) = 1603866
+TIMESTAMP = 1788804073
+SHA256 (gost-engine-engine-g20250528-806d9ee_GH0.tar.gz) = b82af782a17f37ca5bcd5cfe177e73ac8dda6177840fccda27259d89106ba7a5
+SIZE (gost-engine-engine-g20250528-806d9ee_GH0.tar.gz) = 1656384
+SHA256 (provider-corner-libprov-d5d381f_GH0.tar.gz) = d76493be647d2883a804e6c12c2981fe67ccea7d77a0002f6e466bf2896d8740
+SIZE (provider-corner-libprov-d5d381f_GH0.tar.gz) = 12249
diff --git a/security/gost-engine/distinfo.openssl30 b/security/gost-engine/distinfo.openssl30
deleted file mode 100644
index 85668c6a57a8..000000000000
--- a/security/gost-engine/distinfo.openssl30
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1678166603
-SHA256 (gost-engine-engine-g20230106-2b22503_GH0.tar.gz) = d8fd1cd726b0d03a0c70f532bfc82e1fced6ee377a4ad7fc5afb00c7e4957b22
-SIZE (gost-engine-engine-g20230106-2b22503_GH0.tar.gz) = 1654657
-SHA256 (provider-corner-libprov-e9f3e6a_GH0.tar.gz) = fc397e028dd3bebab8d3bab492657e5f8916995ab9b2b19e7244f16463ba4f35
-SIZE (provider-corner-libprov-e9f3e6a_GH0.tar.gz) = 9369
diff --git a/security/gost-engine/files/pkg-message.in b/security/gost-engine/files/pkg-message.in
index c235178b15b0..0a31f8e1cbb4 100644
--- a/security/gost-engine/files/pkg-message.in
+++ b/security/gost-engine/files/pkg-message.in
@@ -1,6 +1,7 @@
 [
 { type: install
   message: <<EOM
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 You should edit openssl.cnf configuration file as specified below
 to start using GOST Engine through OpenSSL.
 For details, refer to the section `How to Configure' in
@@ -8,6 +9,7 @@ For details, refer to the section `How to Configure' in
 
 Also, you may find useful an example patch for your openssl.cnf in
 %%DOCSDIR%%/openssl.cnf.diff
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 EOM
 }
 ]
diff --git a/security/gost-engine/pkg-plist b/security/gost-engine/pkg-plist
index 2261f975cb35..4904852e6787 100644
--- a/security/gost-engine/pkg-plist
+++ b/security/gost-engine/pkg-plist
@@ -1,9 +1,16 @@
 bin/gost12sum
 bin/gostsum
-%%EDIR%%/libgost.so
-%%EDIR%%/libgost.so.1.1
+%%EDIR%%/gost.so
+lib/libgost.so
+lib/libgostprov.so
+lib/ossl-modules/gostprov.so
+share/cmake/GostEngine/GostEngineConfig-%%CMAKE_BUILD_TYPE%%.cmake
+share/cmake/GostEngine/GostEngineConfig.cmake
+share/cmake/GostProvider/GostProviderConfig-%%CMAKE_BUILD_TYPE%%.cmake
+share/cmake/GostProvider/GostProviderConfig.cmake
 %%PORTDOCS%%share/man/man1/gost12sum.1.gz
 %%PORTDOCS%%share/man/man1/gostsum.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.md
 %%PORTDOCS%%%%DOCSDIR%%/README.gost
 %%PORTDOCS%%%%DOCSDIR%%/README.md
+%%PORTDOCS%%%%DOCSDIR%%/openssl.cnf.diff
diff --git a/security/gost-engine/pkg-plist-openssl30 b/security/gost-engine/pkg-plist-openssl30
deleted file mode 100644
index 4904852e6787..000000000000
--- a/security/gost-engine/pkg-plist-openssl30
+++ /dev/null
@@ -1,16 +0,0 @@
-bin/gost12sum
-bin/gostsum
-%%EDIR%%/gost.so
-lib/libgost.so
-lib/libgostprov.so
-lib/ossl-modules/gostprov.so
-share/cmake/GostEngine/GostEngineConfig-%%CMAKE_BUILD_TYPE%%.cmake
-share/cmake/GostEngine/GostEngineConfig.cmake
-share/cmake/GostProvider/GostProviderConfig-%%CMAKE_BUILD_TYPE%%.cmake
-share/cmake/GostProvider/GostProviderConfig.cmake
-%%PORTDOCS%%share/man/man1/gost12sum.1.gz
-%%PORTDOCS%%share/man/man1/gostsum.1.gz
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL.md
-%%PORTDOCS%%%%DOCSDIR%%/README.gost
-%%PORTDOCS%%%%DOCSDIR%%/README.md
-%%PORTDOCS%%%%DOCSDIR%%/openssl.cnf.diff