From nobody Sat May 07 18:48:11 2022 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 3E4991AC9845; Sat, 7 May 2022 18:48:12 +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 4Kwbzc1Kqsz4sVX; Sat, 7 May 2022 18:48:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651949292; 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=+kDjiqZ2ldb5uKE8QpLHF8qjkaz/G6BUTK4N6Wl3iXI=; b=s8c/0gkk/qDLXQBtg5d8xCGolrIWTub+V1E1RWVpgm1uzSJ+q/SllM7Pp84yVIsnHZ08ri rgOyccKueiToRzOA2RpxPCFYiuUtxJZW4CPWkh1+pP+6qI8X1r1FQAP9dqPhLTSGq3Zf8n MPJuEBdu6chRAQlcRmtFHErobCwEneZFiVwEa7nRutwWWN13EG9a8S0awss1CELsbbuIu8 vdNBIOEWdlqCVGWKkr9zoi7EXzdjW6/mhGm6xnHQ185nDkT1f3nMpBrPWTDcWszqtyS5Ic VQgYnDdrzRFJXwItB+tjB0LIQM/MNWWYGP/SRyRORKDzjVZvWaXPvvbdWP7Pig== 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 0D5F015FA5; Sat, 7 May 2022 18:48:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 247ImBDS045947; Sat, 7 May 2022 18:48:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 247ImBb1045946; Sat, 7 May 2022 18:48:11 GMT (envelope-from git) Date: Sat, 7 May 2022 18:48:11 GMT Message-Id: <202205071848.247ImBb1045946@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitri Goutnik Subject: git: ef7fee403f7f - main - Mk/Uses/go.mk: Revert part of 4e2913317 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: dmgk X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ef7fee403f7f9ac3a73be03891bb61413c18ca1c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651949292; 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=+kDjiqZ2ldb5uKE8QpLHF8qjkaz/G6BUTK4N6Wl3iXI=; b=NlMK1ApleoSttTf+yao3yGLpUL02/UwwHsd3vL2eCuy1qnxpxC0sjyZB6kmwU2IuW/QZEl 9YWJ1VGLFBDnrhIKUFlzaht1KM9mtdU9nJdsXtDiAmU8teZ2TA1ZxsIYR28V0ND/4E0qCx lmjhrsT5vjgLkEYxErWy9DVSGQ/AFOPImryIRvzt/V3mnLZbNn7xoMs5n2b/yRdcq/Y5qC wUHW7juq3cRnrrQ7gb4sIM9wACQuo8bV5JsMDPyEJ/e2r/i0IdRZBTQ+TcUWjJLqlWQgR7 iap6V6PzR/bHd8aMmEfn/O+LSftOBsPr3nNn1eQgeOCr0v/RaIK3Nc7Mots8DA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651949292; a=rsa-sha256; cv=none; b=CTis1AMREBqw82dQo73DgJ899zarkMfS5QrgO1LG7wD5LDTtJRcwhKLqxGOLcOTjBOUmk3 kmH2teTyGOKqknKlkN9ivRV3ZHJ59BZqKYVlw9Y/15xIdEHdDp8T4UMKk65YI8UPI1VRSj um7VynVQWwtwXRvZjzeVs/6ten+2YCxz+HYuckJQQqJRMMlhQTw2u2k9iZ84Bc0vvCErv6 tOmCmUnm7Dqd0O2Z8c8GbOEwGZwNaOvkYSwb9yYF2ACMdqo5N0LgKDUo+gOHtZvn4eSmen wPgF3/iVBu0JOnARyW6bziiqJN9ScLQozC75OmF3raTAjQee4IB2JHiuGgBi6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dmgk: URL: https://cgit.FreeBSD.org/ports/commit/?id=ef7fee403f7f9ac3a73be03891bb61413c18ca1c commit ef7fee403f7f9ac3a73be03891bb61413c18ca1c Author: Dmitri Goutnik AuthorDate: 2022-05-07 17:38:30 +0000 Commit: Dmitri Goutnik CommitDate: 2022-05-07 18:43:24 +0000 Mk/Uses/go.mk: Revert part of 4e2913317 Revert module cache revalidation in post-fetch (`go mod verify`), it breaks non-root poudriere builds. `go mod verify` needs read/write access to the GOMODCACHE and because extract stage runs fetch stage again but under a restricted user, `go mod verify` fails with a "permission denied" error. --- Mk/Uses/go.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Mk/Uses/go.mk b/Mk/Uses/go.mk index bdee332a368b..0b5f48ed8e07 100644 --- a/Mk/Uses/go.mk +++ b/Mk/Uses/go.mk @@ -166,8 +166,7 @@ post-fetch: @${ECHO_MSG} "===> Fetching ${GO_MODNAME} dependencies"; @(cd ${DISTDIR}/${DIST_SUBDIR}; \ [ -e go.mod ] || ${RLN} ${GO_MODFILE} go.mod; \ - ${SETENV} ${GO_ENV} GOPROXY=${GO_GOPROXY} ${GO_CMD} mod download -x; \ - ${SETENV} ${GO_ENV} GOPROXY=${GO_GOPROXY} ${GO_CMD} mod verify) + ${SETENV} ${GO_ENV} GOPROXY=${GO_GOPROXY} ${GO_CMD} mod download -x) . endif . if !target(post-extract)