From nobody Wed Nov 22 12:29:15 2023 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 4Sb0t351n5z51W6g; Wed, 22 Nov 2023 12:29:15 +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 4Sb0t34VcDz4G7x; Wed, 22 Nov 2023 12:29:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700656155; 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=uD3oy+AYaPBDJfLbGmCi2Ld2mkUZgaRf9uYFJn4xo68=; b=maeD1zNNppWGDxbRAg2PP7eELpxLrFzWGxuSz3XTsrfzNf8bHtC7UiJUVNwGNHXQy22Eza RINA5Gr5M2diXcSz5SsO+2fuWhCUZtoibJ1WVvhY4KloXMZE9a2Ss6ks5uwIW4qU3Ioysi apBPVhl18zXXyZ7y1MHlSxPXv9SAxFIesyw96Oz5s/J/A/lVvodA/BwaourV3g7dLMygX9 bL9SDdprKeufN6yEI3Ha7FK0n4RFcAu+2MgZaHs6znqBKqud9BIIQkLx8Tv1Y+TNvBBZ/q vM9F2gNngGklyRLUsqD0jQz6UM6dPhu/WqSBdqb+wX5IQUZtgCwBiz1UiFZLDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700656155; 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=uD3oy+AYaPBDJfLbGmCi2Ld2mkUZgaRf9uYFJn4xo68=; b=k/+0kqyDJqEP4+SR5H4rLNmQlF8Jg/ZPDdigkc9iBbxCF6vlAwktNoKwIFku6tdnZTpuY+ nOnPlMUGNAjlbaMgx7rY7B26nB06bPO3gzt0S8wywFE5Ny4hbY6MUfOV+yv8+/AaePA37q zqEjcbgakqoMRmej8ayhG2795lJ9udVrUbQEvfefoNMXrrpOeoCrA5B11/mgzQK/AWif3U Jai3HcfrdbVjUTcW6NmFkjaI+m0k1JQZK4dmJBeeuxhjiN1JSSOBtOesWVHqCGg/L9MPEd y1OuZlB7M4eDZEB6Kc5El1HC4IMu27Xi+9mcOvTAMdKQN1AKbPoAtQk1BNr7/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700656155; a=rsa-sha256; cv=none; b=nbCBo7JO32YZhw+5O3UVg1P3/1EXLaRZS3rRp5T0+6eZDIv2ia8HTe1dNe/vEw6z9ZLxAp 0f9J7W5iqkO6R0IHuJXUTVSmE7sIBgHGQgHggMTR0xQjON4n7+Jc1F/A0ZvmLPtuKOajoq VGxBvUln97S0THZsdaLK7WixyjI0HgpQ5GlvRVQvJKkYNTeo1ke3QZTSuFGKaGqZdCFRiG Kmxm32d9omI1TivPmQcYO/2AL05cxycTPleBXDCPluHPPKKE0mk0bic4sdAHDBFbrEWumK Oq5Ot4r9B4csE/GINCvQ1cfscmxZMTFaTx/kg1F89cLSCz0VyqbwCi4mPG6CzQ== 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 4Sb0t33YvPz3qM; Wed, 22 Nov 2023 12:29:15 +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 3AMCTFNN035388; Wed, 22 Nov 2023 12:29:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AMCTFOf035385; Wed, 22 Nov 2023 12:29:15 GMT (envelope-from git) Date: Wed, 22 Nov 2023 12:29:15 GMT Message-Id: <202311221229.3AMCTFOf035385@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Hiroki Tagato Subject: git: 2038ace5044b - main - security/bitwarden-cli: fix checksum phase 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tagattie X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2038ace5044b5f1026ba986c69925cbd6daac160 Auto-Submitted: auto-generated The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=2038ace5044b5f1026ba986c69925cbd6daac160 commit 2038ace5044b5f1026ba986c69925cbd6daac160 Author: Hiroki Tagato AuthorDate: 2023-11-22 12:25:00 +0000 Commit: Hiroki Tagato 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 {} ';'; \