[update] lang/go to Go 1.13

classic Classic list List threaded Threaded
11 messages Options
Reply | Threaded
Open this post in threaded view
|

[update] lang/go to Go 1.13

Joel Sing-3
Reply | Threaded
Open this post in threaded view
|

Re: [update] lang/go to Go 1.13

Aaron Bieber-2
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

Reply | Threaded
Open this post in threaded view
|

Re: [update] lang/go to Go 1.13

Stuart Henderson-6
On 2019/09/10 19:37, Aaron Bieber wrote:

> 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!

We are in the run up to release, I think committing this should wait
until there are fixes for the other ports (or agreement with the
relevant maintainers that it's ok to break them).

Reply | Threaded
Open this post in threaded view
|

Re: [update] lang/go to Go 1.13

Joel Sing-3
On 19-09-11 15:37:39, Stuart Henderson wrote:

> On 2019/09/10 19:37, Aaron Bieber wrote:
> > 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!
>
> We are in the run up to release, I think committing this should wait
> until there are fixes for the other ports (or agreement with the
> relevant maintainers that it's ok to break them).

The following diffs allow the remaining four ports to build with Go 1.13:

ok?

Index: net/go-ipfs/Makefile
===================================================================
RCS file: /cvs/ports/net/go-ipfs/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- net/go-ipfs/Makefile 29 Aug 2019 10:40:53 -0000 1.4
+++ net/go-ipfs/Makefile 11 Sep 2019 16:33:23 -0000
@@ -4,6 +4,7 @@ COMMENT = global, versioned, peer-to-pee
 
 V = 0.4.22
 DISTNAME = go-ipfs-$V
+REVISION = 0
 
 CATEGORIES = net
 HOMEPAGE = https://ipfs.io
Index: net/go-ipfs/patches/patch-vendor_golang_org_x_xerrors_adaptor_go
===================================================================
RCS file: net/go-ipfs/patches/patch-vendor_golang_org_x_xerrors_adaptor_go
diff -N net/go-ipfs/patches/patch-vendor_golang_org_x_xerrors_adaptor_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ net/go-ipfs/patches/patch-vendor_golang_org_x_xerrors_adaptor_go 11 Sep 2019 16:33:23 -0000
@@ -0,0 +1,201 @@
+$OpenBSD$
+
+Fix build on Go 1.13
+
+Index: vendor/golang.org/x/xerrors/adaptor.go
+--- vendor/golang.org/x/xerrors/adaptor.go.orig
++++ vendor/golang.org/x/xerrors/adaptor.go
+@@ -0,0 +1,193 @@
++// Copyright 2018 The Go Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style
++// license that can be found in the LICENSE file.
++
++package xerrors
++
++import (
++ "bytes"
++ "fmt"
++ "io"
++ "reflect"
++ "strconv"
++)
++
++// FormatError calls the FormatError method of f with an errors.Printer
++// configured according to s and verb, and writes the result to s.
++func FormatError(f Formatter, s fmt.State, verb rune) {
++ // Assuming this function is only called from the Format method, and given
++ // that FormatError takes precedence over Format, it cannot be called from
++ // any package that supports errors.Formatter. It is therefore safe to
++ // disregard that State may be a specific printer implementation and use one
++ // of our choice instead.
++
++ // limitations: does not support printing error as Go struct.
++
++ var (
++ sep    = " " // separator before next error
++ p      = &state{State: s}
++ direct = true
++ )
++
++ var err error = f
++
++ switch verb {
++ // Note that this switch must match the preference order
++ // for ordinary string printing (%#v before %+v, and so on).
++
++ case 'v':
++ if s.Flag('#') {
++ if stringer, ok := err.(fmt.GoStringer); ok {
++ io.WriteString(&p.buf, stringer.GoString())
++ goto exit
++ }
++ // proceed as if it were %v
++ } else if s.Flag('+') {
++ p.printDetail = true
++ sep = "\n  - "
++ }
++ case 's':
++ case 'q', 'x', 'X':
++ // Use an intermediate buffer in the rare cases that precision,
++ // truncation, or one of the alternative verbs (q, x, and X) are
++ // specified.
++ direct = false
++
++ default:
++ p.buf.WriteString("%!")
++ p.buf.WriteRune(verb)
++ p.buf.WriteByte('(')
++ switch {
++ case err != nil:
++ p.buf.WriteString(reflect.TypeOf(f).String())
++ default:
++ p.buf.WriteString("<nil>")
++ }
++ p.buf.WriteByte(')')
++ io.Copy(s, &p.buf)
++ return
++ }
++
++loop:
++ for {
++ switch v := err.(type) {
++ case Formatter:
++ err = v.FormatError((*printer)(p))
++ case fmt.Formatter:
++ v.Format(p, 'v')
++ break loop
++ default:
++ io.WriteString(&p.buf, v.Error())
++ break loop
++ }
++ if err == nil {
++ break
++ }
++ if p.needColon || !p.printDetail {
++ p.buf.WriteByte(':')
++ p.needColon = false
++ }
++ p.buf.WriteString(sep)
++ p.inDetail = false
++ p.needNewline = false
++ }
++
++exit:
++ width, okW := s.Width()
++ prec, okP := s.Precision()
++
++ if !direct || (okW && width > 0) || okP {
++ // Construct format string from State s.
++ format := []byte{'%'}
++ if s.Flag('-') {
++ format = append(format, '-')
++ }
++ if s.Flag('+') {
++ format = append(format, '+')
++ }
++ if s.Flag(' ') {
++ format = append(format, ' ')
++ }
++ if okW {
++ format = strconv.AppendInt(format, int64(width), 10)
++ }
++ if okP {
++ format = append(format, '.')
++ format = strconv.AppendInt(format, int64(prec), 10)
++ }
++ format = append(format, string(verb)...)
++ fmt.Fprintf(s, string(format), p.buf.String())
++ } else {
++ io.Copy(s, &p.buf)
++ }
++}
++
++var detailSep = []byte("\n    ")
++
++// state tracks error printing state. It implements fmt.State.
++type state struct {
++ fmt.State
++ buf bytes.Buffer
++
++ printDetail bool
++ inDetail    bool
++ needColon   bool
++ needNewline bool
++}
++
++func (s *state) Write(b []byte) (n int, err error) {
++ if s.printDetail {
++ if len(b) == 0 {
++ return 0, nil
++ }
++ if s.inDetail && s.needColon {
++ s.needNewline = true
++ if b[0] == '\n' {
++ b = b[1:]
++ }
++ }
++ k := 0
++ for i, c := range b {
++ if s.needNewline {
++ if s.inDetail && s.needColon {
++ s.buf.WriteByte(':')
++ s.needColon = false
++ }
++ s.buf.Write(detailSep)
++ s.needNewline = false
++ }
++ if c == '\n' {
++ s.buf.Write(b[k:i])
++ k = i + 1
++ s.needNewline = true
++ }
++ }
++ s.buf.Write(b[k:])
++ if !s.inDetail {
++ s.needColon = true
++ }
++ } else if !s.inDetail {
++ s.buf.Write(b)
++ }
++ return len(b), nil
++}
++
++// printer wraps a state to implement an xerrors.Printer.
++type printer state
++
++func (s *printer) Print(args ...interface{}) {
++ if !s.inDetail || s.printDetail {
++ fmt.Fprint((*state)(s), args...)
++ }
++}
++
++func (s *printer) Printf(format string, args ...interface{}) {
++ if !s.inDetail || s.printDetail {
++ fmt.Fprintf((*state)(s), format, args...)
++ }
++}
++
++func (s *printer) Detail() bool {
++ s.inDetail = true
++ return s.printDetail
++}
Index: net/go-ipfs/patches/patch-vendor_golang_org_x_xerrors_adaptor_go1_12_go
===================================================================
RCS file: net/go-ipfs/patches/patch-vendor_golang_org_x_xerrors_adaptor_go1_12_go
diff -N net/go-ipfs/patches/patch-vendor_golang_org_x_xerrors_adaptor_go1_12_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ net/go-ipfs/patches/patch-vendor_golang_org_x_xerrors_adaptor_go1_12_go 11 Sep 2019 16:33:23 -0000
@@ -0,0 +1,201 @@
+$OpenBSD$
+
+Index: vendor/golang.org/x/xerrors/adaptor_go1_12.go
+--- vendor/golang.org/x/xerrors/adaptor_go1_12.go.orig
++++ vendor/golang.org/x/xerrors/adaptor_go1_12.go
+@@ -1,195 +1 @@
+-// Copyright 2018 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
+-
+-// +build !go1.13
+-
+ package xerrors
+-
+-import (
+- "bytes"
+- "fmt"
+- "io"
+- "reflect"
+- "strconv"
+-)
+-
+-// FormatError calls the FormatError method of f with an errors.Printer
+-// configured according to s and verb, and writes the result to s.
+-func FormatError(f Formatter, s fmt.State, verb rune) {
+- // Assuming this function is only called from the Format method, and given
+- // that FormatError takes precedence over Format, it cannot be called from
+- // any package that supports errors.Formatter. It is therefore safe to
+- // disregard that State may be a specific printer implementation and use one
+- // of our choice instead.
+-
+- // limitations: does not support printing error as Go struct.
+-
+- var (
+- sep    = " " // separator before next error
+- p      = &state{State: s}
+- direct = true
+- )
+-
+- var err error = f
+-
+- switch verb {
+- // Note that this switch must match the preference order
+- // for ordinary string printing (%#v before %+v, and so on).
+-
+- case 'v':
+- if s.Flag('#') {
+- if stringer, ok := err.(fmt.GoStringer); ok {
+- io.WriteString(&p.buf, stringer.GoString())
+- goto exit
+- }
+- // proceed as if it were %v
+- } else if s.Flag('+') {
+- p.printDetail = true
+- sep = "\n  - "
+- }
+- case 's':
+- case 'q', 'x', 'X':
+- // Use an intermediate buffer in the rare cases that precision,
+- // truncation, or one of the alternative verbs (q, x, and X) are
+- // specified.
+- direct = false
+-
+- default:
+- p.buf.WriteString("%!")
+- p.buf.WriteRune(verb)
+- p.buf.WriteByte('(')
+- switch {
+- case err != nil:
+- p.buf.WriteString(reflect.TypeOf(f).String())
+- default:
+- p.buf.WriteString("<nil>")
+- }
+- p.buf.WriteByte(')')
+- io.Copy(s, &p.buf)
+- return
+- }
+-
+-loop:
+- for {
+- switch v := err.(type) {
+- case Formatter:
+- err = v.FormatError((*printer)(p))
+- case fmt.Formatter:
+- v.Format(p, 'v')
+- break loop
+- default:
+- io.WriteString(&p.buf, v.Error())
+- break loop
+- }
+- if err == nil {
+- break
+- }
+- if p.needColon || !p.printDetail {
+- p.buf.WriteByte(':')
+- p.needColon = false
+- }
+- p.buf.WriteString(sep)
+- p.inDetail = false
+- p.needNewline = false
+- }
+-
+-exit:
+- width, okW := s.Width()
+- prec, okP := s.Precision()
+-
+- if !direct || (okW && width > 0) || okP {
+- // Construct format string from State s.
+- format := []byte{'%'}
+- if s.Flag('-') {
+- format = append(format, '-')
+- }
+- if s.Flag('+') {
+- format = append(format, '+')
+- }
+- if s.Flag(' ') {
+- format = append(format, ' ')
+- }
+- if okW {
+- format = strconv.AppendInt(format, int64(width), 10)
+- }
+- if okP {
+- format = append(format, '.')
+- format = strconv.AppendInt(format, int64(prec), 10)
+- }
+- format = append(format, string(verb)...)
+- fmt.Fprintf(s, string(format), p.buf.String())
+- } else {
+- io.Copy(s, &p.buf)
+- }
+-}
+-
+-var detailSep = []byte("\n    ")
+-
+-// state tracks error printing state. It implements fmt.State.
+-type state struct {
+- fmt.State
+- buf bytes.Buffer
+-
+- printDetail bool
+- inDetail    bool
+- needColon   bool
+- needNewline bool
+-}
+-
+-func (s *state) Write(b []byte) (n int, err error) {
+- if s.printDetail {
+- if len(b) == 0 {
+- return 0, nil
+- }
+- if s.inDetail && s.needColon {
+- s.needNewline = true
+- if b[0] == '\n' {
+- b = b[1:]
+- }
+- }
+- k := 0
+- for i, c := range b {
+- if s.needNewline {
+- if s.inDetail && s.needColon {
+- s.buf.WriteByte(':')
+- s.needColon = false
+- }
+- s.buf.Write(detailSep)
+- s.needNewline = false
+- }
+- if c == '\n' {
+- s.buf.Write(b[k:i])
+- k = i + 1
+- s.needNewline = true
+- }
+- }
+- s.buf.Write(b[k:])
+- if !s.inDetail {
+- s.needColon = true
+- }
+- } else if !s.inDetail {
+- s.buf.Write(b)
+- }
+- return len(b), nil
+-}
+-
+-// printer wraps a state to implement an xerrors.Printer.
+-type printer state
+-
+-func (s *printer) Print(args ...interface{}) {
+- if !s.inDetail || s.printDetail {
+- fmt.Fprint((*state)(s), args...)
+- }
+-}
+-
+-func (s *printer) Printf(format string, args ...interface{}) {
+- if !s.inDetail || s.printDetail {
+- fmt.Fprintf((*state)(s), format, args...)
+- }
+-}
+-
+-func (s *printer) Detail() bool {
+- s.inDetail = true
+- return s.printDetail
+-}
Index: net/go-ipfs/patches/patch-vendor_golang_org_x_xerrors_adaptor_go1_13_go
===================================================================
RCS file: net/go-ipfs/patches/patch-vendor_golang_org_x_xerrors_adaptor_go1_13_go
diff -N net/go-ipfs/patches/patch-vendor_golang_org_x_xerrors_adaptor_go1_13_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ net/go-ipfs/patches/patch-vendor_golang_org_x_xerrors_adaptor_go1_13_go 11 Sep 2019 16:33:23 -0000
@@ -0,0 +1,61 @@
+$OpenBSD$
+
+Index: vendor/golang.org/x/xerrors/adaptor_go1_13.go
+--- vendor/golang.org/x/xerrors/adaptor_go1_13.go.orig
++++ vendor/golang.org/x/xerrors/adaptor_go1_13.go
+@@ -1,55 +1 @@
+-// Copyright 2018 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
+-
+-// +build go1.13
+-
+ package xerrors
+-
+-import (
+- "errors"
+- "fmt"
+- "strconv"
+-)
+-
+-// A Frame contains part of a call stack.
+-type Frame = errors.Frame
+-
+-// Caller returns a Frame that describes a frame on the caller's stack.
+-// The argument skip is the number of frames to skip over.
+-// Caller(0) returns the frame for the caller of Caller.
+-var Caller func(skip int) Frame = errors.Caller
+-
+-// FormatError calls the FormatError method of f with an errors.Printer
+-// configured according to s and verb, and writes the result to s.
+-func FormatError(f Formatter, s fmt.State, verb rune) {
+- // Assuming this function is only called from the Format method, and given
+- // that FormatError takes precedence over Format, it cannot be called from
+- // any package that supports errors.Formatter. It is therefore safe to
+- // disregard that State may be a specific printer implementation and use one
+- // of our choice instead.
+-
+- width, okW := s.Width()
+- prec, okP := s.Precision()
+-
+- // Construct format string from State s.
+- format := []byte{'%'}
+- if s.Flag('-') {
+- format = append(format, '-')
+- }
+- if s.Flag('+') {
+- format = append(format, '+')
+- }
+- if s.Flag(' ') {
+- format = append(format, ' ')
+- }
+- if okW {
+- format = strconv.AppendInt(format, int64(width), 10)
+- }
+- if okP {
+- format = append(format, '.')
+- format = strconv.AppendInt(format, int64(prec), 10)
+- }
+- format = append(format, string(verb)...)
+- fmt.Fprintf(s, string(format), f)
+-}
Index: net/go-ipfs/patches/patch-vendor_golang_org_x_xerrors_format_go
===================================================================
RCS file: net/go-ipfs/patches/patch-vendor_golang_org_x_xerrors_format_go
diff -N net/go-ipfs/patches/patch-vendor_golang_org_x_xerrors_format_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ net/go-ipfs/patches/patch-vendor_golang_org_x_xerrors_format_go 11 Sep 2019 16:33:23 -0000
@@ -0,0 +1,40 @@
+$OpenBSD$
+
+Index: vendor/golang.org/x/xerrors/format.go
+--- vendor/golang.org/x/xerrors/format.go.orig
++++ vendor/golang.org/x/xerrors/format.go
+@@ -0,0 +1,34 @@
++// Copyright 2018 The Go Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style
++// license that can be found in the LICENSE file.
++
++package xerrors
++
++// A Formatter formats error messages.
++type Formatter interface {
++ error
++
++ // FormatError prints the receiver's first error and returns the next error in
++ // the error chain, if any.
++ FormatError(p Printer) (next error)
++}
++
++// A Printer formats error messages.
++//
++// The most common implementation of Printer is the one provided by package fmt
++// during Printf (as of Go 1.13). Localization packages such as golang.org/x/text/message
++// typically provide their own implementations.
++type Printer interface {
++ // Print appends args to the message output.
++ Print(args ...interface{})
++
++ // Printf writes a formatted string.
++ Printf(format string, args ...interface{})
++
++ // Detail reports whether error detail is requested.
++ // After the first call to Detail, all text written to the Printer
++ // is formatted as additional detail, or ignored when
++ // detail has not been requested.
++ // If Detail returns false, the caller can avoid printing the detail at all.
++ Detail() bool
++}
Index: net/go-ipfs/patches/patch-vendor_golang_org_x_xerrors_format_go1_12_go
===================================================================
RCS file: net/go-ipfs/patches/patch-vendor_golang_org_x_xerrors_format_go1_12_go
diff -N net/go-ipfs/patches/patch-vendor_golang_org_x_xerrors_format_go1_12_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ net/go-ipfs/patches/patch-vendor_golang_org_x_xerrors_format_go1_12_go 11 Sep 2019 16:33:23 -0000
@@ -0,0 +1,42 @@
+$OpenBSD$
+
+Index: vendor/golang.org/x/xerrors/format_go1_12.go
+--- vendor/golang.org/x/xerrors/format_go1_12.go.orig
++++ vendor/golang.org/x/xerrors/format_go1_12.go
+@@ -1,36 +1 @@
+-// Copyright 2018 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
+-
+-// +build !go1.13
+-
+ package xerrors
+-
+-// A Formatter formats error messages.
+-type Formatter interface {
+- error
+-
+- // FormatError prints the receiver's first error and returns the next error in
+- // the error chain, if any.
+- FormatError(p Printer) (next error)
+-}
+-
+-// A Printer formats error messages.
+-//
+-// The most common implementation of Printer is the one provided by package fmt
+-// during Printf (as of Go 1.13). Localization packages such as golang.org/x/text/message
+-// typically provide their own implementations.
+-type Printer interface {
+- // Print appends args to the message output.
+- Print(args ...interface{})
+-
+- // Printf writes a formatted string.
+- Printf(format string, args ...interface{})
+-
+- // Detail reports whether error detail is requested.
+- // After the first call to Detail, all text written to the Printer
+- // is formatted as additional detail, or ignored when
+- // detail has not been requested.
+- // If Detail returns false, the caller can avoid printing the detail at all.
+- Detail() bool
+-}
Index: net/go-ipfs/patches/patch-vendor_golang_org_x_xerrors_format_go1_13_go
===================================================================
RCS file: net/go-ipfs/patches/patch-vendor_golang_org_x_xerrors_format_go1_13_go
diff -N net/go-ipfs/patches/patch-vendor_golang_org_x_xerrors_format_go1_13_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ net/go-ipfs/patches/patch-vendor_golang_org_x_xerrors_format_go1_13_go 11 Sep 2019 16:33:23 -0000
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+Index: vendor/golang.org/x/xerrors/format_go1_13.go
+--- vendor/golang.org/x/xerrors/format_go1_13.go.orig
++++ vendor/golang.org/x/xerrors/format_go1_13.go
+@@ -1,19 +1 @@
+-// Copyright 2018 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
+-
+-// +build go1.13
+-
+ package xerrors
+-
+-import "errors"
+-
+-// A Formatter formats error messages.
+-type Formatter = errors.Formatter
+-
+-// A Printer formats error messages.
+-//
+-// The most common implementation of Printer is the one provided by package fmt
+-// during Printf (as of Go 1.13). Localization packages such as golang.org/x/text/message
+-// typically provide their own implementations.
+-type Printer = errors.Printer
Index: net/go-ipfs/patches/patch-vendor_golang_org_x_xerrors_frame_go
===================================================================
RCS file: net/go-ipfs/patches/patch-vendor_golang_org_x_xerrors_frame_go
diff -N net/go-ipfs/patches/patch-vendor_golang_org_x_xerrors_frame_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ net/go-ipfs/patches/patch-vendor_golang_org_x_xerrors_frame_go 11 Sep 2019 16:33:23 -0000
@@ -0,0 +1,62 @@
+$OpenBSD$
+
+Index: vendor/golang.org/x/xerrors/frame.go
+--- vendor/golang.org/x/xerrors/frame.go.orig
++++ vendor/golang.org/x/xerrors/frame.go
+@@ -0,0 +1,56 @@
++// Copyright 2018 The Go Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style
++// license that can be found in the LICENSE file.
++
++package xerrors
++
++import (
++ "runtime"
++)
++
++// A Frame contains part of a call stack.
++type Frame struct {
++ // Make room for three PCs: the one we were asked for, what it called,
++ // and possibly a PC for skipPleaseUseCallersFrames. See:
++ // https://go.googlesource.com/go/+/032678e0fb/src/runtime/extern.go#169
++ frames [3]uintptr
++}
++
++// Caller returns a Frame that describes a frame on the caller's stack.
++// The argument skip is the number of frames to skip over.
++// Caller(0) returns the frame for the caller of Caller.
++func Caller(skip int) Frame {
++ var s Frame
++ runtime.Callers(skip+1, s.frames[:])
++ return s
++}
++
++// location reports the file, line, and function of a frame.
++//
++// The returned function may be "" even if file and line are not.
++func (f Frame) location() (function, file string, line int) {
++ frames := runtime.CallersFrames(f.frames[:])
++ if _, ok := frames.Next(); !ok {
++ return "", "", 0
++ }
++ fr, ok := frames.Next()
++ if !ok {
++ return "", "", 0
++ }
++ return fr.Function, fr.File, fr.Line
++}
++
++// Format prints the stack as error detail.
++// It should be called from an error's Format implementation
++// after printing any other error detail.
++func (f Frame) Format(p Printer) {
++ if p.Detail() {
++ function, file, line := f.location()
++ if function != "" {
++ p.Printf("%s\n    ", function)
++ }
++ if file != "" {
++ p.Printf("%s:%d\n", file, line)
++ }
++ }
++}
Index: net/go-ipfs/patches/patch-vendor_golang_org_x_xerrors_frame_go1_12_go
===================================================================
RCS file: net/go-ipfs/patches/patch-vendor_golang_org_x_xerrors_frame_go1_12_go
diff -N net/go-ipfs/patches/patch-vendor_golang_org_x_xerrors_frame_go1_12_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ net/go-ipfs/patches/patch-vendor_golang_org_x_xerrors_frame_go1_12_go 11 Sep 2019 16:33:23 -0000
@@ -0,0 +1,64 @@
+$OpenBSD$
+
+Index: vendor/golang.org/x/xerrors/frame_go1_12.go
+--- vendor/golang.org/x/xerrors/frame_go1_12.go.orig
++++ vendor/golang.org/x/xerrors/frame_go1_12.go
+@@ -1,58 +1 @@
+-// Copyright 2018 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
+-
+-// +build !go1.13
+-
+ package xerrors
+-
+-import (
+- "runtime"
+-)
+-
+-// A Frame contains part of a call stack.
+-type Frame struct {
+- // Make room for three PCs: the one we were asked for, what it called,
+- // and possibly a PC for skipPleaseUseCallersFrames. See:
+- // https://go.googlesource.com/go/+/032678e0fb/src/runtime/extern.go#169
+- frames [3]uintptr
+-}
+-
+-// Caller returns a Frame that describes a frame on the caller's stack.
+-// The argument skip is the number of frames to skip over.
+-// Caller(0) returns the frame for the caller of Caller.
+-func Caller(skip int) Frame {
+- var s Frame
+- runtime.Callers(skip+1, s.frames[:])
+- return s
+-}
+-
+-// location reports the file, line, and function of a frame.
+-//
+-// The returned function may be "" even if file and line are not.
+-func (f Frame) location() (function, file string, line int) {
+- frames := runtime.CallersFrames(f.frames[:])
+- if _, ok := frames.Next(); !ok {
+- return "", "", 0
+- }
+- fr, ok := frames.Next()
+- if !ok {
+- return "", "", 0
+- }
+- return fr.Function, fr.File, fr.Line
+-}
+-
+-// Format prints the stack as error detail.
+-// It should be called from an error's Format implementation
+-// after printing any other error detail.
+-func (f Frame) Format(p Printer) {
+- if p.Detail() {
+- function, file, line := f.location()
+- if function != "" {
+- p.Printf("%s\n    ", function)
+- }
+- if file != "" {
+- p.Printf("%s:%d\n", file, line)
+- }
+- }
+-}
Index: net/mattermost-server/Makefile
===================================================================
RCS file: /cvs/ports/net/mattermost-server/Makefile,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 Makefile
--- net/mattermost-server/Makefile 6 Aug 2019 09:38:15 -0000 1.14
+++ net/mattermost-server/Makefile 11 Sep 2019 16:33:23 -0000
@@ -6,6 +6,7 @@ V = 5.13.2
 GH_ACCOUNT = mattermost
 GH_PROJECT = mattermost-server
 GH_TAGNAME = v${V}
+REVISION = 0
 
 MASTER_SITES0 = https://releases.mattermost.com/${V}/
 
@@ -26,6 +27,7 @@ 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/consul/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/consul/Makefile,v
retrieving revision 1.34
diff -u -p -u -p -r1.34 Makefile
--- sysutils/consul/Makefile 7 Sep 2019 11:28:46 -0000 1.34
+++ sysutils/consul/Makefile 11 Sep 2019 16:33:23 -0000
@@ -8,6 +8,7 @@ COMMENT= service discovery and configur
 GH_TAGNAME= v1.6.0
 GH_ACCOUNT= hashicorp
 GH_PROJECT= consul
+REVISION= 0
 
 CATEGORIES= sysutils net
 
Index: sysutils/consul/patches/patch-vendor_github_com_envoyproxy_protoc-gen-validate_validate_validate_pb_go
===================================================================
RCS file: sysutils/consul/patches/patch-vendor_github_com_envoyproxy_protoc-gen-validate_validate_validate_pb_go
diff -N sysutils/consul/patches/patch-vendor_github_com_envoyproxy_protoc-gen-validate_validate_validate_pb_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sysutils/consul/patches/patch-vendor_github_com_envoyproxy_protoc-gen-validate_validate_validate_pb_go 11 Sep 2019 16:33:23 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: vendor/github.com/envoyproxy/protoc-gen-validate/validate/validate.pb.go
+--- vendor/github.com/envoyproxy/protoc-gen-validate/validate/validate.pb.go.orig
++++ vendor/github.com/envoyproxy/protoc-gen-validate/validate/validate.pb.go
+@@ -1,7 +1,7 @@
+ // Code generated by protoc-gen-go. DO NOT EDIT.
+ // source: validate/validate.proto
+
+-package validate // import "github.com/lyft/protoc-gen-validate/validate"
++package validate
+
+ import proto "github.com/golang/protobuf/proto"
+ import fmt "fmt"
Index: www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_common_go
===================================================================
RCS file: www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_common_go
diff -N www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_common_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_common_go 11 Sep 2019 16:33:23 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+
+Index: vendor/github.com/tdewolff/minify/v2/common.go
+--- vendor/github.com/tdewolff/minify/v2/common.go.orig
++++ vendor/github.com/tdewolff/minify/v2/common.go
+@@ -1,4 +1,4 @@
+-package minify // import "github.com/tdewolff/minify"
++package minify
+
+ import (
+ "bytes"
Index: www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_css_css_go
===================================================================
RCS file: www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_css_css_go
diff -N www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_css_css_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_css_css_go 11 Sep 2019 16:33:23 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+
+Index: vendor/github.com/tdewolff/minify/v2/css/css.go
+--- vendor/github.com/tdewolff/minify/v2/css/css.go.orig
++++ vendor/github.com/tdewolff/minify/v2/css/css.go
+@@ -1,5 +1,5 @@
+ // Package css minifies CSS3 following the specifications at http://www.w3.org/TR/css-syntax-3/.
+-package css // import "github.com/tdewolff/minify/css"
++package css
+
+ import (
+ "bytes"
Index: www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_html_buffer_go
===================================================================
RCS file: www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_html_buffer_go
diff -N www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_html_buffer_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_html_buffer_go 11 Sep 2019 16:33:23 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+
+Index: vendor/github.com/tdewolff/minify/v2/html/buffer.go
+--- vendor/github.com/tdewolff/minify/v2/html/buffer.go.orig
++++ vendor/github.com/tdewolff/minify/v2/html/buffer.go
+@@ -1,4 +1,4 @@
+-package html // import "github.com/tdewolff/minify/html"
++package html
+
+ import (
+ "github.com/tdewolff/parse/v2"
Index: www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_html_html_go
===================================================================
RCS file: www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_html_html_go
diff -N www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_html_html_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_html_html_go 11 Sep 2019 16:33:23 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+
+Index: vendor/github.com/tdewolff/minify/v2/html/html.go
+--- vendor/github.com/tdewolff/minify/v2/html/html.go.orig
++++ vendor/github.com/tdewolff/minify/v2/html/html.go
+@@ -1,5 +1,5 @@
+ // Package html minifies HTML5 following the specifications at http://www.w3.org/TR/html5/syntax.html.
+-package html // import "github.com/tdewolff/minify/html"
++package html
+
+ import (
+ "bytes"
Index: www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_html_table_go
===================================================================
RCS file: www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_html_table_go
diff -N www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_html_table_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_html_table_go 11 Sep 2019 16:33:23 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+
+Index: vendor/github.com/tdewolff/minify/v2/html/table.go
+--- vendor/github.com/tdewolff/minify/v2/html/table.go.orig
++++ vendor/github.com/tdewolff/minify/v2/html/table.go
+@@ -1,4 +1,4 @@
+-package html // import "github.com/tdewolff/minify/html"
++package html
+
+ import "github.com/tdewolff/parse/v2/html"
+
Index: www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_js_js_go
===================================================================
RCS file: www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_js_js_go
diff -N www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_js_js_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_js_js_go 11 Sep 2019 16:33:23 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+
+Index: vendor/github.com/tdewolff/minify/v2/js/js.go
+--- vendor/github.com/tdewolff/minify/v2/js/js.go.orig
++++ vendor/github.com/tdewolff/minify/v2/js/js.go
+@@ -1,5 +1,5 @@
+ // Package js minifies ECMAScript5.1 following the specifications at http://www.ecma-international.org/ecma-262/5.1/.
+-package js // import "github.com/tdewolff/minify/js"
++package js
+
+ import (
+ "io"
Index: www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_json_json_go
===================================================================
RCS file: www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_json_json_go
diff -N www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_json_json_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_json_json_go 11 Sep 2019 16:33:23 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+
+Index: vendor/github.com/tdewolff/minify/v2/json/json.go
+--- vendor/github.com/tdewolff/minify/v2/json/json.go.orig
++++ vendor/github.com/tdewolff/minify/v2/json/json.go
+@@ -1,5 +1,5 @@
+ // Package json minifies JSON following the specifications at http://json.org/.
+-package json // import "github.com/tdewolff/minify/json"
++package json
+
+ import (
+ "io"
Index: www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_minify_go
===================================================================
RCS file: www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_minify_go
diff -N www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_minify_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_minify_go 11 Sep 2019 16:33:23 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+
+Index: vendor/github.com/tdewolff/minify/v2/minify.go
+--- vendor/github.com/tdewolff/minify/v2/minify.go.orig
++++ vendor/github.com/tdewolff/minify/v2/minify.go
+@@ -1,5 +1,5 @@
+ // Package minify relates MIME type to minifiers. Several minifiers are provided in the subpackages.
+-package minify // import "github.com/tdewolff/minify"
++package minify
+
+ import (
+ "errors"
Index: www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_svg_buffer_go
===================================================================
RCS file: www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_svg_buffer_go
diff -N www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_svg_buffer_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_svg_buffer_go 11 Sep 2019 16:33:23 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+
+Index: vendor/github.com/tdewolff/minify/v2/svg/buffer.go
+--- vendor/github.com/tdewolff/minify/v2/svg/buffer.go.orig
++++ vendor/github.com/tdewolff/minify/v2/svg/buffer.go
+@@ -1,4 +1,4 @@
+-package svg // import "github.com/tdewolff/minify/svg"
++package svg
+
+ import (
+ "github.com/tdewolff/parse/v2"
Index: www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_svg_svg_go
===================================================================
RCS file: www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_svg_svg_go
diff -N www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_svg_svg_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_svg_svg_go 11 Sep 2019 16:33:23 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+
+Index: vendor/github.com/tdewolff/minify/v2/svg/svg.go
+--- vendor/github.com/tdewolff/minify/v2/svg/svg.go.orig
++++ vendor/github.com/tdewolff/minify/v2/svg/svg.go
+@@ -1,5 +1,5 @@
+ // Package svg minifies SVG1.1 following the specifications at http://www.w3.org/TR/SVG11/.
+-package svg // import "github.com/tdewolff/minify/svg"
++package svg
+
+ import (
+ "bytes"
Index: www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_svg_table_go
===================================================================
RCS file: www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_svg_table_go
diff -N www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_svg_table_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_svg_table_go 11 Sep 2019 16:33:23 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+
+Index: vendor/github.com/tdewolff/minify/v2/svg/table.go
+--- vendor/github.com/tdewolff/minify/v2/svg/table.go.orig
++++ vendor/github.com/tdewolff/minify/v2/svg/table.go
+@@ -1,4 +1,4 @@
+-package svg // import "github.com/tdewolff/minify/svg"
++package svg
+
+ import "github.com/tdewolff/parse/v2/svg"
+
Index: www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_xml_buffer_go
===================================================================
RCS file: www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_xml_buffer_go
diff -N www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_xml_buffer_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_xml_buffer_go 11 Sep 2019 16:33:23 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+
+Index: vendor/github.com/tdewolff/minify/v2/xml/buffer.go
+--- vendor/github.com/tdewolff/minify/v2/xml/buffer.go.orig
++++ vendor/github.com/tdewolff/minify/v2/xml/buffer.go
+@@ -1,4 +1,4 @@
+-package xml // import "github.com/tdewolff/minify/xml"
++package xml
+
+ import "github.com/tdewolff/parse/v2/xml"
+
Index: www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_xml_xml_go
===================================================================
RCS file: www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_xml_xml_go
diff -N www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_xml_xml_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/hugo/patches/patch-vendor_github_com_tdewolff_minify_v2_xml_xml_go 11 Sep 2019 16:33:23 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+
+Index: vendor/github.com/tdewolff/minify/v2/xml/xml.go
+--- vendor/github.com/tdewolff/minify/v2/xml/xml.go.orig
++++ vendor/github.com/tdewolff/minify/v2/xml/xml.go
+@@ -1,5 +1,5 @@
+ // Package xml minifies XML1.0 following the specifications at http://www.w3.org/TR/xml/.
+-package xml // import "github.com/tdewolff/minify/xml"
++package xml
+
+ import (
+ "io"
Index: www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_buffer_buffer_go
===================================================================
RCS file: www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_buffer_buffer_go
diff -N www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_buffer_buffer_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_buffer_buffer_go 11 Sep 2019 16:33:23 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: vendor/github.com/tdewolff/parse/v2/buffer/buffer.go
+--- vendor/github.com/tdewolff/parse/v2/buffer/buffer.go.orig
++++ vendor/github.com/tdewolff/parse/v2/buffer/buffer.go
+@@ -5,7 +5,7 @@ The `Reader` and `Writer` types implement the `io.Read
+ The `Lexer` type is useful for building lexers because it keeps track of the start and end position of a byte selection, and shifts the bytes whenever a valid token is found.
+ The `StreamLexer` does the same, but keeps a buffer pool so that it reads a limited amount at a time, allowing to parse from streaming sources.
+ */
+-package buffer // import "github.com/tdewolff/parse/buffer"
++package buffer
+
+ // defaultBufSize specifies the default initial length of internal buffers.
+ var defaultBufSize = 4096
Index: www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_buffer_lexer_go
===================================================================
RCS file: www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_buffer_lexer_go
diff -N www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_buffer_lexer_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_buffer_lexer_go 11 Sep 2019 16:33:23 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+
+Index: vendor/github.com/tdewolff/parse/v2/buffer/lexer.go
+--- vendor/github.com/tdewolff/parse/v2/buffer/lexer.go.orig
++++ vendor/github.com/tdewolff/parse/v2/buffer/lexer.go
+@@ -1,4 +1,4 @@
+-package buffer // import "github.com/tdewolff/parse/buffer"
++package buffer
+
+ import (
+ "io"
Index: www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_buffer_reader_go
===================================================================
RCS file: www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_buffer_reader_go
diff -N www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_buffer_reader_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_buffer_reader_go 11 Sep 2019 16:33:23 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+
+Index: vendor/github.com/tdewolff/parse/v2/buffer/reader.go
+--- vendor/github.com/tdewolff/parse/v2/buffer/reader.go.orig
++++ vendor/github.com/tdewolff/parse/v2/buffer/reader.go
+@@ -1,4 +1,4 @@
+-package buffer // import "github.com/tdewolff/parse/buffer"
++package buffer
+
+ import "io"
+
Index: www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_buffer_streamlexer_go
===================================================================
RCS file: www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_buffer_streamlexer_go
diff -N www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_buffer_streamlexer_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_buffer_streamlexer_go 11 Sep 2019 16:33:23 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+
+Index: vendor/github.com/tdewolff/parse/v2/buffer/streamlexer.go
+--- vendor/github.com/tdewolff/parse/v2/buffer/streamlexer.go.orig
++++ vendor/github.com/tdewolff/parse/v2/buffer/streamlexer.go
+@@ -1,4 +1,4 @@
+-package buffer // import "github.com/tdewolff/parse/buffer"
++package buffer
+
+ import (
+ "io"
Index: www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_buffer_writer_go
===================================================================
RCS file: www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_buffer_writer_go
diff -N www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_buffer_writer_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_buffer_writer_go 11 Sep 2019 16:33:23 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+
+Index: vendor/github.com/tdewolff/parse/v2/buffer/writer.go
+--- vendor/github.com/tdewolff/parse/v2/buffer/writer.go.orig
++++ vendor/github.com/tdewolff/parse/v2/buffer/writer.go
+@@ -1,4 +1,4 @@
+-package buffer // import "github.com/tdewolff/parse/buffer"
++package buffer
+
+ // Writer implements an io.Writer over a byte slice.
+ type Writer struct {
Index: www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_common_go
===================================================================
RCS file: www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_common_go
diff -N www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_common_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_common_go 11 Sep 2019 16:33:23 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+
+Index: vendor/github.com/tdewolff/parse/v2/common.go
+--- vendor/github.com/tdewolff/parse/v2/common.go.orig
++++ vendor/github.com/tdewolff/parse/v2/common.go
+@@ -1,5 +1,5 @@
+ // Package parse contains a collection of parsers for various formats in its subpackages.
+-package parse // import "github.com/tdewolff/parse"
++package parse
+
+ import (
+ "bytes"
Index: www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_css_lex_go
===================================================================
RCS file: www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_css_lex_go
diff -N www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_css_lex_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_css_lex_go 11 Sep 2019 16:33:23 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+
+Index: vendor/github.com/tdewolff/parse/v2/css/lex.go
+--- vendor/github.com/tdewolff/parse/v2/css/lex.go.orig
++++ vendor/github.com/tdewolff/parse/v2/css/lex.go
+@@ -1,5 +1,5 @@
+ // Package css is a CSS3 lexer and parser following the specifications at http://www.w3.org/TR/css-syntax-3/.
+-package css // import "github.com/tdewolff/parse/css"
++package css
+
+ // TODO: \uFFFD replacement character for NULL bytes in strings for example, or atleast don't end the string early
+
Index: www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_css_parse_go
===================================================================
RCS file: www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_css_parse_go
diff -N www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_css_parse_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_css_parse_go 11 Sep 2019 16:33:23 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+
+Index: vendor/github.com/tdewolff/parse/v2/css/parse.go
+--- vendor/github.com/tdewolff/parse/v2/css/parse.go.orig
++++ vendor/github.com/tdewolff/parse/v2/css/parse.go
+@@ -1,4 +1,4 @@
+-package css // import "github.com/tdewolff/parse/css"
++package css
+
+ import (
+ "bytes"
Index: www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_css_util_go
===================================================================
RCS file: www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_css_util_go
diff -N www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_css_util_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_css_util_go 11 Sep 2019 16:33:23 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+
+Index: vendor/github.com/tdewolff/parse/v2/css/util.go
+--- vendor/github.com/tdewolff/parse/v2/css/util.go.orig
++++ vendor/github.com/tdewolff/parse/v2/css/util.go
+@@ -1,4 +1,4 @@
+-package css // import "github.com/tdewolff/parse/css"
++package css
+
+ import "github.com/tdewolff/parse/v2/buffer"
+
Index: www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_html_lex_go
===================================================================
RCS file: www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_html_lex_go
diff -N www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_html_lex_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_html_lex_go 11 Sep 2019 16:33:23 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+
+Index: vendor/github.com/tdewolff/parse/v2/html/lex.go
+--- vendor/github.com/tdewolff/parse/v2/html/lex.go.orig
++++ vendor/github.com/tdewolff/parse/v2/html/lex.go
+@@ -1,5 +1,5 @@
+ // Package html is an HTML5 lexer following the specifications at http://www.w3.org/TR/html5/syntax.html.
+-package html // import "github.com/tdewolff/parse/html"
++package html
+
+ import (
+ "io"
Index: www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_html_util_go
===================================================================
RCS file: www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_html_util_go
diff -N www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_html_util_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_html_util_go 11 Sep 2019 16:33:23 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+
+Index: vendor/github.com/tdewolff/parse/v2/html/util.go
+--- vendor/github.com/tdewolff/parse/v2/html/util.go.orig
++++ vendor/github.com/tdewolff/parse/v2/html/util.go
+@@ -1,4 +1,4 @@
+-package html // import "github.com/tdewolff/parse/html"
++package html
+
+ import "github.com/tdewolff/parse/v2"
+
Index: www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_js_lex_go
===================================================================
RCS file: www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_js_lex_go
diff -N www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_js_lex_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_js_lex_go 11 Sep 2019 16:33:23 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+
+Index: vendor/github.com/tdewolff/parse/v2/js/lex.go
+--- vendor/github.com/tdewolff/parse/v2/js/lex.go.orig
++++ vendor/github.com/tdewolff/parse/v2/js/lex.go
+@@ -1,5 +1,5 @@
+ // Package js is an ECMAScript5.1 lexer following the specifications at http://www.ecma-international.org/ecma-262/5.1/.
+-package js // import "github.com/tdewolff/parse/js"
++package js
+
+ import (
+ "io"
Index: www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_json_parse_go
===================================================================
RCS file: www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_json_parse_go
diff -N www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_json_parse_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_json_parse_go 11 Sep 2019 16:33:23 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+
+Index: vendor/github.com/tdewolff/parse/v2/json/parse.go
+--- vendor/github.com/tdewolff/parse/v2/json/parse.go.orig
++++ vendor/github.com/tdewolff/parse/v2/json/parse.go
+@@ -1,5 +1,5 @@
+ // Package json is a JSON parser following the specifications at http://json.org/.
+-package json // import "github.com/tdewolff/parse/json"
++package json
+
+ import (
+ "io"
Index: www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_strconv_float_go
===================================================================
RCS file: www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_strconv_float_go
diff -N www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_strconv_float_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_strconv_float_go 11 Sep 2019 16:33:23 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+
+Index: vendor/github.com/tdewolff/parse/v2/strconv/float.go
+--- vendor/github.com/tdewolff/parse/v2/strconv/float.go.orig
++++ vendor/github.com/tdewolff/parse/v2/strconv/float.go
+@@ -1,4 +1,4 @@
+-package strconv // import "github.com/tdewolff/parse/strconv"
++package strconv
+
+ import "math"
+
Index: www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_strconv_int_go
===================================================================
RCS file: www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_strconv_int_go
diff -N www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_strconv_int_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_strconv_int_go 11 Sep 2019 16:33:23 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+
+Index: vendor/github.com/tdewolff/parse/v2/strconv/int.go
+--- vendor/github.com/tdewolff/parse/v2/strconv/int.go.orig
++++ vendor/github.com/tdewolff/parse/v2/strconv/int.go
+@@ -1,4 +1,4 @@
+-package strconv // import "github.com/tdewolff/parse/strconv"
++package strconv
+
+ import (
+ "math"
Index: www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_util_go
===================================================================
RCS file: www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_util_go
diff -N www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_util_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_util_go 11 Sep 2019 16:33:23 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+
+Index: vendor/github.com/tdewolff/parse/v2/util.go
+--- vendor/github.com/tdewolff/parse/v2/util.go.orig
++++ vendor/github.com/tdewolff/parse/v2/util.go
+@@ -1,4 +1,4 @@
+-package parse // import "github.com/tdewolff/parse"
++package parse
+
+ // Copy returns a copy of the given byte slice.
+ func Copy(src []byte) (dst []byte) {
Index: www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_xml_lex_go
===================================================================
RCS file: www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_xml_lex_go
diff -N www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_xml_lex_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_xml_lex_go 11 Sep 2019 16:33:23 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+
+Index: vendor/github.com/tdewolff/parse/v2/xml/lex.go
+--- vendor/github.com/tdewolff/parse/v2/xml/lex.go.orig
++++ vendor/github.com/tdewolff/parse/v2/xml/lex.go
+@@ -1,5 +1,5 @@
+ // Package xml is an XML1.0 lexer following the specifications at http://www.w3.org/TR/xml/.
+-package xml // import "github.com/tdewolff/parse/xml"
++package xml
+
+ import (
+ "io"
Index: www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_xml_util_go
===================================================================
RCS file: www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_xml_util_go
diff -N www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_xml_util_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/hugo/patches/patch-vendor_github_com_tdewolff_parse_v2_xml_util_go 11 Sep 2019 16:33:23 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+
+Index: vendor/github.com/tdewolff/parse/v2/xml/util.go
+--- vendor/github.com/tdewolff/parse/v2/xml/util.go.orig
++++ vendor/github.com/tdewolff/parse/v2/xml/util.go
+@@ -1,4 +1,4 @@
+-package xml // import "github.com/tdewolff/parse/xml"
++package xml
+
+ import "github.com/tdewolff/parse/v2"
+

Reply | Threaded
Open this post in threaded view
|

Re: [update] lang/go to Go 1.13

Stuart Henderson
On 2019/09/12 02:35, Joel Sing wrote:

> On 19-09-11 15:37:39, Stuart Henderson wrote:
> > On 2019/09/10 19:37, Aaron Bieber wrote:
> > > 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!
> >
> > We are in the run up to release, I think committing this should wait
> > until there are fixes for the other ports (or agreement with the
> > relevant maintainers that it's ok to break them).
>
> The following diffs allow the remaining four ports to build with Go 1.13:
>
> ok?

Thanks. I can't comment on the patches (especially the go-ipfs ones!)
but I'm happy with this going ahead now - OK sthen@

Reply | Threaded
Open this post in threaded view
|

Re: [update] lang/go to Go 1.13

Stuart Henderson
In reply to this post by Joel Sing-3
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.
>=20
> The following ports appear to break with this update:
>=20
>  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=3DYes in mk.conf with the default "block return out log
proto {tcp udp} user _pbuild" pf rule. Any advice on how to fix this?

(dnscrypt-proxy was updated recently, but the previous version has
the same failure with new go).


=3D=3D=3D>  Building for dnscrypt-proxy-2.0.27
cd /usr/obj/ports/dnscrypt-proxy-2.0.27/go/src/github.com/jedisct1/dnscrypt=
-proxy/dnscrypt-proxy && /usr/bin/env -i GOCACHE=3D"/usr/obj/ports/dnscrypt=
-proxy-2.0.27/go-cache" GOPATH=3D"/usr/obj/ports/dnscrypt-proxy-2.0.27/go:/=
usr/local/go-pkg" PORTSDIR=3D"/usr/ports" LIBTOOL=3D"/usr/bin/libtool"  CCA=
CHE_DIR=3D/usr/obj/ports/.ccache  PATH=3D'/usr/obj/ports/dnscrypt-proxy-2.0=
=2E27/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11R6/bin' PREF=
IX=3D'/usr/local'  LOCALBASE=3D'/usr/local' X11BASE=3D'/usr/X11R6'  CFLAGS=
=3D'-O2 -pipe'  TRUEPREFIX=3D'/usr/local' DESTDIR=3D''  HOME=3D'/dnscrypt-p=
roxy-2.0.27_writes_to_HOME' COMPILER_VERSION=3Dclang  PICFLAG=3D"-fpic"  BI=
NGRP=3Dbin BINOWN=3Droot BINMODE=3D755 NONBINMODE=3D644  DIRMODE=3D755  INS=
TALL_COPY=3D-c INSTALL_STRIP=3D  MANGRP=3Dbin MANOWN=3Droot MANMODE=3D644 B=
SD_INSTALL_PROGRAM=3D"/usr/obj/ports/dnscrypt-proxy-2.0.27/bin/install -c  =
-m 755"  BSD_INSTALL_SCRIPT=3D"/usr/obj/ports/dnscrypt-proxy-2.0.27/bin/ins=
tall -c -m 755"  BSD_INSTALL_DATA=3D"/usr/obj/ports/dnscrypt-proxy-2.0.27/b=
in/install -c -m 644"  BSD_INSTALL_MAN=3D"/usr/obj/ports/dnscrypt-proxy-2.0=
=2E27/bin/install -c -m 644"  BSD_INSTALL_PROGRAM_DIR=3D"/usr/obj/ports/dns=
crypt-proxy-2.0.27/bin/install -d -m 755"  BSD_INSTALL_SCRIPT_DIR=3D"/usr/o=
bj/ports/dnscrypt-proxy-2.0.27/bin/install -d -m 755"  BSD_INSTALL_DATA_DIR=
=3D"/usr/obj/ports/dnscrypt-proxy-2.0.27/bin/install -d -m 755"  BSD_INSTAL=
L_MAN_DIR=3D"/usr/obj/ports/dnscrypt-proxy-2.0.27/bin/install -d -m 755" go=
 build
go: github.com/BurntSushi/toml@v0.3.1: Get https://proxy.golang.org/github.=
com/%21burnt%21sushi/toml/@v/v0.3.1.mod: dial tcp [2a00:1450:4009:819::2011=
]:443: connect: no route to host
*** Error 1 in . (Makefile:30 'do-build')

Reply | Threaded
Open this post in threaded view
|

Re: [update] lang/go to Go 1.13

Joel Sing-3
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.

The following diff should fix this case:

Index: Makefile
===================================================================
RCS file: /cvs/ports/net/dnscrypt-proxy/Makefile,v
retrieving revision 1.44
diff -u -p -r1.44 Makefile
--- Makefile 10 Sep 2019 13:19:25 -0000 1.44
+++ Makefile 13 Sep 2019 13:30:31 -0000
@@ -19,6 +19,7 @@ WANTLIB = c pthread
 
 MODULES = lang/go
 MODGO_TYPE = bin
+MAKE_ENV += GO111MODULE=off
 NO_TEST = Yes
 
 INSTDIR = ${PREFIX}/share/examples/dnscrypt-proxy

Reply | Threaded
Open this post in threaded view
|

Re: [update] lang/go to Go 1.13

Joel Sing-3
In reply to this post by Stuart Henderson
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?

I think there's actually a better option here - will send another diff shortly.

Reply | Threaded
Open this post in threaded view
|

Re: [update] lang/go to Go 1.13

Stuart Henderson
In reply to this post by Joel Sing-3
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..

> The following diff should fix this case:

Thanks, confirmed it does. OK.

> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/net/dnscrypt-proxy/Makefile,v
> retrieving revision 1.44
> diff -u -p -r1.44 Makefile
> --- Makefile 10 Sep 2019 13:19:25 -0000 1.44
> +++ Makefile 13 Sep 2019 13:30:31 -0000
> @@ -19,6 +19,7 @@ WANTLIB = c pthread
>  
>  MODULES = lang/go
>  MODGO_TYPE = bin
> +MAKE_ENV += GO111MODULE=off
>  NO_TEST = Yes
>  
>  INSTDIR = ${PREFIX}/share/examples/dnscrypt-proxy
>

Reply | Threaded
Open this post in threaded view
|

Re: [update] lang/go to Go 1.13

Joel Sing-3
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
 

Reply | Threaded
Open this post in threaded view
|

Re: [update] lang/go to Go 1.13

Stuart Henderson-6
On 2019/09/14 00:20, Joel Sing wrote:
> For now, I think we should do this instead - ok?

ok.

same problem with net/syncthing and sysutils/govmomi btw.