summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTijl Coosemans <tijl@FreeBSD.org>2024-03-01 14:12:09 +0100
committerTijl Coosemans <tijl@FreeBSD.org>2024-03-01 15:45:31 +0100
commit73ce9db43191db2b2f34eaa9a03e12f80c292d72 (patch)
treebbf9616aafac2b40de20f1edc57bf51b600b9a77
parentsecurity/vuxml: document nodejs vulnerabilities (diff)
Uses/go.mk: Support proxy servers
Pass on Go proxy server environment variables during make fetch. Reported by: Кирилл Варнаков <kirill@varnakov.com> Fixes: 572f23616926 Mk/*: Build with a clean environment
-rw-r--r--Mk/Uses/go.mk9
1 files changed, 8 insertions, 1 deletions
diff --git a/Mk/Uses/go.mk b/Mk/Uses/go.mk
index 32884f3f3607..1836f8972357 100644
--- a/Mk/Uses/go.mk
+++ b/Mk/Uses/go.mk
@@ -192,7 +192,14 @@ go-post-fetch:
@${ECHO_MSG} "===> Fetching ${GO_MODNAME} dependencies";
@(cd ${DISTDIR}/${DIST_SUBDIR}; \
[ -e go.mod ] || ${RLN} ${GO_MODFILE} go.mod; \
- ${SETENVI} ${WRK_ENV} ${GO_ENV} GOPROXY=${GO_GOPROXY} ${GO_CMD} mod download -x all)
+ ${SETENVI} ${WRK_ENV} \
+ ${HTTP_PROXY:DHTTP_PROXY=${HTTP_PROXY:Q}} \
+ ${http_proxy:Dhttp_proxy=${http_proxy:Q}} \
+ ${HTTPS_PROXY:DHTTPS_PROXY=${HTTPS_PROXY:Q}} \
+ ${https_proxy:Dhttps_proxy=${https_proxy:Q}} \
+ ${NO_PROXY:DNO_PROXY=${NO_PROXY:Q}} \
+ ${no_proxy:Dno_proxy=${no_proxy:Q}} \
+ ${GO_ENV} GOPROXY=${GO_GOPROXY} ${GO_CMD} mod download -x all)
. endif
_USES_extract+= 800:go-post-extract