Date: Wed, 22 Nov 2023 12:29:15 GMT From: Hiroki Tagato <tagattie@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 2038ace5044b - main - security/bitwarden-cli: fix checksum phase Message-ID: <202311221229.3AMCTFOf035385@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=2038ace5044b5f1026ba986c69925cbd6daac160 commit 2038ace5044b5f1026ba986c69925cbd6daac160 Author: Hiroki Tagato <tagattie@FreeBSD.org> AuthorDate: 2023-11-22 12:25:00 +0000 Commit: Hiroki Tagato <tagattie@FreeBSD.org> CommitDate: 2023-11-22 12:29:03 +0000 security/bitwarden-cli: fix checksum phase Use PKGNAMEPREFIX, PORTNAME, PKGNAMESUFFIX, and DISTVERSION for the name of the prefetched node modules archive instead of PKGNAME. PKGNAME contains PKGVERSION, which contains PORTREVISION. Using PORTREVISION in the archive filename is inconvenient when PORTREVISION is bumped. While here, disable audit and funding information when prefetching node modules with npm. --- security/bitwarden-cli/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/security/bitwarden-cli/Makefile b/security/bitwarden-cli/Makefile index 4b6f74c4dbcf..042ba44c767b 100644 --- a/security/bitwarden-cli/Makefile +++ b/security/bitwarden-cli/Makefile @@ -49,7 +49,7 @@ PORTDOCS= CONTRIBUTING.md README.md SECURITY.md OPTIONS_DEFINE= DOCS -PREFETCH_FILE= ${PKGNAME}-node-modules${EXTRACT_SUFX} +PREFETCH_FILE= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSION}-node-modules${EXTRACT_SUFX} PREFETCH_TIMESTAMP= 1699354730 PKG_NODE_VER= 18.15.0 PKG_FETCH_VER= 3.5 @@ -69,7 +69,8 @@ pre-fetch: ${CP} -R ${FILESDIR}/packagejsons/* ${WRKDIR}/node-modules-cache; \ cd ${WRKDIR}/node-modules-cache && \ ${SETENV} HOME=${WRKDIR} npm install -g --prefix=${WRKDIR} npm@9.9.0 && \ - ${SETENV} HOME=${WRKDIR} PATH=${WRKDIR}/bin:${PATH} npm ci --ignore-scripts --no-progress; \ + ${SETENV} HOME=${WRKDIR} PATH=${WRKDIR}/bin:${PATH} \ + npm ci --ignore-scripts --no-progress --no-audit --no-fund; \ ${FIND} ${WRKDIR}/node-modules-cache -depth 1 -print | \ ${GREP} -v node_modules | ${XARGS} ${RM} -r; \ ${FIND} ${WRKDIR}/node-modules-cache -type d -exec ${CHMOD} 755 {} ';'; \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202311221229.3AMCTFOf035385>