Skip to content

Commit 6917b3c

Browse files
committed
vendor: re-vendor golang.org/x/net to fix Dragonfly build
This picks up CL 202317 which fixes golang.org/x/net for Dragonfly master (upcoming 5.8 release). Also re-enable the interface tests disabled in CL 201482. Vendored using: $ go get golang.org/x/net@24d2ffbea1e8 $ go mod tidy $ go mod vendor Fixes #34368 Change-Id: Iac152b7ffaa607bfedbb4024b4e1ffc9b649d689 Reviewed-on: https://go-review.googlesource.com/c/go/+/202438 Run-TryBot: Tobias Klauser <[email protected]> TryBot-Result: Gobot Gobot <[email protected]> Reviewed-by: Bryan C. Mills <[email protected]>
1 parent e01e917 commit 6917b3c

File tree

13 files changed

+28
-16
lines changed

13 files changed

+28
-16
lines changed

src/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.14
44

55
require (
66
golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8
7-
golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7
7+
golang.org/x/net v0.0.0-20191021124707-24d2ffbea1e8
88
golang.org/x/sys v0.0.0-20190529130038-5219a1e1c5f8 // indirect
99
golang.org/x/text v0.3.2 // indirect
1010
)

src/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
22
golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8 h1:1wopBVtVdWnn03fZelqdXTqk7U7zPQCb+T4rbU9ZEoU=
33
golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
44
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
5-
golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7 h1:fHDIZ2oxGnUZRN6WgWFCbYBjH9uqVPRCUVUDhs0wnbA=
6-
golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
5+
golang.org/x/net v0.0.0-20191021124707-24d2ffbea1e8 h1:L4W1teiyF4Jl6VuapLNV/LYho36udiBQsfbNu7eRMeo=
6+
golang.org/x/net v0.0.0-20191021124707-24d2ffbea1e8/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
77
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
88
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
99
golang.org/x/sys v0.0.0-20190529130038-5219a1e1c5f8 h1:2WjIC11WRITGlVWmyLXKjzIVj1ZwoWZ//tadeUUV6/o=

src/net/interface_test.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ package net
88

99
import (
1010
"fmt"
11-
"internal/testenv"
1211
"reflect"
1312
"runtime"
1413
"testing"
@@ -58,8 +57,6 @@ func condSkipInterfaceTest(t *testing.T) {
5857
if runtime.GOARCH == "arm" || runtime.GOARCH == "arm64" {
5958
t.Skipf("sysctl is not supported on iOS")
6059
}
61-
case "dragonfly":
62-
testenv.SkipFlaky(t, 34368)
6360
}
6461
}
6562

src/vendor/golang.org/x/net/dns/dnsmessage/message.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/vendor/golang.org/x/net/http2/hpack/encode.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/vendor/golang.org/x/net/route/address.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/vendor/golang.org/x/net/route/message.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/vendor/golang.org/x/net/route/route.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/vendor/golang.org/x/net/route/route_classic.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/vendor/golang.org/x/net/route/sys.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/vendor/golang.org/x/net/route/sys_dragonfly.go

Lines changed: 13 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/vendor/golang.org/x/net/route/zsys_dragonfly.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ golang.org/x/crypto/hkdf
88
golang.org/x/crypto/internal/chacha20
99
golang.org/x/crypto/internal/subtle
1010
golang.org/x/crypto/poly1305
11-
# golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7
11+
# golang.org/x/net v0.0.0-20191021124707-24d2ffbea1e8
1212
## explicit
1313
golang.org/x/net/dns/dnsmessage
1414
golang.org/x/net/http/httpguts

0 commit comments

Comments
 (0)