From nobody Fri Oct 06 15:49:08 2023 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 4S2CXP24Bpz4wv1C; Fri, 6 Oct 2023 15:49:09 +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 4S2CXP1ZcRz4D4G; Fri, 6 Oct 2023 15:49:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696607349; 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=UJjd9wgonX/CYXGpFQSZlexG57iTXsuGt5Ee9OnE0ig=; b=YehYkVnnf/VgfnDB8k1uSNUFKJs7Un1JlQdRzOv3vJfJIFG1CN1cF6YOAY6NlBxEZETk8n T1FQBinTgwEHQQnmJV6y6PmOpwRNL96wHuYmI4gMKw6NhOlOZa7L6IwF1QAj7VTBTI8fK4 ZXR0mxFe071sWhYVQohBqR/aqVNvL+KoabPmROfiIxwxvkkM3+fV67x3O4xTztrjSORA+A Xy8GwP4HD6if+iWLfffxnp/1TzebuBchD1wLYSTwi/6JpNSMh7AjzLbTktGrnJM6u5h89D NgwHhk0CWVrvv68ZdWdduZ/mPgvAZycH9MSbS+PnpuZiFp4JO47QVTCiBZz7nA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696607349; a=rsa-sha256; cv=none; b=LaozkAQSwMG5YApqtyJskX2b6wHDZepJhktxi1/Kb7r0yFW/Q5NvF7WUgvYqMwOj6Bb2Ni QusbZq8l7brD7PIxTZp3MxGKpBAZUdUtu0FXcmKereh6389pI1nlUsGI/bjgXgSPMft0I/ OPy2bRIk7lBtM9SWkH594b/KH6D1HWF0s8n+SbdtRE2hKQ+R0YEXLkTMpU6OLZuOwYipbj WDuzm/cf7QDx5LnJqtXAHfvm8X3aAAFRaKT7OUNqqbOE4ezXH2+HTnSfwjdiW+h/RAkkgB qtNki4wBiFYSFHvxTJlpdLB3Fb5G4UH1pXtN4vYzPge3NM41W/7yU/RNgCYzSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696607349; 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=UJjd9wgonX/CYXGpFQSZlexG57iTXsuGt5Ee9OnE0ig=; b=lyNBuJUT25ttRGdZfJwgBnxITzbJgsnEK2x2NgFICvUQyEbv/TzmhBynUkXLqWdLJokKmv WWumx4asYOJtZRDOPTjAitYzd2GnE3IXUGgwdFqtia726L0XAFpB6EI64cwI9c7b7G6xEI etCSGE2jttEZt/FAzSm1Wnwckv+1PTclFV4t75uAgJZ07guRKyUEnaZEHGIQGq67NXDKqK 7/8NZCEBt+w98TbRN1geMdH2kLlAU+/M0YtRkZsS6ucghUWJ3vmbjxAqw8HeyIyPi5cpfv OtCQ3ltxr68SaoYWki2n9uPVG9gx00F/1OteiCPQy8T9SAZs3s/dtShmemi9fQ== 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 4S2CXP0dPYztf5; Fri, 6 Oct 2023 15:49:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 396Fn89u027037; Fri, 6 Oct 2023 15:49:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 396Fn8xF027032; Fri, 6 Oct 2023 15:49:08 GMT (envelope-from git) Date: Fri, 6 Oct 2023 15:49:08 GMT Message-Id: <202310061549.396Fn8xF027032@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 483e74f44b82 - main - security/ca_root_nss: Use certctl instead of a symlink. 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 483e74f44b82f20bddd5608beef74b2a5ab38a88 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/ports/commit/?id=483e74f44b82f20bddd5608beef74b2a5ab38a88 commit 483e74f44b82f20bddd5608beef74b2a5ab38a88 Author: Dag-Erling Smørgrav AuthorDate: 2023-10-06 15:45:21 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-10-06 15:48:57 +0000 security/ca_root_nss: Use certctl instead of a symlink. MFH: 2023Q4 Reviewed by: fluffy, sunpoet Differential Revision: https://reviews.freebsd.org/D42045 --- security/ca_root_nss/Makefile | 12 +----------- security/ca_root_nss/files/pkg-message.in | 14 -------------- security/ca_root_nss/pkg-plist | 6 ++---- 3 files changed, 3 insertions(+), 29 deletions(-) diff --git a/security/ca_root_nss/Makefile b/security/ca_root_nss/Makefile index db98535229c1..3abe00856c78 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= 0 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= MOZILLA/security/nss/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src DISTNAME= nss-${VERSION_NSS}${NSS_SUFFIX} @@ -17,14 +17,8 @@ USE_PERL5= build NO_ARCH= yes WRKSRC_SUBDIR= nss -OPTIONS_DEFINE= ETCSYMLINK -OPTIONS_DEFAULT= ETCSYMLINK - OPTIONS_SUB= yes -ETCSYMLINK_DESC= Add symlink to /etc/ssl/cert.pem -ETCSYMLINK_CONFLICTS_INSTALL= ca-roots-[0-9]* - CERTDIR?= share/certs PLIST_SUB+= CERTDIR=${CERTDIR} @@ -49,8 +43,4 @@ do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/openssl ${LN} -sf ../${CERTDIR}/ca-root-nss.crt ${STAGEDIR}${PREFIX}/openssl/cert.pem.sample -do-install-ETCSYMLINK-on: - ${MKDIR} ${STAGEDIR}/etc/ssl - ${LN} -sf ../..${PREFIX}/${CERTDIR}/ca-root-nss.crt ${STAGEDIR}/etc/ssl/cert.pem - .include diff --git a/security/ca_root_nss/files/pkg-message.in b/security/ca_root_nss/files/pkg-message.in index d937df3a0922..a28b233e6599 100644 --- a/security/ca_root_nss/files/pkg-message.in +++ b/security/ca_root_nss/files/pkg-message.in @@ -7,20 +7,6 @@ audited for trustworthiness or RFC 3647 compliance. Assessment and verification of trust is the complete responsibility of the system administrator. - - -This package installs symlinks to support root certificates discovery by -default for software that uses OpenSSL. - -This enables SSL Certificate Verification by client software without manual -intervention. - -If you prefer to do this manually, replace the following symlinks with -either an empty file or your site-local certificate bundle. - - * /etc/ssl/cert.pem - * %%PREFIX%%/etc/ssl/cert.pem - * %%PREFIX%%/openssl/cert.pem EOM } ] diff --git a/security/ca_root_nss/pkg-plist b/security/ca_root_nss/pkg-plist index e8111772d308..ef04e1ffd140 100644 --- a/security/ca_root_nss/pkg-plist +++ b/security/ca_root_nss/pkg-plist @@ -1,6 +1,4 @@ %%CERTDIR%%/ca-root-nss.crt -@sample etc/ssl/cert.pem.sample -@sample openssl/cert.pem.sample -%%ETCSYMLINK%%/etc/ssl/cert.pem -%%ETCSYMLINK%%@dir /etc/ssl +@postexec certctl rehash +@postunexec certctl rehash @postexec [ ! -e %%LOCALBASE%%/bin/cert-sync ] || %%LOCALBASE%%/bin/cert-sync --quiet %%PREFIX%%/share/certs/ca-root-nss.crt