From nobody Thu May 04 15:00:20 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QBxnc3kcPz49C4b; Thu, 4 May 2023 15:00:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QBxnc3DL0z3MvY; Thu, 4 May 2023 15:00:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683212420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uPreWgZ3ecpT1LbETT7kF4A0O/QHXkX6myeTMY6CNP0=; b=lubeWxUbKMqP8wUBy1M0wAiA4v1hk/lAMY0lHbw/BA0GTsSHNND8ajZLx+Rj0UCWzm+b5H zi8nvvQnzeLpXfjO2YMM3LpoblNfUNoeW+T0rKzaKzUe3W+7kU3FrF7UOdPPGUEkc3k+eA OBhww0ycWyhbauC7hJNftNtT1sMgKPSsok1WqVCoo4+EgvvE/r5T7RV2DiC3sc3wduy8tl KU/ATUaXl/SdxpEB+nuTnhyblGDE/9clwuyaHlKpNo4LH/oS6yBPa30NDx9epHdxoniW5Q DD1+8qw0D66HyR0jTT96dWv8m15aB7Fbs4k2EriyXMouVULFdY2XObBnnXV1zQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683212420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uPreWgZ3ecpT1LbETT7kF4A0O/QHXkX6myeTMY6CNP0=; b=P7M+FNEpWamk+teZ3Q9gTAIRzixbRrmgWMuHfg+HiBbVLXB1LZCx9eZGX587Iz5x2rLA2X IAFPl5Er1zilecMH3V3UGlt/9PX4Rni66Qrwx0lAu5mqAf90DkDfeSvGyb+89dirqR59tE PZVRPHrN3D/2gGjQ1w/ba9n6VT7dCWufBWL4qTwtDMHdqFxqfuiwgfx4daC9h33o81d9kE nEtSlnvXkZMydCETqXs3uzRa3jG2vbV+vjF3RahqC8NSIhpjRBno+JbfMaHq/l+LxEn4yv QL5TpFX2BPxUzANusceE43fq4ni6IdsXD3CGeeEHSz+Crk523gOZhPU27DmExA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683212420; a=rsa-sha256; cv=none; b=xc0Y6K1IP2uX1fvAblj1fP0pY3Wa1G/OTN5bDfs4LotSPnTc3HXmVAZnq9HZ4QNc1RLgOC +X2spGXkyDPoa3FCoL87Y5vnKOREOY8EW4n3Pp388Jp6Rz+MTEr1UnKQvPa2pOcs41PyMB oJiqwT3Y5tvqRO4O4KJLOPTXuNF6wp4YJ76pgfQlTIpYGRyXdp6AC/Q5uTTkZahJyaE2pA hlG08senYwZMiRYLU/2bQhr2rCg6NH6tUxjFv5eUBwuV9ajAyD2r9QI7y4bDgcv3RidT8r OZbh/U1CPLGjVJphT/aCa0+sNhZFPuWu9GpVg0pMwdNdJt5K1RAIAdKYPzZ+ZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QBxnc239WzGgQ; Thu, 4 May 2023 15:00:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 344F0KUH095985; Thu, 4 May 2023 15:00:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 344F0Kvv095984; Thu, 4 May 2023 15:00:20 GMT (envelope-from git) Date: Thu, 4 May 2023 15:00:20 GMT Message-Id: <202305041500.344F0Kvv095984@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 6a53dee4f524 - main - security/gost-engine: Fix build with OpenSSL 3.0.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6a53dee4f524aae69186288bf4c19e00f4e237cb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=6a53dee4f524aae69186288bf4c19e00f4e237cb commit 6a53dee4f524aae69186288bf4c19e00f4e237cb Author: Muhammad Moinur Rahman AuthorDate: 2023-05-04 13:56:39 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-05-04 15:00:13 +0000 security/gost-engine: Fix build with OpenSSL 3.0.0 - Although this ports sets up different flavor for base and openssl30 however it was not checking the SSL_DEFAULT and was always building with base even though SSL_DEFAULT was openssl30. This commit fixes this by checking the SSL_DEFAULT and changing the default FLAVOR. - Add additional pkg-plist for openssl30 flavor - Remove unused BROKEN_SSL_REASON_* which were not mentioned in BROKEN_SSL Approved by: portmgr (blanket) --- security/gost-engine/Makefile | 7 +++++-- security/gost-engine/pkg-plist-openssl30 | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/security/gost-engine/Makefile b/security/gost-engine/Makefile index 7d8729e52a98..22881074bb70 100644 --- a/security/gost-engine/Makefile +++ b/security/gost-engine/Makefile @@ -11,12 +11,11 @@ LICENSE_FILE= ${WRKSRC}/LICENSE FLAVORS= base openssl30 openssl30_PKGNAMESUFFIX= -${FLAVOR} +openssl30_PLIST= ${.CURDIR}/pkg-plist-${FLAVOR} BROKEN_SSL= libressl libressl-devel openssl31 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_base= needs either ssl=${FLAVOR} or FLAVOR=base -BROKEN_SSL_REASON_openssl30= needs either ssl=${FLAVOR} or FLAVOR=openssl30 BROKEN_SSL_REASON_openssl31= not ready for openssl31 BUILD_DEPENDS= cmake>=3.18.1:devel/cmake @@ -55,6 +54,10 @@ OPTIONS_DEFINE= DOCS .include +.if ${SSL_DEFAULT} == openssl30 +FLAVOR= openssl30 +.endif + .if ${FLAVOR:U} == base post-patch: ${REINPLACE_CMD} 's/-Werror //' ${WRKSRC}/CMakeLists.txt diff --git a/security/gost-engine/pkg-plist-openssl30 b/security/gost-engine/pkg-plist-openssl30 new file mode 100644 index 000000000000..a4c8b49c89c9 --- /dev/null +++ b/security/gost-engine/pkg-plist-openssl30 @@ -0,0 +1,16 @@ +bin/gost12sum +bin/gostsum +%%EDIR%%/gost.so +%%EDIRV%%/libgost.so.1.1 +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