From nobody Sun Mar 26 20:10:28 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 4Pl6WS52xLz412j4; Sun, 26 Mar 2023 20:10:28 +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 4Pl6WS4YY0z449V; Sun, 26 Mar 2023 20:10:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679861428; 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=pj/pc5GlotTzAN+ivtrCLjBqCyT+jBXDaJxZCxt9LS0=; b=sH8gGc/YmEF7qwLwCDrUAQuYFCxFyfW32CndA3jVFJD9fUNRG3UuKYdz5pkpt0EvcQDDMJ 1+aDrPwq6fj3ioGGU6sDG0WWnXtHUQPSZ3mMdXGW8xTZ53rTzVFzKAj4v3XnhG+1EU6hg7 9End3MK0a2QKalc21KtfmFBdDqOzA8ANrYIKRlvlyfgL/CJEbCIbJiAMNqGoMJdh4r5lov c/oIXW9dhsDhmAhu7K/uoHiPIElR3hZolg9q/R1ntVatVrVMbisnkTa29b9bT7O1dGWXD3 HRRUiPBLD497Byq74Mm7h3L1X89r48iWS91QLu02fKf+xA/egnAh+iQjWpa/+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679861428; 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=pj/pc5GlotTzAN+ivtrCLjBqCyT+jBXDaJxZCxt9LS0=; b=rY5L8NJq5gmTpsjBszLWA1r542Kp1MEFyMkSY1t3W4e0Q7+KIr6p6zjzLN6JCrXwbGltQx +T4yvxNZa6k4/YeL84vNj+oDCuSSaBrzFuih3TQJaFYOAzAq29HUXzK77DoojpsjTL86S/ OFVHjJehX6LPmuvCxsfa63fj8HzY8X9X36gW0Fe6kh/Rq3Tur6cK8SL5fSuEjCvXV2zJCr 1RJDzIfdtbgqiYCy+NShPx7P4aawMy9ur0LgveTZm4NnpZWWMpHrpDLkUzxRanUyviCu/G 94vp0oIDNgP/Kh3R0IPIrTGhvKXpYI8jErIuxob8GcpbgHwD5V51GlMVaV23fg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679861428; a=rsa-sha256; cv=none; b=ZT+U3bkujQOBGN+5KdKb3ks5Rz/Qql9IWacVOQi3izocR5UzrYOy1LMKt/JUuRMfAuubbz cwE86Q16SdDYA1YzDyQhhr1Mo/pKDaJgowRTnX6aZ0bANpfXqMo1bzlFnERyolVTpEePSR DWxMbNV65uIa2XYcBNQYJBiwJpPJv96Y93ZzRvFist9kulQWMzordfPUJwOsNUGkBdlQfF qP30TDd1Om6+/P2CZAgRmWRcgT/vZodqSOaJrhvhxAfaeOiZYmk2xrUZZmvFqLscrA3CpW yXA6FgVpEUZxBfsPn8D0JHu1eJ6kIn0l+ARvPuA/a+pf0vS0dubnNh2Ey50DZw== 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 4Pl6WS3dBcztXw; Sun, 26 Mar 2023 20:10:28 +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 32QKASXW055754; Sun, 26 Mar 2023 20:10:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32QKASe0055753; Sun, 26 Mar 2023 20:10:28 GMT (envelope-from git) Date: Sun, 26 Mar 2023 20:10:28 GMT Message-Id: <202303262010.32QKASe0055753@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Eugene Grosbein Subject: git: f42f0d485b31 - main - security/gost-engine: fix incomplete previous commit 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: eugen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f42f0d485b31c2abc46744f8f764d63a53c5e494 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/ports/commit/?id=f42f0d485b31c2abc46744f8f764d63a53c5e494 commit f42f0d485b31c2abc46744f8f764d63a53c5e494 Author: Eugene Grosbein AuthorDate: 2023-03-26 20:08:37 +0000 Commit: Eugene Grosbein CommitDate: 2023-03-26 20:08:37 +0000 security/gost-engine: fix incomplete previous commit Add missing bits to previous commit. Fixes: c5089dc1723f7793da0c4de44fb3d968679100e0 --- security/gost-engine/Makefile | 42 +++++++++++++++++++++++++++++++++--------- security/gost-engine/pkg-plist | 4 ++-- 2 files changed, 35 insertions(+), 11 deletions(-) diff --git a/security/gost-engine/Makefile b/security/gost-engine/Makefile index e19b4192e256..e6c2778e8ced 100644 --- a/security/gost-engine/Makefile +++ b/security/gost-engine/Makefile @@ -1,5 +1,4 @@ PORTNAME= gost-engine -DISTVERSION= g20220520 CATEGORIES= security MAINTAINER= eugen@FreeBSD.org @@ -9,20 +8,43 @@ WWW= https://github.com/gost-engine/engine/blob/master/README.gost LICENSE= OpenSSL LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_SSL= libressl libressl-devel openssl30 openssl31 +FLAVORS= base openssl30 + +openssl30_PKGNAMESUFFIX= -${FLAVOR} + +BROKEN_SSL= libressl libressl-devel 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_openssl30= for OpenSSL 1.1.1 only -BROKEN_SSL_REASON_openssl31= for OpenSSL 1.1.1 only +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= needs either ssl=${FLAVOR} or FLAVOR=openssl31 BUILD_DEPENDS= cmake>=3.18.1:devel/cmake USES= cmake ssl USE_GITHUB= yes -GH_PROJECT= engine +GH_ACCOUNT= gost-engine +GH_PROJECT= engine + +.if ${FLAVOR:U} == openssl30 +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} +.else GH_TAGNAME= 739f957 +DISTVERSION= g20220520 +BROKEN_SSL+= openssl30 # openssl31 +EDIR?= lib/engines-1.1 +EDIRV?= ${EDIR} +.endif -ENGINESDIR?= ${PREFIX}/lib/engines-1.1 +ENGINESDIR?= ${PREFIX}/${EDIR} +PLIST_SUB+= EDIR="${EDIR}" EDIRV="${EDIRV}" CMAKE_ARGS+= -DOPENSSL_ROOT_DIR=${OPENSSLBASE} \ -DOPENSSL_ENGINES_DIR=${ENGINESDIR} @@ -33,6 +55,7 @@ OPTIONS_DEFINE= DOCS .include +.if ${FLAVOR:U} == base post-patch: ${REINPLACE_CMD} 's/-Werror //' ${WRKSRC}/CMakeLists.txt @@ -40,13 +63,14 @@ post-install: cd ${STAGEDIR}${PREFIX}/lib/engines-1.1 && \ ${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 ) + cd ${STAGEDIR}${PREFIX}/share/man/man1 && ${RM} gost12sum.1 gostsum.1 post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} - ( cd ${WRKSRC} && ${INSTALL_MAN} INSTALL.md README.gost README.md \ - ${STAGEDIR}${DOCSDIR} ) + cd ${WRKSRC} && ${INSTALL_MAN} INSTALL.md README.gost README.md \ + ${STAGEDIR}${DOCSDIR} .include diff --git a/security/gost-engine/pkg-plist b/security/gost-engine/pkg-plist index 72fe45771165..17b05cd8bd83 100644 --- a/security/gost-engine/pkg-plist +++ b/security/gost-engine/pkg-plist @@ -1,7 +1,7 @@ bin/gost12sum bin/gostsum -lib/engines-1.1/libgost.so -lib/engines-1.1/libgost.so.1.1 +%%EDIR%%/libgost.so +%%EDIRV%%/libgost.so.1.1 %%PORTDOCS%%share/man/man1/gost12sum.1.gz %%PORTDOCS%%share/man/man1/gostsum.1.gz %%PORTDOCS%%%%DOCSDIR%%/INSTALL.md