From nobody Wed Oct 01 11:55:06 2025 X-Original-To: dev-commits-ports-all@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 4ccCzG2NjJz69THR; Wed, 01 Oct 2025 11:55:06 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ccCzG1tvtz3ff3; Wed, 01 Oct 2025 11:55:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759319706; 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=VlmsCHlxJ4GRayZF85EWvuy4fbmLt7Pay3FzekZTj7Q=; b=YQx1M9Lpou4nqkzy64Br44IDTYuBTZvZOv31lE1loCfaqyeAdsF8IvP6fJKLWYLQDJuMEp AEbp5Lb1oEuQhUffNX60VZkXSY7+YVDeykECdg4iIkbHtFC4HxSvwYRdr3stvNXYBBSj4K x/WewS1847uCu17fzemUOzKNyFiTVcoS8Fwaqfy6DJJ38GV5Nsz+O4cXeZhDGWY/k4nEAX ERlpJ37z9y2YTrnL+cpNSXPZborRgB0jRiMNZvZMM8pfAs6Sy3Pedj61lN4TRlUVU6Uhlb 8nbjI1kmwdeokZbXz+k8T+OCdYmbV/JRx4tHkuIpD+yVdRpZ2QPsxXj6xFwLCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759319706; 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=VlmsCHlxJ4GRayZF85EWvuy4fbmLt7Pay3FzekZTj7Q=; b=BhlYgCMPiGENaYlC5rx0B/nKwl8icSYcylmsG4fXGox7GPB/WSumNK5yI+6SKTrKu8NoQu fd2b1akQQIuLc0g2uG0kqYQD+PakmIb1IZDNtNkmwL04hoVsBSRkee9+/Mn4840i9JFLII 790hnXAYr+haCLLQSVizZXd1ua6bSIh6juMTG4UlCXtrAvz/fSZ3vKDbbNToizY83bYYB3 ZI7WT7lp4IBO6mG12yvlV+g+Vx19gf6MBTTy8XM+GKp+qSO0Ge3Z/UXXU+IKje3Of4hEjU GCxSi4loT8SRyWyWbYWLUzjDMR32qqmxvA3IYJCt/Uq+UaUuohpNPP9FMVYubg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759319706; a=rsa-sha256; cv=none; b=ii0Phl8qXTtm7MPXXjz7srBgzWUH+CFJG8nniaCaUEW/Gds6MVpRSYmMr4w9fsbWuFaBLc WRCV/+7R/XGeCIOmNmksHu8bh4Qp3hl98AEvR2A7y/kDhhaHn6WucWDg8Yq+lrJioKDajl w7v4rdUPU0zZRmc49rLJXyjt9nbSN7QwVoV18PODDZptD38Tmol4R66WAaDvLCk7Snw8yi KDRWEvSRTTPgBSAo0MczikT+QvaFh9np5usMosLIJ3OEYbVPMfn81alymIViNUMEogTHxl +idhw5SrRRCFs1S51zQm+CJpEs3Ko5O4fQ3i31OmWpcUuXcW7OjKFiy32EKQ2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ccCzG1Tj1z4tS; Wed, 01 Oct 2025 11:55:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 591Bt6j6080640; Wed, 1 Oct 2025 11:55:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 591Bt6AD080637; Wed, 1 Oct 2025 11:55:06 GMT (envelope-from git) Date: Wed, 1 Oct 2025 11:55:06 GMT Message-Id: <202510011155.591Bt6AD080637@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: 91ea784ea7dd - main - security/softhsm2: strip botan2 option List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 91ea784ea7dddacc8aefc97e8bf9605b84ceff89 Auto-Submitted: auto-generated The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=91ea784ea7dddacc8aefc97e8bf9605b84ceff89 commit 91ea784ea7dddacc8aefc97e8bf9605b84ceff89 Author: Matthias Andree AuthorDate: 2025-10-01 11:42:03 +0000 Commit: Matthias Andree CommitDate: 2025-10-01 11:52:55 +0000 security/softhsm2: strip botan2 option and unconditionally build with OpenSSL, which has been default already. botan-2 has been EOL for many months; the original softhsm2 software doesn't support botan-3 and botan-2 has been EOL, upstream issues about botan-3 haven't been tended to in three years. softhsm2 is the last user of botan2 in our tree does not require it. While here, simplify and rearrange Makefile to use canonical item order. portclippy and portlint -C come up clean now. I did not run portfmt which would damage indentation. I've attempted to get the test suite running, and it's as simple as TEST_TARGET=check, but the cryptotest fails on desKey(56) related matter (probably harmless to patch out) and p11tests also fail for reasons I haven't investigated, so I'm not adding this. Approved by: portmgr@ (blanket) --- security/softhsm2/Makefile | 54 ++++++++++++++++------------------------------ 1 file changed, 19 insertions(+), 35 deletions(-) diff --git a/security/softhsm2/Makefile b/security/softhsm2/Makefile index 9a6aea3a5aa2..e1209054b8ec 100644 --- a/security/softhsm2/Makefile +++ b/security/softhsm2/Makefile @@ -1,6 +1,6 @@ PORTNAME= softhsm PORTVERSION= 2.6.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= security MASTER_SITES= http://dist.opendnssec.org/source/ \ http://dist.opendnssec.org/source/testing/ @@ -13,53 +13,37 @@ WWW= https://www.opendnssec.org/ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share -INSTALL_TARGET= install-strip -USES= compiler:c++11-lang libtool ssl pkgconfig - -SUB_FILES= pkg-message - -CONFLICTS= softhsm-1.* - -USE_LDCONFIG= yes - -LIB_DEPENDS+= libcppunit.so:devel/cppunit MY_DEPENDS+= p11-kit:security/p11-kit BUILD_DEPENDS+= ${MY_DEPENDS} RUN_DEPENDS+= ${MY_DEPENDS} -OPTIONS_DEFINE= SQLITE MIGRATE -MIGRATE_IMPLIES= SQLITE -OPTIONS_SUB= yes -SQLITE_DESC= Build with object store backend DB support (SQLITE3) -MIGRATE_DESC= Build the migration tool +USES= compiler:c++11-lang libtool pkgconfig ssl -OPTIONS_SINGLE= CRYP -OPTIONS_SINGLE_CRYP= CRYP_OPEN CRYP_BOTAN +GNU_CONFIGURE= yes +GNU_CONFIGURE_MANPREFIX=${PREFIX}/share -CRYP_OPEN_DESC= Build with OpenSSL crypto library -CRYP_BOTAN_DESC= Build with Botan crypto library +CONFIGURE_ARGS+= --with-crypto-backend=openssl \ + --with-openssl=${OPENSSLBASE} \ + --disable-gost -OPTIONS_DEFAULT= CRYP_OPEN SQLITE MIGRATE +INSTALL_TARGET= install-strip -SQLITE_CONFIGURE_WITH= sqlite3=${LOCALBASE} objectstore-backend-db -SQLITE_USES= sqlite -MIGRATE_CONFIGURE_WITH= migrate +CONFLICTS= softhsm-1.* -CRYP_BOTAN_CONFIGURE_ON= --with-crypto-backend=botan -CRYP_BOTAN_LIB_DEPENDS= libbotan-2.so:security/botan2 +SUB_FILES= pkg-message -CRYP_OPEN_CONFIGURE_ON= --with-crypto-backend=openssl --with-openssl=${OPENSSLBASE} +OPTIONS_DEFINE= SQLITE MIGRATE +OPTIONS_DEFAULT= CRYP_OPEN SQLITE MIGRATE -.include +OPTIONS_SUB= yes +MIGRATE_DESC= Build the migration tool +SQLITE_DESC= Build with object store backend DB support (SQLITE3) -.if ${SSL_DEFAULT:Mlibressl*} || ${SSL_DEFAULT:Mopenssl} -CONFIGURE_ARGS+= --disable-gost -.endif +MIGRATE_IMPLIES= SQLITE +MIGRATE_CONFIGURE_WITH= migrate -# openssl-1.1.1 (default after 1200080) doesn't support GHOST (yet), punt for now. -CONFIGURE_ARGS+= --disable-gost +SQLITE_USES= sqlite +SQLITE_CONFIGURE_WITH= sqlite3=${LOCALBASE} objectstore-backend-db post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share/p11-kit/modules