From nobody Thu May 05 11:40:17 2022 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 4E98A1ACB677; Thu, 5 May 2022 11:40:17 +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 4KvBZn1k1hz4f7V; Thu, 5 May 2022 11:40:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651750817; 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=RnHhEoML271sXNZ13xxFVcBxTUDlTqmvStfV5QwT2Eo=; b=reh+o7ScVgKpROxzzSn+sz4G0htkYf1MzEUDCeLSWJU9/QGTAX0ekQTpQmTNMRXkSg12yR PV70WrmZn8xQX83KiLubAcm9hBlloufp7jeaAHBJyalcTowSO61/GqW9kSt7ZhWq+MgTk3 luXSb/D3SExRsT/xbWorh/0WYyDLpPUp4r5E1pcTwnHgO+n+wdqbTYVcAQ69FOGtc3G3Sz qQBjgapu5akLMPjcTDErfxs0ErFrnbLTsLXonefr7xQrjp3y53wUILcGHS8wwuce5Ut5A7 Lbelzh2iLNqA4G85l/HAQ5DcXSsHqs+aXjAHNT1Ppl1qCkZ8R2Ap3yaXN2HJTg== 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 1B55C2685B; Thu, 5 May 2022 11:40:17 +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 245BeHE7074982; Thu, 5 May 2022 11:40:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 245BeHaa074978; Thu, 5 May 2022 11:40:17 GMT (envelope-from git) Date: Thu, 5 May 2022 11:40:17 GMT Message-Id: <202205051140.245BeHaa074978@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: 4e29133174db - main - Mk/Uses/go.mk: Be more lenient about vendoring 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: dmgk X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4e29133174dbb05c197b8398edd3831da9e5994f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651750817; 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=RnHhEoML271sXNZ13xxFVcBxTUDlTqmvStfV5QwT2Eo=; b=EJP48YJWRnWYBYKsMbMO1fZdlg8vPl5QOhlIy3HFvyIXd8QGQYRY1pe1EnxvKlIxgxUBHw hchYvQdGLaxWcbU1wZ3nvgAlPAsGd78r481SWsWtM6ywirEsdWxjk3hu2BuJ57X3PaNJBJ YVn8+gsBhq75+/lzp4R0SVu9997vzlmL57jh6eKPJP0Dik0aqMhw5ue3XKfSTgqykwGWFG HJz8+1oNvrvDCMy+tJPXUojNPMcinR4M+2Qw+tavOLcrxCNcaKhASQnNYrtN5dC47x2spq 3ea01LMsin+YGit9TuYOKdITNldLiEHt5DEREOWbBNbxk0IkpvkVgmeFfuQU/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651750817; a=rsa-sha256; cv=none; b=CMzgnzxpwfT6eqptfql/vC2F1azh3QrygHOhyZAsqChA+Jlo6T/d/4Rm7j2lzKYYWeHjzv EKviRjFpKn5WEgcIQskOH6ydGo94p/74xhUPc/YsMTeWCekfVfe/G+pRkh5J3mZbWxf4NB 8snv1HuNF/ofwu6FiC1MCey13cg9mW8vVEf3yF3XLNYG6uIYOaWdp7tZPCV/47erx+p3rv VfzPaZCdFjw120nsu/T/1csMA6vBHuFg83H2LyF8/+BSvF13prMnWId9PtWxB0In+dXa6K 1uA+PvNwY5Dx/fXA2Hb2vUDAmiK75QhEXFD3oOA9Js/7rNlOloc5T7NjHCMuPw== 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=4e29133174dbb05c197b8398edd3831da9e5994f commit 4e29133174dbb05c197b8398edd3831da9e5994f Author: Dmitri Goutnik AuthorDate: 2022-05-05 11:12:44 +0000 Commit: Dmitri Goutnik CommitDate: 2022-05-05 11:39:45 +0000 Mk/Uses/go.mk: Be more lenient about vendoring Add flag to `go mod vendor` instructing it to proceed despite errors encountered while loading packages. This will allow build to continue (with warnings) when e.g. upstream ships outdated go.sum with missing checksums for some packages. Invalid checksums are still security errors [1]. While here, add additional module cache revalidation after fetching dependencies. [1] https://go.dev/ref/mod#authenticating --- Mk/Uses/go.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Mk/Uses/go.mk b/Mk/Uses/go.mk index d77c78c63b84..96c46ce30fbc 100644 --- a/Mk/Uses/go.mk +++ b/Mk/Uses/go.mk @@ -162,7 +162,8 @@ 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 download -x; \ + ${SETENV} ${GO_ENV} GOPROXY=${GO_GOPROXY} ${GO_CMD} mod verify) . endif . if !target(post-extract) @@ -172,7 +173,7 @@ post-extract: @${LN} -sf ${WRKSRC} ${GO_WRKSRC} . elif ${go_ARGS:Mmodules} && defined(GO_MODULE) post-extract: - @(cd ${GO_WRKSRC}; ${SETENV} ${GO_ENV} GOPROXY=off ${GO_CMD} mod vendor) + @(cd ${GO_WRKSRC}; ${SETENV} ${GO_ENV} GOPROXY=off ${GO_CMD} mod vendor -e) . endif . endif