On 19-09-13 14:53:30, Stuart Henderson wrote:
> On 2019/09/13 23:32, Joel Sing wrote:
> > On 19-09-13 12:38:19, Stuart Henderson wrote:
> > > On 2019/09/10 04:20, Joel Sing wrote:
> > > > The following updates lang/go to Go 1.13 and also updates the main
> > > > golang.org/x packages to around the Go 1.13 release. This does
> > > > not update devel/go-tools, as it introduces new dependencies that
> > > > will need to be packaged. Once this lands I can also work towards
> > > > enabling Go on arm64.
> > > >
> > > > The following ports appear to break with this update:
> > > >
> > > > net/go-ipfs
> > > > net/mattermost-server
> > > > security/keybase
> > > > sysutils/consul
> > > > sysutils/restic
> > > > sysutils/restic-rest-server
> > > > www/hugo
> > >
> > > net/dnscrypt-proxy now attempts to fetch from the network, this is
> > > blocked on the main ports build machines and for anyone using
> > > PORTS_PRIVSEP=Yes in mk.conf with the default "block return out log
> > > proto {tcp udp} user _pbuild" pf rule. Any advice on how to fix this?
> >
> > Unfortunately this is going to become more of a problem, since Go is pushing
> > towards the use of Go modules and fetching of dependencies at build time,
> > rather than vendoring code. We'll have to figure out how we address this
> > moving forward.
>
> Same problem everywhere unfortunately. npm, maven, cargo, even "normal"
> use of python..
Indeed.
> > The following diff should fix this case:
>
> Thanks, confirmed it does. OK.
For now, I think we should do this instead - ok?
Index: lang/go/go.port.mk
===================================================================
RCS file: /cvs/ports/lang/go/go.port.mk,v
retrieving revision 1.23
diff -u -p -r1.23 go.port.mk
--- lang/go/go.port.mk 4 Sep 2019 12:22:03 -0000 1.23
+++ lang/go/go.port.mk 13 Sep 2019 14:17:15 -0000
@@ -23,7 +23,7 @@ MODGO_TYPE ?= bin
MODGO_WORKSPACE ?= ${WRKDIR}/go
MODGO_GOCACHE ?= ${WRKDIR}/go-cache
MODGO_GOPATH ?= ${MODGO_WORKSPACE}:${MODGO_PACKAGE_PATH}
-MAKE_ENV += GOCACHE="${MODGO_GOCACHE}" GOPATH="${MODGO_GOPATH}"
+MAKE_ENV += GOCACHE="${MODGO_GOCACHE}" GOPATH="${MODGO_GOPATH}"
GO111MODULE=off
MODGO_CMD ?= ${SETENV} ${MAKE_ENV} go
MODGO_BUILD_CMD = ${MODGO_CMD} install ${MODGO_FLAGS}
MODGO_TEST_CMD = ${MODGO_CMD} test ${MODGO_FLAGS} ${MODGO_TEST_FLAGS}
Index: net/mattermost-server/Makefile
===================================================================
RCS file: /cvs/ports/net/mattermost-server/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- net/mattermost-server/Makefile 12 Sep 2019 19:07:56 -0000 1.15
+++ net/mattermost-server/Makefile 13 Sep 2019 14:17:15 -0000
@@ -27,7 +27,6 @@ WANTLIB += c pthread
MODULES = lang/go
MODGO_LDFLAGS = -X
github.com/mattermost/mattermost-server/model.BuildNumber=${V}
-MAKE_ENV += GO111MODULE=off
NO_TEST = Yes
pre-configure:
Index: sysutils/restic/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/restic/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- sysutils/restic/Makefile 13 Sep 2019 13:05:50 -0000 1.10
+++ sysutils/restic/Makefile 13 Sep 2019 14:17:15 -0000
@@ -21,7 +21,6 @@ MASTER_SITES = https://github.com/restic
MODULES = lang/go
MODGO_TYPE = bin
-MAKE_ENV += GO111MODULE=off
NO_TEST = Yes
Index: sysutils/restic-rest-server/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/restic-rest-server/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- sysutils/restic-rest-server/Makefile 13 Sep 2019 13:06:19 -0000
1.7
+++ sysutils/restic-rest-server/Makefile 13 Sep 2019 14:17:15 -0000
@@ -20,7 +20,6 @@ MASTER_SITES = https://github.com/restic
MODULES = lang/go
MODGO_TYPE = bin
-MAKE_ENV += GO111MODULE=off
NO_TEST = Yes
