On Tue, 10 Sep 2019 at 04:20:55 +1000, 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 > > All of these are import path related and will likely need updates > or patches.
Here are fixes for the restics and keybase (combined as one diff inline): https://deftly.net/patches/restic-0.9.5.diff https://deftly.net/patches/restic-rest-server-0.9.7.diff https://deftly.net/patches/keybase-4.3.2.diff For keybase it looks like I missed a diff removal on the last update. > > ok? > OK abieber@ for go! diff --git a/security/keybase/Makefile b/security/keybase/Makefile index 5b5f715e3e4..71b349303e4 100644 --- a/security/keybase/Makefile +++ b/security/keybase/Makefile @@ -12,6 +12,7 @@ V = 4.3.2 GH_ACCOUNT = keybase GH_PROJECT = client GH_TAGNAME = v${V} +REVISION = 0 DISTNAME = keybase-${V} diff --git a/security/keybase/patches/patch-go_kbfs_libkbfs_folder_branch_ops_go b/security/keybase/patches/patch-go_kbfs_libkbfs_folder_branch_ops_go deleted file mode 100644 index b0be0502c7f..00000000000 --- a/security/keybase/patches/patch-go_kbfs_libkbfs_folder_branch_ops_go +++ /dev/null @@ -1,18 +0,0 @@ -$OpenBSD: patch-go_kbfs_libkbfs_folder_branch_ops_go,v 1.1 2019/07/12 17:54:38 juanfra Exp $ - -Fix a bug when pushing big repos on slow connections. - -https://github.com/keybase/client/commit/a49da292349ba6bc2e6cc02121ea64f3d5714c43 - -Index: go/kbfs/libkbfs/folder_branch_ops.go ---- go/kbfs/libkbfs/folder_branch_ops.go.orig Fri Jul 12 18:42:15 2019 -+++ go/kbfs/libkbfs/folder_branch_ops.go Fri Jul 12 18:42:18 2019 -@@ -7377,7 +7377,7 @@ - timedOut = true - default: - } -- if timedOut || !mdserver.IsConnected() { -+ if lockBeforeGet == nil && (timedOut || !mdserver.IsConnected()) { - fbo.vlog.CLogf( - ctx, libkb.VLog1, "Not fetching new updates while offline") - return nil diff --git a/sysutils/restic-rest-server/Makefile b/sysutils/restic-rest-server/Makefile index 306fe3367fb..28ac1c57d1a 100644 --- a/sysutils/restic-rest-server/Makefile +++ b/sysutils/restic-rest-server/Makefile @@ -5,7 +5,7 @@ COMMENT = REST backend for the restic backup tool V = 0.9.7 DISTNAME = rest-server-${V} PKGNAME = restic-${DISTNAME} -REVISION = 3 +REVISION = 4 CATEGORIES = sysutils @@ -20,6 +20,7 @@ MASTER_SITES = https://github.com/restic/rest-server/releases/download/v${V}/ MODULES = lang/go MODGO_TYPE = bin +MAKE_ENV += GO111MODULE=off NO_TEST = Yes diff --git a/sysutils/restic/Makefile b/sysutils/restic/Makefile index 397f2840f24..3c5545f3d32 100644 --- a/sysutils/restic/Makefile +++ b/sysutils/restic/Makefile @@ -4,6 +4,7 @@ COMMENT = fast, efficient and secure backup program V = 0.9.5 DISTNAME = restic-${V} +REVISION = 0 CATEGORIES = sysutils @@ -20,6 +21,7 @@ MASTER_SITES = https://github.com/restic/restic/releases/download/v${V}/ MODULES = lang/go MODGO_TYPE = bin +MAKE_ENV += GO111MODULE=off NO_TEST = Yes -- PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE
