Skip to content

Commit 0f105e8

Browse files
offbyonewillnorris
authored andcommitted
Update caddy-tailscale version to 1.62
- bumps the golang version to 1.22.0 as well, incidentally - the gvisor version in go.mod is the @go branch version, so it _should_ build Signed-off-by: Chris Rose <offline@offby1.net>
1 parent 07491c5 commit 0f105e8

2 files changed

Lines changed: 261 additions & 254 deletions

File tree

go.mod

Lines changed: 72 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,81 @@
11
module github.com/tailscale/caddy-tailscale
22

3-
go 1.21
3+
go 1.22.0
4+
5+
toolchain go1.22.1
46

57
require (
68
github.com/caddyserver/caddy/v2 v2.7.3
7-
go.uber.org/zap v1.25.0
8-
tailscale.com v1.1.1-0.20230810153433-3d56cafd7d23
9+
go.uber.org/zap v1.26.0
10+
tailscale.com v1.62.0
911
)
1012

1113
require (
12-
filippo.io/edwards25519 v1.0.0 // indirect
14+
filippo.io/edwards25519 v1.1.0 // indirect
1315
github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect
1416
github.com/Masterminds/goutils v1.1.1 // indirect
1517
github.com/Masterminds/semver/v3 v3.2.1 // indirect
1618
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
1719
github.com/Microsoft/go-winio v0.6.1 // indirect
1820
github.com/akutz/memconn v0.1.0 // indirect
19-
github.com/alexbrainman/sspi v0.0.0-20210105120005-909beea2cc74 // indirect
21+
github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa // indirect
2022
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
2123
github.com/aryann/difflib v0.0.0-20210328193216-ff5ff6dc229b // indirect
22-
github.com/aws/aws-sdk-go-v2 v1.18.0 // indirect
23-
github.com/aws/aws-sdk-go-v2/config v1.18.22 // indirect
24-
github.com/aws/aws-sdk-go-v2/credentials v1.13.21 // indirect
25-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.3 // indirect
26-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33 // indirect
27-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27 // indirect
28-
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.34 // indirect
29-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.27 // indirect
30-
github.com/aws/aws-sdk-go-v2/service/ssm v1.36.3 // indirect
31-
github.com/aws/aws-sdk-go-v2/service/sso v1.12.9 // indirect
32-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.9 // indirect
33-
github.com/aws/aws-sdk-go-v2/service/sts v1.18.10 // indirect
34-
github.com/aws/smithy-go v1.13.5 // indirect
24+
github.com/aws/aws-sdk-go-v2 v1.24.1 // indirect
25+
github.com/aws/aws-sdk-go-v2/config v1.26.5 // indirect
26+
github.com/aws/aws-sdk-go-v2/credentials v1.16.16 // indirect
27+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.11 // indirect
28+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.10 // indirect
29+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.10 // indirect
30+
github.com/aws/aws-sdk-go-v2/internal/ini v1.7.2 // indirect
31+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4 // indirect
32+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.10 // indirect
33+
github.com/aws/aws-sdk-go-v2/service/ssm v1.44.7 // indirect
34+
github.com/aws/aws-sdk-go-v2/service/sso v1.18.7 // indirect
35+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.7 // indirect
36+
github.com/aws/aws-sdk-go-v2/service/sts v1.26.7 // indirect
37+
github.com/aws/smithy-go v1.19.0 // indirect
3538
github.com/beorn7/perks v1.0.1 // indirect
3639
github.com/caddyserver/certmagic v0.19.1 // indirect
3740
github.com/cespare/xxhash v1.1.0 // indirect
3841
github.com/cespare/xxhash/v2 v2.2.0 // indirect
3942
github.com/chzyer/readline v1.5.1 // indirect
40-
github.com/coreos/go-iptables v0.6.0 // indirect
41-
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
42-
github.com/dblohm7/wingoes v0.0.0-20230803162905-5c6286bb8c6e // indirect
43+
github.com/coreos/go-iptables v0.7.0 // indirect
44+
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
45+
github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
46+
github.com/dblohm7/wingoes v0.0.0-20240119213807-a09d6be7affa // indirect
4347
github.com/dgraph-io/badger v1.6.2 // indirect
4448
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
4549
github.com/dgraph-io/ristretto v0.1.0 // indirect
4650
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
51+
github.com/digitalocean/go-smbios v0.0.0-20180907143718-390a4f403a8e // indirect
4752
github.com/dustin/go-humanize v1.0.1 // indirect
48-
github.com/fxamacker/cbor/v2 v2.4.0 // indirect
53+
github.com/fxamacker/cbor/v2 v2.5.0 // indirect
4954
github.com/go-kit/kit v0.10.0 // indirect
5055
github.com/go-logfmt/logfmt v0.5.1 // indirect
51-
github.com/go-ole/go-ole v1.2.6 // indirect
56+
github.com/go-ole/go-ole v1.3.0 // indirect
5257
github.com/go-sql-driver/mysql v1.7.0 // indirect
5358
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
54-
github.com/godbus/dbus/v5 v5.1.0 // indirect
59+
github.com/godbus/dbus/v5 v5.1.1-0.20230522191255-76236955d466 // indirect
5560
github.com/golang/glog v1.1.0 // indirect
5661
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
57-
github.com/golang/mock v1.6.0 // indirect
62+
github.com/golang/mock v1.7.0-rc.1 // indirect
5863
github.com/golang/protobuf v1.5.3 // indirect
5964
github.com/golang/snappy v0.0.4 // indirect
6065
github.com/google/btree v1.1.2 // indirect
6166
github.com/google/cel-go v0.15.1 // indirect
62-
github.com/google/go-cmp v0.5.9 // indirect
67+
github.com/google/go-cmp v0.6.0 // indirect
6368
github.com/google/nftables v0.1.1-0.20230115205135-9aa6fdf5a28c // indirect
6469
github.com/google/pprof v0.0.0-20230808223545-4887780b67fb // indirect
65-
github.com/google/uuid v1.3.0 // indirect
66-
github.com/hdevalence/ed25519consensus v0.1.0 // indirect
70+
github.com/google/uuid v1.5.0 // indirect
71+
github.com/gorilla/csrf v1.7.2 // indirect
72+
github.com/gorilla/securecookie v1.1.2 // indirect
73+
github.com/hdevalence/ed25519consensus v0.2.0 // indirect
6774
github.com/huandu/xstrings v1.4.0 // indirect
6875
github.com/illarion/gonotify v1.0.1 // indirect
6976
github.com/imdario/mergo v0.3.16 // indirect
7077
github.com/inconshreveable/mousetrap v1.1.0 // indirect
71-
github.com/insomniacslk/dhcp v0.0.0-20230407062729-974c6f05fe16 // indirect
78+
github.com/insomniacslk/dhcp v0.0.0-20231206064809-8c70d406f6d2 // indirect
7279
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
7380
github.com/jackc/pgconn v1.14.0 // indirect
7481
github.com/jackc/pgio v1.0.0 // indirect
@@ -79,56 +86,60 @@ require (
7986
github.com/jackc/pgx/v4 v4.18.0 // indirect
8087
github.com/jmespath/go-jmespath v0.4.0 // indirect
8188
github.com/josharian/native v1.1.1-0.20230202152459-5c7d0dd6ab86 // indirect
82-
github.com/jsimonetti/rtnetlink v1.3.2 // indirect
83-
github.com/klauspost/compress v1.16.7 // indirect
89+
github.com/jsimonetti/rtnetlink v1.4.0 // indirect
90+
github.com/klauspost/compress v1.17.4 // indirect
8491
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
8592
github.com/kortschak/wol v0.0.0-20200729010619-da482cc4850a // indirect
8693
github.com/libdns/libdns v0.2.1 // indirect
8794
github.com/manifoldco/promptui v0.9.0 // indirect
8895
github.com/mastercactapus/proxyprotocol v0.0.4 // indirect
8996
github.com/mattn/go-colorable v0.1.13 // indirect
90-
github.com/mattn/go-isatty v0.0.18 // indirect
91-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
97+
github.com/mattn/go-isatty v0.0.20 // indirect
9298
github.com/mdlayher/genetlink v1.3.2 // indirect
9399
github.com/mdlayher/netlink v1.7.2 // indirect
94100
github.com/mdlayher/sdnotify v1.0.0 // indirect
95-
github.com/mdlayher/socket v0.4.1 // indirect
101+
github.com/mdlayher/socket v0.5.0 // indirect
96102
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
97103
github.com/mholt/acmez v1.2.0 // indirect
98104
github.com/micromdm/scep/v2 v2.1.0 // indirect
99-
github.com/miekg/dns v1.1.55 // indirect
105+
github.com/miekg/dns v1.1.58 // indirect
100106
github.com/mitchellh/copystructure v1.2.0 // indirect
101107
github.com/mitchellh/go-ps v1.0.0 // indirect
102108
github.com/mitchellh/reflectwalk v1.0.2 // indirect
103109
github.com/onsi/ginkgo/v2 v2.11.0 // indirect
104-
github.com/pierrec/lz4/v4 v4.1.17 // indirect
110+
github.com/pierrec/lz4/v4 v4.1.21 // indirect
105111
github.com/pkg/errors v0.9.1 // indirect
106-
github.com/prometheus/client_golang v1.16.0 // indirect
107-
github.com/prometheus/client_model v0.4.0 // indirect
108-
github.com/prometheus/common v0.44.0 // indirect
109-
github.com/prometheus/procfs v0.11.1 // indirect
112+
github.com/prometheus/client_golang v1.18.0 // indirect
113+
github.com/prometheus/client_model v0.5.0 // indirect
114+
github.com/prometheus/common v0.46.0 // indirect
115+
github.com/prometheus/procfs v0.12.0 // indirect
110116
github.com/quic-go/qpack v0.4.0 // indirect
111117
github.com/quic-go/qtls-go1-20 v0.3.2 // indirect
112118
github.com/quic-go/quic-go v0.37.4 // indirect
113119
github.com/russross/blackfriday/v2 v2.1.0 // indirect
114-
github.com/shopspring/decimal v1.2.0 // indirect
120+
github.com/safchain/ethtool v0.3.0 // indirect
121+
github.com/shopspring/decimal v1.3.1 // indirect
115122
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
116123
github.com/slackhq/nebula v1.6.1 // indirect
117124
github.com/smallstep/certificates v0.24.3-rc.5 // indirect
118125
github.com/smallstep/nosql v0.6.0 // indirect
119126
github.com/smallstep/truststore v0.12.1 // indirect
120-
github.com/spf13/cast v1.5.1 // indirect
121-
github.com/spf13/cobra v1.7.0 // indirect
127+
github.com/spf13/cast v1.6.0 // indirect
128+
github.com/spf13/cobra v1.8.0 // indirect
122129
github.com/spf13/pflag v1.0.5 // indirect
123130
github.com/stoewer/go-strcase v1.2.0 // indirect
124-
github.com/tailscale/certstore v0.1.1-0.20220316223106-78d6e1c49d8d // indirect
125-
github.com/tailscale/golang-x-crypto v0.0.0-20230713185742-f0b76a10a08e // indirect
131+
github.com/tailscale/certstore v0.1.1-0.20231202035212-d3fa0460f47e // indirect
132+
github.com/tailscale/go-winio v0.0.0-20231025203758-c4f33415bf55 // indirect
133+
github.com/tailscale/golang-x-crypto v0.0.0-20240108194725-7ce1f622c780 // indirect
126134
github.com/tailscale/goupnp v1.0.1-0.20210804011211-c64d0f06ea05 // indirect
135+
github.com/tailscale/hujson v0.0.0-20221223112325-20486734a56a // indirect
127136
github.com/tailscale/netlink v1.1.1-0.20211101221916-cabfb018fe85 // indirect
137+
github.com/tailscale/peercred v0.0.0-20240214030740-b535050b2aa4 // indirect
128138
github.com/tailscale/tscert v0.0.0-20230509043813-4e9cb4f2b4ad // indirect
129-
github.com/tailscale/wireguard-go v0.0.0-20230710185534-bb2c8f22eccf // indirect
139+
github.com/tailscale/web-client-prebuilt v0.0.0-20240226180453-5db17b287bf1 // indirect
140+
github.com/tailscale/wireguard-go v0.0.0-20231121184858-cc193a0b3272 // indirect
130141
github.com/tcnksm/go-httpstat v0.2.0 // indirect
131-
github.com/u-root/uio v0.0.0-20230305220412-3e8cd9d6bf63 // indirect
142+
github.com/u-root/uio v0.0.0-20240118234441-a3c409a6018e // indirect
132143
github.com/urfave/cli v1.22.14 // indirect
133144
github.com/vishvananda/netlink v1.2.1-beta.2 // indirect
134145
github.com/vishvananda/netns v0.0.4 // indirect
@@ -141,27 +152,26 @@ require (
141152
go.step.sm/linkedca v0.20.0 // indirect
142153
go.uber.org/multierr v1.11.0 // indirect
143154
go4.org/mem v0.0.0-20220726221520-4f986261bf13 // indirect
144-
go4.org/netipx v0.0.0-20230728180743-ad4cb58a6516 // indirect
145-
golang.org/x/crypto v0.12.0 // indirect
146-
golang.org/x/exp v0.0.0-20230810033253-352e893a4cad // indirect
147-
golang.org/x/mod v0.12.0 // indirect
148-
golang.org/x/net v0.14.0 // indirect
149-
golang.org/x/sync v0.3.0 // indirect
150-
golang.org/x/sys v0.11.0 // indirect
151-
golang.org/x/term v0.11.0 // indirect
152-
golang.org/x/text v0.12.0 // indirect
153-
golang.org/x/time v0.3.0 // indirect
154-
golang.org/x/tools v0.12.0 // indirect
155+
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
156+
golang.org/x/crypto v0.18.0 // indirect
157+
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect
158+
golang.org/x/mod v0.14.0 // indirect
159+
golang.org/x/net v0.20.0 // indirect
160+
golang.org/x/sync v0.6.0 // indirect
161+
golang.org/x/sys v0.17.0 // indirect
162+
golang.org/x/term v0.16.0 // indirect
163+
golang.org/x/text v0.14.0 // indirect
164+
golang.org/x/time v0.5.0 // indirect
165+
golang.org/x/tools v0.17.0 // indirect
155166
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
156167
golang.zx2c4.com/wireguard/windows v0.5.3 // indirect
157168
google.golang.org/genproto/googleapis/api v0.0.0-20230706204954-ccb25ca9f130 // indirect
158169
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
159170
google.golang.org/grpc v1.56.2 // indirect
160-
google.golang.org/protobuf v1.31.0 // indirect
171+
google.golang.org/protobuf v1.32.0 // indirect
161172
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
162173
gopkg.in/yaml.v3 v3.0.1 // indirect
163-
gvisor.dev/gvisor v0.0.0-20230504175454-7b0a1988a28f // indirect
174+
gvisor.dev/gvisor v0.0.0-20240306221502-ee1e1f6070e3 // indirect
164175
howett.net/plist v1.0.0 // indirect
165-
inet.af/peercred v0.0.0-20210906144145-0893ea02156a // indirect
166-
nhooyr.io/websocket v1.8.7 // indirect
176+
nhooyr.io/websocket v1.8.10 // indirect
167177
)

0 commit comments

Comments
 (0)