From owner-svn-ports-all@freebsd.org  Mon Feb 22 19:17:14 2021
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7C67954BBA3;
 Mon, 22 Feb 2021 19:17:14 +0000 (UTC)
 (envelope-from dmgk@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 4DksPk354Gz4cZj;
 Mon, 22 Feb 2021 19:17:14 +0000 (UTC)
 (envelope-from dmgk@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5CC433331;
 Mon, 22 Feb 2021 19:17:14 +0000 (UTC)
 (envelope-from dmgk@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 11MJHES1060565;
 Mon, 22 Feb 2021 19:17:14 GMT (envelope-from dmgk@FreeBSD.org)
Received: (from dmgk@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 11MJHECC060564;
 Mon, 22 Feb 2021 19:17:14 GMT (envelope-from dmgk@FreeBSD.org)
Message-Id: <202102221917.11MJHECC060564@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dmgk set sender to
 dmgk@FreeBSD.org using -f
From: Dmitri Goutnik <dmgk@FreeBSD.org>
Date: Mon, 22 Feb 2021 19:17:14 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r566324 - head/Mk/Uses
X-SVN-Group: ports-head
X-SVN-Commit-Author: dmgk
X-SVN-Commit-Paths: head/Mk/Uses
X-SVN-Commit-Revision: 566324
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Feb 2021 19:17:14 -0000

Author: dmgk
Date: Mon Feb 22 19:17:13 2021
New Revision: 566324
URL: https://svnweb.freebsd.org/changeset/ports/566324

Log:
  Mk/Uses/go.mk: Disable network access in extract and test targets.
  
  Reported by:	Andrew Gierth <andrew at tao11.riddles.org.uk>

Modified:
  head/Mk/Uses/go.mk

Modified: head/Mk/Uses/go.mk
==============================================================================
--- head/Mk/Uses/go.mk	Mon Feb 22 19:06:24 2021	(r566323)
+++ head/Mk/Uses/go.mk	Mon Feb 22 19:17:13 2021	(r566324)
@@ -162,7 +162,7 @@ post-fetch:
 	@${ECHO_MSG} "===> Fetching ${GO_MODNAME} dependencies";
 	@(cd ${DISTDIR}/${DIST_SUBDIR}; \
 		[ -e go.mod ] || ${RLN} ${GO_MODFILE} go.mod; \
-		${SETENV} ${GO_ENV} ${GO_CMD} mod download -x)
+		${SETENV} ${GO_ENV} GOPROXY=${GO_GOPROXY} ${GO_CMD} mod download -x)
 .endif
 
 .if !target(post-extract)
@@ -172,7 +172,7 @@ post-extract:
 	@${LN} -sf ${WRKSRC} ${GO_WRKSRC}
 .  elif ${go_ARGS:Mmodules} && defined(GO_MODULE)
 post-extract:
-	@(cd ${GO_WRKSRC}; ${SETENV} ${GO_ENV} ${GO_CMD} mod vendor)
+	@(cd ${GO_WRKSRC}; ${SETENV} ${GO_ENV} GOPROXY=off ${GO_CMD} mod vendor)
 .  endif 
 .endif
 
@@ -211,7 +211,7 @@ do-test:
 	(cd ${GO_WRKSRC}; \
 	for t in ${GO_TESTTARGET}; do \
 		${ECHO_MSG} "===>  Testing $${t}"; \
-		${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} test ${GO_TESTFLAGS} $${t}; \
+		${SETENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=off ${GO_CMD} test ${GO_TESTFLAGS} $${t}; \
 	done)
 .endif