Skip to content

Commit c377ec9

Browse files
stefanbergerstefanberger
authored
Merge pull request #178 from stefanberger/stefanberger/x-net-to-0.36.0
build(deps): bump golang.org/x/net to v0.36.0
2 parents 9dc5987 + fd725bc commit c377ec9

File tree

4 files changed

+55
-98
lines changed

4 files changed

+55
-98
lines changed

‎cmd/go.mod‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/containerd/imgcrypt/cmd
22

3-
go 1.22.0
3+
go 1.23.0
4+
5+
toolchain go1.23.7
46

57
require (
68
github.com/Microsoft/go-winio v0.6.2
@@ -20,7 +22,7 @@ require (
2022
github.com/opencontainers/runtime-spec v1.2.0
2123
github.com/sirupsen/logrus v1.9.3
2224
github.com/urfave/cli/v2 v2.27.5
23-
golang.org/x/sync v0.10.0
25+
golang.org/x/sync v0.11.0
2426
google.golang.org/grpc v1.68.1
2527
)
2628

@@ -75,12 +77,12 @@ require (
7577
go.opentelemetry.io/otel v1.31.0 // indirect
7678
go.opentelemetry.io/otel/metric v1.31.0 // indirect
7779
go.opentelemetry.io/otel/trace v1.31.0 // indirect
78-
golang.org/x/crypto v0.32.0 // indirect
80+
golang.org/x/crypto v0.35.0 // indirect
7981
golang.org/x/exp v0.0.0-20231214170342-aacd6d4b4611 // indirect
80-
golang.org/x/net v0.33.0 // indirect
81-
golang.org/x/sys v0.29.0 // indirect
82-
golang.org/x/term v0.28.0 // indirect
83-
golang.org/x/text v0.21.0 // indirect
82+
golang.org/x/net v0.36.0 // indirect
83+
golang.org/x/sys v0.30.0 // indirect
84+
golang.org/x/term v0.29.0 // indirect
85+
golang.org/x/text v0.22.0 // indirect
8486
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 // indirect
8587
google.golang.org/protobuf v1.35.2 // indirect
8688
gopkg.in/yaml.v3 v3.0.1 // indirect

‎cmd/go.sum‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,8 @@ golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliY
211211
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
212212
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
213213
golang.org/x/crypto v0.30.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
214-
golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
215-
golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
214+
golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
215+
golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
216216
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
217217
golang.org/x/exp v0.0.0-20231214170342-aacd6d4b4611 h1:qCEDpW1G+vcj3Y7Fy52pEM1AWm3abj8WimGYejI3SC4=
218218
golang.org/x/exp v0.0.0-20231214170342-aacd6d4b4611/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
@@ -242,8 +242,8 @@ golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
242242
golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
243243
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
244244
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
245-
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
246-
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
245+
golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA=
246+
golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I=
247247
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
248248
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
249249
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -255,8 +255,9 @@ golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
255255
golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
256256
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
257257
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
258-
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
259258
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
259+
golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
260+
golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
260261
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
261262
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
262263
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -273,8 +274,8 @@ golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
273274
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
274275
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
275276
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
276-
golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
277-
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
277+
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
278+
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
278279
golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
279280
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
280281
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -284,8 +285,8 @@ golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
284285
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
285286
golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
286287
golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
287-
golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
288-
golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
288+
golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
289+
golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
289290
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
290291
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
291292
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
@@ -294,8 +295,9 @@ golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
294295
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
295296
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
296297
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
297-
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
298298
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
299+
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
300+
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
299301
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
300302
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
301303
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=

‎go.mod‎

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
module github.com/containerd/imgcrypt/v2
22

3-
go 1.22.0
3+
go 1.23.0
44

5-
toolchain go1.22.3
5+
toolchain go1.23.7
66

77
require (
8-
github.com/containerd/containerd/v2 v2.0.0
8+
github.com/containerd/containerd/v2 v2.0.4
99
github.com/containerd/errdefs v1.0.0
10-
github.com/containerd/platforms v1.0.0-rc.0
10+
github.com/containerd/platforms v1.0.0-rc.1
1111
github.com/containerd/typeurl/v2 v2.2.3
1212
github.com/containers/ocicrypt v1.2.1
1313
github.com/opencontainers/go-digest v1.0.0
@@ -26,18 +26,16 @@ require (
2626
github.com/containerd/fifo v1.1.0 // indirect
2727
github.com/containerd/log v0.1.0 // indirect
2828
github.com/containerd/plugin v1.0.0 // indirect
29-
github.com/containerd/ttrpc v1.2.6 // indirect
29+
github.com/containerd/ttrpc v1.2.7 // indirect
3030
github.com/distribution/reference v0.6.0 // indirect
3131
github.com/felixge/httpsnoop v1.0.4 // indirect
32-
github.com/fsnotify/fsnotify v1.7.0 // indirect
3332
github.com/go-jose/go-jose/v4 v4.0.4 // indirect
3433
github.com/go-logr/logr v1.4.2 // indirect
3534
github.com/go-logr/stdr v1.2.2 // indirect
3635
github.com/gogo/protobuf v1.3.2 // indirect
3736
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3837
github.com/golang/protobuf v1.5.4 // indirect
3938
github.com/google/go-cmp v0.6.0 // indirect
40-
github.com/hashicorp/errwrap v1.1.0 // indirect
4139
github.com/klauspost/compress v1.17.11 // indirect
4240
github.com/miekg/pkcs11 v1.1.1 // indirect
4341
github.com/moby/locker v1.0.1 // indirect
@@ -47,30 +45,24 @@ require (
4745
github.com/moby/sys/user v0.3.0 // indirect
4846
github.com/moby/sys/userns v0.1.0 // indirect
4947
github.com/opencontainers/runtime-spec v1.2.0 // indirect
50-
github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626 // indirect
5148
github.com/opencontainers/selinux v1.11.1 // indirect
5249
github.com/pkg/errors v0.9.1 // indirect
5350
github.com/sirupsen/logrus v1.9.3 // indirect
5451
github.com/smallstep/pkcs7 v0.1.1 // indirect
5552
github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6 // indirect
56-
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
5753
go.opencensus.io v0.24.0 // indirect
5854
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect
5955
go.opentelemetry.io/otel v1.31.0 // indirect
6056
go.opentelemetry.io/otel/metric v1.31.0 // indirect
6157
go.opentelemetry.io/otel/trace v1.31.0 // indirect
62-
golang.org/x/crypto v0.31.0 // indirect
63-
golang.org/x/mod v0.21.0 // indirect
64-
golang.org/x/net v0.33.0 // indirect
65-
golang.org/x/sync v0.10.0 // indirect
66-
golang.org/x/sys v0.28.0 // indirect
67-
golang.org/x/term v0.27.0 // indirect
68-
golang.org/x/text v0.21.0 // indirect
58+
golang.org/x/crypto v0.35.0 // indirect
59+
golang.org/x/net v0.36.0 // indirect
60+
golang.org/x/sync v0.11.0 // indirect
61+
golang.org/x/sys v0.30.0 // indirect
62+
golang.org/x/term v0.29.0 // indirect
63+
golang.org/x/text v0.22.0 // indirect
6964
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 // indirect
7065
google.golang.org/grpc v1.68.1 // indirect
71-
google.golang.org/protobuf v1.35.1 // indirect
66+
google.golang.org/protobuf v1.35.2 // indirect
7267
gopkg.in/yaml.v3 v3.0.1 // indirect
73-
sigs.k8s.io/yaml v1.4.0 // indirect
74-
tags.cncf.io/container-device-interface v0.8.0 // indirect
75-
tags.cncf.io/container-device-interface/specs-go v0.8.0 // indirect
7668
)

0 commit comments

Comments
 (0)