Skip to content

Commit c796249

Browse files
ThomasK33ThomasK33
authored
chore(go.mod): replace all inet.af domains with tailscale and github ones (#67)
Updates dependencies to use new GitHub-hosted packages. This change migrates from inet.af hosted packages to their GitHub equivalents: - inet.af/peercred -> github.com/tailscale/peercred - inet.af/tcpproxy -> github.com/inetaf/tcpproxy - inet.af/wf -> github.com/tailscale/wf Related to the Taliban seizing the `inet.af` domain. Related Tailscale and `inet.af` issues: - inetaf/tcpproxy#39 - tailscale/wf@6fbb0a6 - inetaf/tcpproxy@3ce5804 - tailscale/peercred@b535050 - Tailscale update PR: https://github.com/tailscale/tailscale/pull/11132/files Change-Id: I41dc1f23cbbc125c9b6dac8559fbb7a387d73800 Signed-off-by: Thomas Kosiewski <tk@coder.com>
2 parents 730c119 + 4134a0b commit c796249

File tree

10 files changed

+21
-22
lines changed

10 files changed

+21
-22
lines changed

‎cmd/sniproxy/sniproxy.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import (
1515
"strings"
1616
"time"
1717

18+
"github.com/inetaf/tcpproxy"
1819
"golang.org/x/net/dns/dnsmessage"
19-
"inet.af/tcpproxy"
2020
"tailscale.com/client/tailscale"
2121
"tailscale.com/hostinfo"
2222
"tailscale.com/net/netutil"

‎cmd/tailscaled/depaware.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,8 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de
145145
github.com/tailscale/goupnp/soap from github.com/tailscale/goupnp+
146146
github.com/tailscale/goupnp/ssdp from github.com/tailscale/goupnp
147147
L 💣 github.com/tailscale/netlink from tailscale.com/wgengine/router+
148+
github.com/tailscale/peercred from tailscale.com/ipn/ipnauth
149+
W 💣 github.com/tailscale/wf from tailscale.com/wf
148150
💣 github.com/tailscale/wireguard-go/conn from github.com/tailscale/wireguard-go/device+
149151
W 💣 github.com/tailscale/wireguard-go/conn/winrio from github.com/tailscale/wireguard-go/conn
150152
💣 github.com/tailscale/wireguard-go/device from tailscale.com/net/tstun+
@@ -206,8 +208,6 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de
206208
gvisor.dev/gvisor/pkg/tcpip/transport/tcpconntrack from gvisor.dev/gvisor/pkg/tcpip/stack
207209
gvisor.dev/gvisor/pkg/tcpip/transport/udp from tailscale.com/net/tstun+
208210
gvisor.dev/gvisor/pkg/waiter from gvisor.dev/gvisor/pkg/context+
209-
inet.af/peercred from tailscale.com/ipn/ipnauth
210-
W 💣 inet.af/wf from tailscale.com/wf
211211
tailscale.com from tailscale.com/version
212212
tailscale.com/atomicfile from tailscale.com/ipn+
213213
LD tailscale.com/chirp from tailscale.com/cmd/tailscaled

‎go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ require (
3838
github.com/hdevalence/ed25519consensus v0.1.0
3939
github.com/iancoleman/strcase v0.2.0
4040
github.com/illarion/gonotify v1.0.1
41+
github.com/inetaf/tcpproxy v0.0.0-20240214030015-3ce58045626c
4142
github.com/insomniacslk/dhcp v0.0.0-20230407062729-974c6f05fe16
4243
github.com/josharian/native v1.1.1-0.20230202152459-5c7d0dd6ab86
4344
github.com/jsimonetti/rtnetlink v1.3.2
@@ -65,6 +66,8 @@ require (
6566
github.com/tailscale/hujson v0.0.0-20221223112325-20486734a56a
6667
github.com/tailscale/mkctr v0.0.0-20220601142259-c0b937af2e89
6768
github.com/tailscale/netlink v1.1.1-0.20211101221916-cabfb018fe85
69+
github.com/tailscale/peercred v0.0.0-20250107143737-35a0c7bd7edc
70+
github.com/tailscale/wf v0.0.0-20240214030419-6fbb0a674ee6
6871
github.com/tailscale/wireguard-go v0.0.0-20230710185534-bb2c8f22eccf
6972
github.com/tc-hib/winres v0.2.0
7073
github.com/tcnksm/go-httpstat v0.2.0
@@ -81,17 +84,14 @@ require (
8184
golang.org/x/net v0.32.0
8285
golang.org/x/oauth2 v0.7.0
8386
golang.org/x/sync v0.10.0
84-
golang.org/x/sys v0.28.0
87+
golang.org/x/sys v0.29.1-0.20250107080300-1c14dcadc3ab
8588
golang.org/x/term v0.27.0
8689
golang.org/x/time v0.5.0
8790
golang.org/x/tools v0.21.1-0.20240531212143-b6235391adb3
8891
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2
8992
golang.zx2c4.com/wireguard/windows v0.5.3
9093
gvisor.dev/gvisor v0.0.0-20240509041132-65b30f7869dc
9194
honnef.co/go/tools v0.5.1
92-
inet.af/peercred v0.0.0-20210906144145-0893ea02156a
93-
inet.af/tcpproxy v0.0.0-20221017015627-91f861402626
94-
inet.af/wf v0.0.0-20221017222439-36129f591884
9595
k8s.io/api v0.27.2
9696
k8s.io/apimachinery v0.27.2
9797
k8s.io/client-go v0.27.2

‎go.sum‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -599,6 +599,8 @@ github.com/imdario/mergo v0.3.15/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+h
599599
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
600600
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
601601
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
602+
github.com/inetaf/tcpproxy v0.0.0-20240214030015-3ce58045626c h1:gYfYE403/nlrGNYj6BEOs9ucLCAGB9gstlSk92DttTg=
603+
github.com/inetaf/tcpproxy v0.0.0-20240214030015-3ce58045626c/go.mod h1:Di7LXRyUcnvAcLicFhtM9/MlZl/TNgRSDHORM2c6CMI=
602604
github.com/insomniacslk/dhcp v0.0.0-20230407062729-974c6f05fe16 h1:+aAGyK41KRn8jbF2Q7PLL0Sxwg6dShGcQSeCC7nZQ8E=
603605
github.com/insomniacslk/dhcp v0.0.0-20230407062729-974c6f05fe16/go.mod h1:IKrnDWs3/Mqq5n0lI+RxA2sB7MvN/vbMBP3ehXg65UI=
604606
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
@@ -1053,6 +1055,10 @@ github.com/tailscale/mkctr v0.0.0-20220601142259-c0b937af2e89 h1:7xU7AFQE83h0wz/
10531055
github.com/tailscale/mkctr v0.0.0-20220601142259-c0b937af2e89/go.mod h1:OGMqrTzDqmJkGumUTtOv44Rp3/4xS+QFbE8Rn0AGlaU=
10541056
github.com/tailscale/netlink v1.1.1-0.20211101221916-cabfb018fe85 h1:zrsUcqrG2uQSPhaUPjUQwozcRdDdSxxqhNgNZ3drZFk=
10551057
github.com/tailscale/netlink v1.1.1-0.20211101221916-cabfb018fe85/go.mod h1:NzVQi3Mleb+qzq8VmcWpSkcSYxXIg0DkI6XDzpVkhJ0=
1058+
github.com/tailscale/peercred v0.0.0-20250107143737-35a0c7bd7edc h1:24heQPtnFR+yfntqhI3oAu9i27nEojcQ4NuBQOo5ZFA=
1059+
github.com/tailscale/peercred v0.0.0-20250107143737-35a0c7bd7edc/go.mod h1:f93CXfllFsO9ZQVq+Zocb1Gp4G5Fz0b0rXHLOzt/Djc=
1060+
github.com/tailscale/wf v0.0.0-20240214030419-6fbb0a674ee6 h1:l10Gi6w9jxvinoiq15g8OToDdASBni4CyJOdHY1Hr8M=
1061+
github.com/tailscale/wf v0.0.0-20240214030419-6fbb0a674ee6/go.mod h1:ZXRML051h7o4OcI0d3AaILDIad/Xw0IkXaHM17dic1Y=
10561062
github.com/tailscale/wireguard-go v0.0.0-20230710185534-bb2c8f22eccf h1:bHQHwIHId353jAF2Lm0cGDjJpse/PYS0I0DTtihL9Ls=
10571063
github.com/tailscale/wireguard-go v0.0.0-20230710185534-bb2c8f22eccf/go.mod h1:QRIcq2+DbdIC5sKh/gcAZhuqu6WT6L6G8/ALPN5wqYw=
10581064
github.com/tc-hib/winres v0.2.0 h1:gly/ivDWGvlhl7ENtEmA7wPQ6dWab1LlLq/DgcZECKE=
@@ -1390,7 +1396,6 @@ golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7w
13901396
golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
13911397
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
13921398
golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
1393-
golang.org/x/sys v0.0.0-20210301091718-77cc2087c03b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
13941399
golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
13951400
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
13961401
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -1419,8 +1424,8 @@ golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
14191424
golang.org/x/sys v0.4.1-0.20230131160137-e7d7f63158de/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
14201425
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
14211426
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1422-
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
1423-
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
1427+
golang.org/x/sys v0.29.1-0.20250107080300-1c14dcadc3ab h1:BMkEEWYOjkvOX7+YKOGbp6jCyQ5pR2j0Ah47p1Vdsx4=
1428+
golang.org/x/sys v0.29.1-0.20250107080300-1c14dcadc3ab/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
14241429
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
14251430
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
14261431
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -1716,12 +1721,6 @@ honnef.co/go/tools v0.5.1 h1:4bH5o3b5ZULQ4UrBmP+63W9r7qIkqJClEA9ko5YKx+I=
17161721
honnef.co/go/tools v0.5.1/go.mod h1:e9irvo83WDG9/irijV44wr3tbhcFeRnfpVlRqVwpzMs=
17171722
howett.net/plist v1.0.0 h1:7CrbWYbPPO/PyNy38b2EB/+gYbjCe2DXBxgtOOZbSQM=
17181723
howett.net/plist v1.0.0/go.mod h1:lqaXoTrLY4hg8tnEzNru53gicrbv7rrk+2xJA/7hw9g=
1719-
inet.af/peercred v0.0.0-20210906144145-0893ea02156a h1:qdkS8Q5/i10xU2ArJMKYhVa1DORzBfYS/qA2UK2jheg=
1720-
inet.af/peercred v0.0.0-20210906144145-0893ea02156a/go.mod h1:FjawnflS/udxX+SvpsMgZfdqx2aykOlkISeAsADi5IU=
1721-
inet.af/tcpproxy v0.0.0-20221017015627-91f861402626 h1:2dMP3Ox/Wh5BiItwOt4jxRsfzkgyBrHzx2nW28Yg6nc=
1722-
inet.af/tcpproxy v0.0.0-20221017015627-91f861402626/go.mod h1:Tojt5kmHpDIR2jMojxzZK2w2ZR7OILODmUo2gaSwjrk=
1723-
inet.af/wf v0.0.0-20221017222439-36129f591884 h1:zg9snq3Cpy50lWuVqDYM7AIRVTtU50y5WXETMFohW/Q=
1724-
inet.af/wf v0.0.0-20221017222439-36129f591884/go.mod h1:bSAQ38BYbY68uwpasXOTZo22dKGy9SNvI6PZFeKomZE=
17251724
k8s.io/api v0.27.2 h1:+H17AJpUMvl+clT+BPnKf0E3ksMAzoBBg7CntpSuADo=
17261725
k8s.io/api v0.27.2/go.mod h1:ENmbocXfBT2ADujUXcBhHV55RIT31IIEvkntP6vZKS4=
17271726
k8s.io/apiextensions-apiserver v0.27.2 h1:iwhyoeS4xj9Y7v8YExhUwbVuBhMr3Q4bd/laClBV6Bo=

‎ipn/ipnauth/ipnauth.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"runtime"
1414
"strconv"
1515

16-
"inet.af/peercred"
16+
"github.com/tailscale/peercred"
1717
"tailscale.com/envknob"
1818
"tailscale.com/ipn"
1919
"tailscale.com/net/netstat"

‎ipn/ipnauth/ipnauth_notwindows.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ package ipnauth
88
import (
99
"net"
1010

11-
"inet.af/peercred"
11+
"github.com/tailscale/peercred"
1212
"tailscale.com/types/logger"
1313
)
1414

‎licenses/android.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,6 @@ Client][]. See also the dependencies in the [Tailscale CLI][].
8383
- [golang.org/x/time/rate](https://pkg.go.dev/golang.org/x/time/rate) ([BSD-3-Clause](https://cs.opensource.google/go/x/time/+/v0.3.0:LICENSE))
8484
- [gvisor.dev/gvisor/pkg](https://pkg.go.dev/gvisor.dev/gvisor/pkg) ([Apache-2.0](https://github.com/google/gvisor/blob/7b0a1988a28f/LICENSE))
8585
- [inet.af/netaddr](https://pkg.go.dev/inet.af/netaddr) ([BSD-3-Clause](https://github.com/inetaf/netaddr/blob/097006376321/LICENSE))
86-
- [inet.af/peercred](https://pkg.go.dev/inet.af/peercred) ([BSD-3-Clause](https://github.com/inetaf/peercred/blob/0893ea02156a/LICENSE))
86+
- [github.com/tailscale/peercred](https://pkg.go.dev/github.com/tailscale/peercred) ([BSD-3-Clause](https://github.com/inetaf/peercred/blob/0893ea02156a/LICENSE))
8787
- [nhooyr.io/websocket](https://pkg.go.dev/nhooyr.io/websocket) ([MIT](https://github.com/nhooyr/websocket/blob/v1.8.7/LICENSE.txt))
8888
- [tailscale.com](https://pkg.go.dev/tailscale.com) ([BSD-3-Clause](https://github.com/tailscale/tailscale/blob/HEAD/LICENSE))

‎licenses/apple.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ and [iOS][]. See also the dependencies in the [Tailscale CLI][].
6969
- [golang.org/x/text](https://pkg.go.dev/golang.org/x/text) ([BSD-3-Clause](https://cs.opensource.google/go/x/text/+/v0.11.0:LICENSE))
7070
- [golang.org/x/time/rate](https://pkg.go.dev/golang.org/x/time/rate) ([BSD-3-Clause](https://cs.opensource.google/go/x/time/+/v0.3.0:LICENSE))
7171
- [gvisor.dev/gvisor/pkg](https://pkg.go.dev/gvisor.dev/gvisor/pkg) ([Apache-2.0](https://github.com/google/gvisor/blob/7b0a1988a28f/LICENSE))
72-
- [inet.af/peercred](https://pkg.go.dev/inet.af/peercred) ([BSD-3-Clause](https://github.com/inetaf/peercred/blob/0893ea02156a/LICENSE))
72+
- [github.com/tailscale/peercred](https://pkg.go.dev/github.com/tailscale/peercred) ([BSD-3-Clause](https://github.com/inetaf/peercred/blob/0893ea02156a/LICENSE))
7373
- [nhooyr.io/websocket](https://pkg.go.dev/nhooyr.io/websocket) ([MIT](https://github.com/nhooyr/websocket/blob/v1.8.7/LICENSE.txt))
7474
- [tailscale.com](https://pkg.go.dev/tailscale.com) ([BSD-3-Clause](https://github.com/tailscale/tailscale/blob/HEAD/LICENSE))
7575

‎licenses/tailscale.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ Some packages may only be included on certain architectures or operating systems
9494
- [golang.zx2c4.com/wireguard/windows/tunnel/winipcfg](https://pkg.go.dev/golang.zx2c4.com/wireguard/windows/tunnel/winipcfg) ([MIT](https://git.zx2c4.com/wireguard-windows/tree/COPYING?h=v0.5.3))
9595
- [gopkg.in/yaml.v2](https://pkg.go.dev/gopkg.in/yaml.v2) ([Apache-2.0](https://github.com/go-yaml/yaml/blob/v2.4.0/LICENSE))
9696
- [gvisor.dev/gvisor/pkg](https://pkg.go.dev/gvisor.dev/gvisor/pkg) ([Apache-2.0](https://github.com/google/gvisor/blob/7b0a1988a28f/LICENSE))
97-
- [inet.af/peercred](https://pkg.go.dev/inet.af/peercred) ([BSD-3-Clause](https://github.com/inetaf/peercred/blob/0893ea02156a/LICENSE))
97+
- [github.com/tailscale/peercred](https://pkg.go.dev/github.com/tailscale/peercred) ([BSD-3-Clause](https://github.com/inetaf/peercred/blob/0893ea02156a/LICENSE))
9898
- [inet.af/wf](https://pkg.go.dev/inet.af/wf) ([BSD-3-Clause](https://github.com/inetaf/wf/blob/36129f591884/LICENSE))
9999
- [k8s.io/client-go/util/homedir](https://pkg.go.dev/k8s.io/client-go/util/homedir) ([Apache-2.0](https://github.com/kubernetes/client-go/blob/v0.27.2/LICENSE))
100100
- [nhooyr.io/websocket](https://pkg.go.dev/nhooyr.io/websocket) ([MIT](https://github.com/nhooyr/websocket/blob/v1.8.7/LICENSE.txt))

‎wf/firewall.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"net/netip"
1111
"os"
1212

13+
"github.com/tailscale/wf"
1314
"golang.org/x/sys/windows"
14-
"inet.af/wf"
1515
"tailscale.com/net/netaddr"
1616
)
1717

0 commit comments

Comments
 (0)