Date: Sat, 04 Jul 2026 08:08:01 +0000 From: Daniel Engberg <diizzy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 527953bc6982 - main - security/ca_root_nss: Rework port Message-ID: <6a48bf61.3f608.312cabff@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=527953bc69821057cf8a52ab9082f4fdd4d1aa94 commit 527953bc69821057cf8a52ab9082f4fdd4d1aa94 Author: Daniel Engberg <diizzy@FreeBSD.org> AuthorDate: 2026-07-04 06:03:18 +0000 Commit: Daniel Engberg <diizzy@FreeBSD.org> CommitDate: 2026-07-04 06:03:24 +0000 security/ca_root_nss: Rework port * Use DISTVERSION directly instead of calling VERSION_NSS * Make use of EXTRACT_AFTER_ARGS, reduces ~170Mbyte of I/O not used * Remove ETCSYMLINK_CONFLICTS_INSTALL, no longer relevant * Replace ${LN} -sf with ${RLN} * Rearrange port Makefile to follow Porters Handbook more closely and to improve readability PR: 295343 Reviewed by: fernape (previous iteration) Approved by: maintainer timeout, 1+ month --- security/ca_root_nss/Makefile | 41 ++++++++++++++-------------- security/ca_root_nss/files/MAca-bundle.pl.in | 2 +- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/security/ca_root_nss/Makefile b/security/ca_root_nss/Makefile index 181209481098..4482a288ec41 100644 --- a/security/ca_root_nss/Makefile +++ b/security/ca_root_nss/Makefile @@ -1,8 +1,8 @@ PORTNAME= ca_root_nss -DISTVERSION= ${VERSION_NSS} +DISTVERSION= 3.124 CATEGORIES= security MASTER_SITES= MOZILLA/security/nss/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src -DISTNAME= nss-${VERSION_NSS}${NSS_SUFFIX} +DISTNAME= nss-${DISTVERSION}${NSS_SUFFIX} MAINTAINER= ports-secteam@FreeBSD.org COMMENT= Root certificate bundle from the Mozilla Project @@ -13,34 +13,33 @@ LICENSE_FILE= ${WRKSRC}/COPYING USES= perl5 ssl:build USE_PERL5= build -NO_ARCH= yes +EXTRACT_AFTER_ARGS= --include nss-${DISTVERSION}/nss/COPYING \ + --include nss-${DISTVERSION}/nss/lib/ckfw/builtins/certdata.txt \ + --no-same-owner --no-same-permissions + WRKSRC_SUBDIR= nss +NO_ARCH= yes + +CERTDIR?= share/certs +CERTCTL_CMD?= /usr/sbin/certctl +CERTDATA_TXT_PATH= lib/ckfw/builtins/certdata.txt +BUNDLE_PROCESSOR= MAca-bundle.pl + +SUB_FILES= MAca-bundle.pl pkg-deinstall pkg-install pkg-message +SUB_LIST= CERTCTL_CMD=${CERTCTL_CMD} DISTVERSION=${DISTVERSION} +PLIST_SUB= CERTDIR=${CERTDIR} OPTIONS_DEFINE= ETCSYMLINK OPTIONS_DEFAULT= ETCSYMLINK OPTIONS_EXCLUDE_FreeBSD_15= ETCSYMLINK OPTIONS_EXCLUDE_FreeBSD_16= ETCSYMLINK - OPTIONS_SUB= yes ETCSYMLINK_DESC= Add symlinks to default bundle locations -ETCSYMLINK_CONFLICTS_INSTALL= ca-roots-[0-9]* - -CERTDIR?= share/certs -PLIST_SUB+= CERTDIR=${CERTDIR} - -VERSION_NSS= 3.124 -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= CERTCTL_CMD=${CERTCTL_CMD} VERSION_NSS=${VERSION_NSS} do-build: @${SETENV} PATH=${LOCALBASE}/bin:$${PATH} \ - ${PERL} ${WRKDIR}/${BUNDLE_PROCESSOR} \ + ${PERL} ${WRKDIR}/${BUNDLE_PROCESSOR} \ < ${WRKSRC}/${CERTDATA_TXT_PATH} > \ ${WRKDIR}/ca-root-nss.crt @@ -48,12 +47,12 @@ do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/${CERTDIR} ${INSTALL_DATA} ${WRKDIR}/ca-root-nss.crt ${STAGEDIR}${PREFIX}/${CERTDIR} ${MKDIR} ${STAGEDIR}${PREFIX}/etc/ssl - ${LN} -sf ../../${CERTDIR}/ca-root-nss.crt ${STAGEDIR}${PREFIX}/etc/ssl/cert.pem.sample + ${RLN} ../../${CERTDIR}/ca-root-nss.crt ${STAGEDIR}${PREFIX}/etc/ssl/cert.pem.sample do-install-ETCSYMLINK-on: ${MKDIR} ${STAGEDIR}${PREFIX}/openssl - ${LN} -sf ../etc/ssl/cert.pem ${STAGEDIR}${PREFIX}/openssl/cert.pem + ${RLN} ../etc/ssl/cert.pem ${STAGEDIR}${PREFIX}/openssl/cert.pem ${MKDIR} ${STAGEDIR}/etc/ssl - ${LN} -sf ../..${PREFIX}/etc/ssl/cert.pem ${STAGEDIR}/etc/ssl/cert.pem + ${RLN} ../..${PREFIX}/etc/ssl/cert.pem ${STAGEDIR}/etc/ssl/cert.pem .include <bsd.port.mk> diff --git a/security/ca_root_nss/files/MAca-bundle.pl.in b/security/ca_root_nss/files/MAca-bundle.pl.in index b94ca54ba2d1..ea71ac2b88ed 100644 --- a/security/ca_root_nss/files/MAca-bundle.pl.in +++ b/security/ca_root_nss/files/MAca-bundle.pl.in @@ -46,7 +46,7 @@ print <<EOH; ## ## It contains certificates trusted for server authentication. ## -## Extracted from nss-%%VERSION_NSS%% +## Extracted from nss-%%DISTVERSION%% ## EOH my $debug = 0;home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a48bf61.3f608.312cabff>