From nobody Wed Nov 12 02:50:20 2025 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 4d5nvJ2lrFz6GC7v; Wed, 12 Nov 2025 02:50: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d5nvJ22v9z3hHc; Wed, 12 Nov 2025 02:50:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762915820; 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=uCypF1hxAVy7Cy2YS3+VuJK5L8jGAJC+Uuki+gDYPIU=; b=Q/3jdvQGA5KSfmSBZrptPwrH8+3d+0PHr4rP+meRowC9j+EvqHmUBENpFjhSRjDPWOtlQ6 NNbaFOw98aDirVEJc6ghpW+mUhQGOyX0Z157g1TbXdEbUJ/ctN3HLCFGO3p6XsbQPTcl8G 6kgLX/qruuXgShAPVJtxowwqfrMwUDVoWr9bOxMOJxYqllKNKlKonvlxZF7RKqeUpZfTQQ jCII7YMMOCpngYK5+MiZHzktKPLCs8hael0d51sOwhKf790NOHkWLc9ArQJIuReuoQrcAV G3EJ2fHZwfg+RXI0YSRx7/oYJOHXk9b6IdQ50xcktN8qWXj86diTAOWN6Uaz2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762915820; 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=uCypF1hxAVy7Cy2YS3+VuJK5L8jGAJC+Uuki+gDYPIU=; b=BrQaVRTN6WIIZ7hCP4QcueUfvwCaUJkD5B71D19PprGzwkW2Nf90Rd7ZJ/LTP9NYp8t5mW BpZplHg8rHgPZdXxxnk61u14sNti2RV9L2XZlGpCXrb1ah1aXKMeccOdRpPeR7i/aaUPum q75oRomOaxgTQpff12qOm8YWxNO4+qgEAIyg8IzsjhSiPdxBkeTiw4YO06UWAGtB5NabvU HG/3RtvuvEySPGgLImPECARTczLEnZ+toZFZTornvRZQ7uBJdcQ+C8uYHOQVvJZJpdE5aq umsq8eK1VmAH0+BxVRVZieGNsuqtCq661xX1fpEAUgx45dogV8n/Hntnb/TWPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762915820; a=rsa-sha256; cv=none; b=QxYVF2Gecco9XfKY2EB+VzFT5q8LkNRvt3bm+MNLmcIUDS9l9VTCnUEeP+53sFx0H/GT9z w1uXM6Cl1CdjkrA3Jnq7NzPIfh3COfluBChmbJhCnDFmvwhouMh7eTxoS4Q+pugs7xlI5q aY6UA1GKyMrE9OdhUJCgQAaWktz44E+2yBWJ7AhUbYO3acbN4L+TAVpx46DzX2IlvWqY4N nk5t1QQZmZLDK5Ho9oJU9+h09+2Ek00pTDlhcrOY5GQEa2QMnL449TNJ1oAdhLx0aCAX/l sXgu96JGfQo3wgyX5CL8cbSMS2oEdqjVKkWe6D+L4DIa17Ogqg1YysiWuiKx/w== 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 4d5nvJ0qZbz1YT; Wed, 12 Nov 2025 02:50:20 +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 5AC2oKAv097450; Wed, 12 Nov 2025 02:50:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AC2oKTT097447; Wed, 12 Nov 2025 02:50:20 GMT (envelope-from git) Date: Wed, 12 Nov 2025 02:50:20 GMT Message-Id: <202511120250.5AC2oKTT097447@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Xavier Beaudouin Subject: git: decf02f29df2 - main - security/ca_root_nss: Make the certctl command overridable 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kiwi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: decf02f29df258d94fce0f57351fbe0ec9c645f5 Auto-Submitted: auto-generated The branch main has been updated by kiwi: URL: https://cgit.FreeBSD.org/ports/commit/?id=decf02f29df258d94fce0f57351fbe0ec9c645f5 commit decf02f29df258d94fce0f57351fbe0ec9c645f5 Author: Mark Johnston AuthorDate: 2025-11-12 02:45:45 +0000 Commit: Xavier Beaudouin CommitDate: 2025-11-12 02:49:37 +0000 security/ca_root_nss: Make the certctl command overridable For some purposes it's useful to be able to build the ca_root_nss with a custom certctl command. It may be desireable for instance to run certctl rehash at the end of a package upgrade rather than in the middle, in which case it's sufficient to substitute CERTCTL_CMD=:. Make the certctl command name a variable so that one can override it at port build time. No functional change intended. PR: 290115 Approved by: maintainer (timeout, 1 month) Sponsored by: OPNsense Sponsored by: Klara, Inc. --- security/ca_root_nss/Makefile | 6 ++++-- security/ca_root_nss/files/pkg-deinstall.in | 2 +- security/ca_root_nss/files/pkg-install.in | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/security/ca_root_nss/Makefile b/security/ca_root_nss/Makefile index 3ab0c1a1745e..67da24fce950 100644 --- a/security/ca_root_nss/Makefile +++ b/security/ca_root_nss/Makefile @@ -1,6 +1,6 @@ PORTNAME= ca_root_nss PORTVERSION= ${VERSION_NSS} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= MOZILLA/security/nss/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src DISTNAME= nss-${VERSION_NSS}${NSS_SUFFIX} @@ -34,8 +34,10 @@ VERSION_NSS= 3.117 CERTDATA_TXT_PATH= lib/ckfw/builtins/certdata.txt BUNDLE_PROCESSOR= MAca-bundle.pl +CERTCTL_CMD?= /usr/sbin/certctl + SUB_FILES= MAca-bundle.pl pkg-deinstall pkg-install pkg-message -SUB_LIST= VERSION_NSS=${VERSION_NSS} +SUB_LIST= CERTCTL_CMD=${CERTCTL_CMD} VERSION_NSS=${VERSION_NSS} do-build: @${SETENV} PATH=${LOCALBASE}/bin:$${PATH} \ diff --git a/security/ca_root_nss/files/pkg-deinstall.in b/security/ca_root_nss/files/pkg-deinstall.in index 8e5138c10c22..612219c9e447 100644 --- a/security/ca_root_nss/files/pkg-deinstall.in +++ b/security/ca_root_nss/files/pkg-deinstall.in @@ -2,5 +2,5 @@ if [ "$2" = POST-DEINSTALL ]; then CERTCTL_ARGS="-D ${PKG_ROOTDIR}" - certctl ${CERTCTL_ARGS} rehash + %%CERTCTL_CMD%% ${CERTCTL_ARGS} rehash fi diff --git a/security/ca_root_nss/files/pkg-install.in b/security/ca_root_nss/files/pkg-install.in index 6f05ab7e72ed..e338a2a6dc08 100644 --- a/security/ca_root_nss/files/pkg-install.in +++ b/security/ca_root_nss/files/pkg-install.in @@ -5,7 +5,7 @@ if [ "$2" = POST-INSTALL ]; then if [ -n "${PKG_METALOG}" ]; then CERTCTL_ARGS="${CERTCTL_ARGS} -U -M ${PKG_METALOG}" fi - certctl ${CERTCTL_ARGS} rehash + %%CERTCTL_CMD%% ${CERTCTL_ARGS} rehash [ ! -e %%LOCALBASE%%/bin/cert-sync ] || \ %%LOCALBASE%%/bin/cert-sync --quiet %%PREFIX%%/share/certs/ca-root-nss.crt