diff --git a/cmd/derper/depaware.txt b/cmd/derper/depaware.txt index 00c38dbe8..3a1ca6a8d 100644 --- a/cmd/derper/depaware.txt +++ b/cmd/derper/depaware.txt @@ -180,6 +180,7 @@ tailscale.com/cmd/derper dependencies: (generated by github.com/tailscale/depawa bytes from bufio+ compress/flate from compress/gzip+ compress/gzip from internal/profile+ + L compress/zlib from debug/elf container/list from crypto/tls+ context from crypto/tls+ crypto from crypto/ecdsa+ @@ -203,6 +204,8 @@ tailscale.com/cmd/derper dependencies: (generated by github.com/tailscale/depawa crypto/tls from golang.org/x/crypto/acme+ crypto/x509 from crypto/tls+ crypto/x509/pkix from crypto/x509+ + L debug/dwarf from debug/elf + L debug/elf from golang.org/x/sys/unix embed from crypto/internal/nistec+ encoding from encoding/json+ encoding/asn1 from crypto/x509+ @@ -218,6 +221,7 @@ tailscale.com/cmd/derper dependencies: (generated by github.com/tailscale/depawa fmt from compress/flate+ go/token from google.golang.org/protobuf/internal/strs hash from crypto+ + L hash/adler32 from compress/zlib hash/crc32 from compress/gzip+ hash/fnv from google.golang.org/protobuf/internal/detrand hash/maphash from go4.org/mem diff --git a/cmd/tailscale/depaware.txt b/cmd/tailscale/depaware.txt index 8e2401d1d..3b5eb15b4 100644 --- a/cmd/tailscale/depaware.txt +++ b/cmd/tailscale/depaware.txt @@ -177,7 +177,7 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep bytes from bufio+ compress/flate from compress/gzip+ compress/gzip from net/http - compress/zlib from image/png + compress/zlib from image/png+ container/list from crypto/tls+ context from crypto/tls+ crypto from crypto/ecdsa+ @@ -202,6 +202,8 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep crypto/x509 from crypto/tls+ crypto/x509/pkix from crypto/x509+ database/sql/driver from github.com/google/uuid + L debug/dwarf from debug/elf + L debug/elf from golang.org/x/sys/unix embed from tailscale.com/cmd/tailscale/cli+ encoding from encoding/json+ encoding/asn1 from crypto/x509+ diff --git a/cmd/tailscaled/depaware.txt b/cmd/tailscaled/depaware.txt index b66faf36f..615d23eef 100644 --- a/cmd/tailscaled/depaware.txt +++ b/cmd/tailscaled/depaware.txt @@ -398,6 +398,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de bytes from bufio+ compress/flate from compress/gzip+ compress/gzip from golang.org/x/net/http2+ + L compress/zlib from debug/elf container/heap from gvisor.dev/gvisor/pkg/tcpip/transport/tcp container/list from crypto/tls+ context from crypto/tls+ @@ -422,6 +423,8 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de crypto/tls from github.com/tcnksm/go-httpstat+ crypto/x509 from crypto/tls+ crypto/x509/pkix from crypto/x509+ + L debug/dwarf from debug/elf + L debug/elf from golang.org/x/sys/unix embed from tailscale.com+ encoding from encoding/json+ encoding/asn1 from crypto/x509+ @@ -437,7 +440,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de flag from net/http/httptest+ fmt from compress/flate+ hash from crypto+ - hash/adler32 from tailscale.com/ipn/ipnlocal + hash/adler32 from tailscale.com/ipn/ipnlocal+ hash/crc32 from compress/gzip+ hash/fnv from tailscale.com/wgengine/magicsock+ hash/maphash from go4.org/mem diff --git a/go.mod b/go.mod index 505afa8e0..2d99a6125 100644 --- a/go.mod +++ b/go.mod @@ -79,7 +79,7 @@ require ( golang.org/x/net v0.10.0 golang.org/x/oauth2 v0.7.0 golang.org/x/sync v0.2.0 - golang.org/x/sys v0.8.0 + golang.org/x/sys v0.8.1-0.20230609144347-5059a07aa46a golang.org/x/term v0.8.0 golang.org/x/time v0.3.0 golang.org/x/tools v0.9.1 diff --git a/go.sum b/go.sum index ae43c8741..10eaa3632 100644 --- a/go.sum +++ b/go.sum @@ -1432,8 +1432,8 @@ golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.4.1-0.20230131160137-e7d7f63158de/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.1-0.20230609144347-5059a07aa46a h1:qMsju+PNttu/NMbq8bQ9waDdxgJMu9QNoUDuhnBaYt0= +golang.org/x/sys v0.8.1-0.20230609144347-5059a07aa46a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= diff --git a/logtail/filch/filch_unix.go b/logtail/filch/filch_unix.go index b782cabf9..34cce59b4 100644 --- a/logtail/filch/filch_unix.go +++ b/logtail/filch/filch_unix.go @@ -1,7 +1,7 @@ // Copyright (c) Tailscale Inc & AUTHORS // SPDX-License-Identifier: BSD-3-Clause -//go:build !windows && !js +//go:build !windows && !wasm package filch diff --git a/logtail/filch/filch_js.go b/logtail/filch/filch_wasm.go similarity index 100% rename from logtail/filch/filch_js.go rename to logtail/filch/filch_wasm.go diff --git a/paths/paths_unix.go b/paths/paths_unix.go index e4e743476..a8e22e7b6 100644 --- a/paths/paths_unix.go +++ b/paths/paths_unix.go @@ -1,7 +1,7 @@ // Copyright (c) Tailscale Inc & AUTHORS // SPDX-License-Identifier: BSD-3-Clause -//go:build !windows && !js +//go:build !windows && !js && !wasip1 package paths diff --git a/paths/paths_js.go b/paths/paths_wasm.go similarity index 100% rename from paths/paths_js.go rename to paths/paths_wasm.go diff --git a/types/logger/rusage_stub.go b/types/logger/rusage_stub.go index 8f6ad5c9d..5aba2066b 100644 --- a/types/logger/rusage_stub.go +++ b/types/logger/rusage_stub.go @@ -1,7 +1,7 @@ // Copyright (c) Tailscale Inc & AUTHORS // SPDX-License-Identifier: BSD-3-Clause -//go:build windows || js +//go:build windows || js || wasip1 package logger diff --git a/types/logger/rusage_syscall.go b/types/logger/rusage_syscall.go index f02825f2f..6378521b6 100644 --- a/types/logger/rusage_syscall.go +++ b/types/logger/rusage_syscall.go @@ -1,7 +1,7 @@ // Copyright (c) Tailscale Inc & AUTHORS // SPDX-License-Identifier: BSD-3-Clause -//go:build !windows && !js +//go:build !windows && !js && !wasip1 package logger