From nobody Mon Nov 06 14:28:44 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 4SPDHJ3bWQz4ynH5; Mon, 6 Nov 2023 14:28:44 +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 4SPDHJ36jFz3JZG; Mon, 6 Nov 2023 14:28:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699280924; 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=7knv/zVk9P+SrhoEgJFesRSTsMg4W1GDaichOtGvEoQ=; b=QTCXFfIjxTXNdMC9OazPlebqy5DybseObxiLJvIfK0q6MUwUOfFmE4+A2whLO2VmTCXY2i B8Ys67Oy8OMhVUNVR391FNz/QL1LvLBoLDNiZlBrSCAihPPHCN297DI7umOyCpfIiVISZ8 KShv1X0tK6UZgjLBsaLzYLzWia8Qq8Z1mR9GLbPyp4nsuQKgUq9uKqNkPpLNlOzPfa+kP3 lLWlz/THPUvMgaKwsjbXyy8rSTpuPP67d/4aVMk6GkerxkhIG1w5j+rzCSOt0MAOpzr7H0 uZ1wBnRRbZnM0nx6S612nV5rTyyRc9RPJREXN7ZKVKy2Y1feQ7T/ep1LgTys7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699280924; 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=7knv/zVk9P+SrhoEgJFesRSTsMg4W1GDaichOtGvEoQ=; b=soao7D79zmcAWsjcqECpeqLHu9CZK/Qm8XJCUSuRACzaP/yhR1T3+vaSYWp/oNhpeZ72Ji CByu6o/ZKqVaWJ1A90LOV2YlslqMzCK2GZMMJG3k0ILVZJsRKy7jPrPLlCBisYuuoevc0o pB9zlGuhFGD7M/HKYdYxzpmffxPC5xn3Q0M+Rb5rg1WOHfpFTqAl5wjVeximTW/k2m7QWu GjXvaXHiaU6PFBrMTLApffaUzBic+3MPP3/8kyv33lPtdLt6EMasr74qNPznd17Etfgp9w rwU3SosFq5xvnjqzaoKCmH/k3hgzarZxs9gGkRV8mOynLBwLosXeXthVxk4jFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699280924; a=rsa-sha256; cv=none; b=fM0uKlr2N+iovflPN+wAxIIU2P6hVeugEpOp1VUAjw4GxTQxotKLHRmbkophEum2+0FliC RowVKh18NGVq3xkCa6fbj0z08qcjFCTMMi8HC7BXNhBNRbsGaYFzjxLvSa0LGe9MgQs064 fnLXke9jwZTkQPql6azjw1hAln/lzWzRcNLzYDvkX1AW4HIqAODOM8NzSV/jSj7xjkXIu2 7VsUDME+Td679JAm2hW6bcK1GVfOBNzgqClcpt2tvqa+Z0ocIX9qH02DhyYh0JapJUIbwk YObdi1WYQ726IUymvvU4w77bwNJTwGt6oUZv1J3c6ipids/smVRbyJXDOuNz1w== 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 4SPDHJ20C8z18yM; Mon, 6 Nov 2023 14:28:44 +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 3A6ESivw024589; Mon, 6 Nov 2023 14:28:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6ESiaE024586; Mon, 6 Nov 2023 14:28:44 GMT (envelope-from git) Date: Mon, 6 Nov 2023 14:28:44 GMT Message-Id: <202311061428.3A6ESiaE024586@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Hiroki Tagato Subject: git: 6324a9a40d79 - 2023Q4 - security/bitwarden-cli: fix fetch and build 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: tagattie X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q4 X-Git-Reftype: branch X-Git-Commit: 6324a9a40d791b1d271bfdb45c1d3e6d800cf90f Auto-Submitted: auto-generated The branch 2023Q4 has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=6324a9a40d791b1d271bfdb45c1d3e6d800cf90f commit 6324a9a40d791b1d271bfdb45c1d3e6d800cf90f Author: Hiroki Tagato AuthorDate: 2023-11-06 14:23:38 +0000 Commit: Hiroki Tagato CommitDate: 2023-11-06 14:28:38 +0000 security/bitwarden-cli: fix fetch and build npm version 10 fails with the following error when prefetching node modules (this only happens with poudriere): npm ERR! code EEXIST npm ERR! syscall open npm ERR! path /wrkdirs/usr/ports/security/bitwarden-cli/work/.npm/_cacache/tmp/e61947a0 npm ERR! errno -17 npm ERR! EEXIST: file already exists, open '/wrkdirs/usr/ports/security/bitwarden-cli/work/.npm/_cacache/tmp/e61947a0' npm ERR! File exists: /wrkdirs/usr/ports/security/bitwarden-cli/work/.npm/_cacache/tmp/e61947a0 npm ERR! Remove the existing file and try again, or run npm npm ERR! with --force to overwrite files recklessly. As a temporary workaround, install and use npm version 9 for prefetching node modules. Reported by: Miroslav Lachman <000.fbsd@quip.cz> (via private mail) MFH: 2023Q4 (cherry picked from commit 64cacbc564767d1a53e0a3390d28e1d6fb0aa320) --- security/bitwarden-cli/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/security/bitwarden-cli/Makefile b/security/bitwarden-cli/Makefile index 27edd8ba370a..707187e26af5 100644 --- a/security/bitwarden-cli/Makefile +++ b/security/bitwarden-cli/Makefile @@ -37,6 +37,8 @@ USE_GITHUB= yes GH_ACCOUNT= bitwarden GH_PROJECT= clients +MAKE_ENV+= PYTHONDONTWRITEBYTECODE=1 + BUILD_WRKSRC= ${WRKSRC}/apps/cli PLIST_FILES= bin/bw \ @@ -65,7 +67,8 @@ pre-fetch: ${MKDIR} ${WRKDIR}/node-modules-cache; \ ${CP} -R ${FILESDIR}/packagejsons/* ${WRKDIR}/node-modules-cache; \ cd ${WRKDIR}/node-modules-cache && \ - ${SETENV} HOME=${WRKDIR} npm ci --ignore-scripts --no-progress; \ + ${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; \ ${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 {} ';'; \