Skip to content

Commit 891bf6f

Browse files
ncdcncdc
committed
UPSTREAM: <carry>: [CVE-2023-39325] .: bump golang.org/x/net to v0.17.0
Signed-off-by: Andy Goldstein <[email protected]>
1 parent 6981c04 commit 891bf6f

File tree

282 files changed

+24638
-8191
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

282 files changed

+24638
-8191
lines changed

‎go.mod‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,12 @@ require (
8282
go.opentelemetry.io/otel/trace v0.20.0
8383
go.opentelemetry.io/proto/otlp v0.7.0
8484
go.uber.org/zap v1.19.0
85-
golang.org/x/crypto v0.0.0-20220214200702-86341886e292
86-
golang.org/x/net v0.8.0
85+
golang.org/x/crypto v0.14.0
86+
golang.org/x/net v0.17.0
8787
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5
8888
golang.org/x/sync v0.1.0
89-
golang.org/x/sys v0.6.0
90-
golang.org/x/term v0.6.0
89+
golang.org/x/sys v0.13.0
90+
golang.org/x/term v0.13.0
9191
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8
9292
golang.org/x/tools v0.6.0
9393
gonum.org/v1/gonum v0.6.2
@@ -250,7 +250,7 @@ require (
250250
go.uber.org/goleak v1.2.0 // indirect
251251
go.uber.org/multierr v1.6.0 // indirect
252252
golang.org/x/mod v0.8.0 // indirect
253-
golang.org/x/text v0.8.0 // indirect
253+
golang.org/x/text v0.13.0 // indirect
254254
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
255255
google.golang.org/appengine v1.6.7 // indirect
256256
gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect
@@ -572,18 +572,18 @@ replace (
572572
go.uber.org/multierr => go.uber.org/multierr v1.6.0
573573
go.uber.org/zap => go.uber.org/zap v1.19.0
574574
golang.org/x/arch => golang.org/x/arch v0.0.0-20180920145803-b19384d3c130
575-
golang.org/x/crypto => golang.org/x/crypto v0.0.0-20220214200702-86341886e292
575+
golang.org/x/crypto => golang.org/x/crypto v0.14.0
576576
golang.org/x/exp => golang.org/x/exp v0.0.0-20210220032938-85be41e4509f
577577
golang.org/x/image => golang.org/x/image v0.0.0-20190802002840-cff245a6509b
578578
golang.org/x/lint => golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5
579579
golang.org/x/mobile => golang.org/x/mobile v0.0.0-20201217150744-e6ae53a27f4f
580580
golang.org/x/mod => golang.org/x/mod v0.8.0
581-
golang.org/x/net => golang.org/x/net v0.8.0
581+
golang.org/x/net => golang.org/x/net v0.17.0
582582
golang.org/x/oauth2 => golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8
583583
golang.org/x/sync => golang.org/x/sync v0.1.0
584-
golang.org/x/sys => golang.org/x/sys v0.6.0
585-
golang.org/x/term => golang.org/x/term v0.6.0
586-
golang.org/x/text => golang.org/x/text v0.8.0
584+
golang.org/x/sys => golang.org/x/sys v0.13.0
585+
golang.org/x/term => golang.org/x/term v0.13.0
586+
golang.org/x/text => golang.org/x/text v0.13.0
587587
golang.org/x/time => golang.org/x/time v0.0.0-20220210224613-90d013bbcef8
588588
golang.org/x/tools => golang.org/x/tools v0.6.0
589589
golang.org/x/xerrors => golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1

‎go.sum‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -515,27 +515,27 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i
515515
go.uber.org/zap v1.19.0 h1:mZQZefskPPCMIBCSEH0v2/iUqqLrYtaeqwD6FUGUnFE=
516516
go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI=
517517
golang.org/x/arch v0.0.0-20180920145803-b19384d3c130/go.mod h1:cYlCBUl1MsqxdiKgmc4uh7TxZfWSFLOGSRR090WDxt8=
518-
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 h1:f+lwQ+GtmgoY+A2YaQxlSOnDjXcQ7ZRLWOHbC6HtRqE=
519-
golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
518+
golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
519+
golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
520520
golang.org/x/exp v0.0.0-20210220032938-85be41e4509f h1:GrkO5AtFUU9U/1f5ctbIBXtBGeSJbWwIYfIsTcFMaX4=
521521
golang.org/x/exp v0.0.0-20210220032938-85be41e4509f/go.mod h1:I6l2HNBLBZEcrOoCpyKLdY2lHoRZ8lI4x60KMCQDft4=
522522
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
523523
golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
524524
golang.org/x/mobile v0.0.0-20201217150744-e6ae53a27f4f/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4=
525525
golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
526526
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
527-
golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
528-
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
527+
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
528+
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
529529
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 h1:RerP+noqYHUQ8CMRcPlC2nvTa4dcBIjegkuWdcUDuqg=
530530
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
531531
golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
532532
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
533-
golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
534-
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
535-
golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw=
536-
golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
537-
golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
538-
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
533+
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
534+
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
535+
golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
536+
golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
537+
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
538+
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
539539
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44=
540540
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
541541
golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=

‎staging/src/k8s.io/api/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ require (
2121
github.com/modern-go/reflect2 v1.0.2 // indirect
2222
github.com/pmezard/go-difflib v1.0.0 // indirect
2323
github.com/spf13/pflag v1.0.5 // indirect
24-
golang.org/x/net v0.8.0 // indirect
25-
golang.org/x/text v0.8.0 // indirect
24+
golang.org/x/net v0.17.0 // indirect
25+
golang.org/x/text v0.13.0 // indirect
2626
google.golang.org/protobuf v1.27.1 // indirect
2727
gopkg.in/inf.v0 v0.9.1 // indirect
2828
gopkg.in/yaml.v2 v2.4.0 // indirect

‎staging/src/k8s.io/api/go.sum‎

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

‎staging/src/k8s.io/apiextensions-apiserver/go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,14 @@ require (
107107
go.uber.org/atomic v1.7.0 // indirect
108108
go.uber.org/multierr v1.6.0 // indirect
109109
go.uber.org/zap v1.19.0 // indirect
110-
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
110+
golang.org/x/crypto v0.14.0 // indirect
111111
golang.org/x/mod v0.8.0 // indirect
112-
golang.org/x/net v0.8.0 // indirect
112+
golang.org/x/net v0.17.0 // indirect
113113
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
114114
golang.org/x/sync v0.1.0 // indirect
115-
golang.org/x/sys v0.6.0 // indirect
116-
golang.org/x/term v0.6.0 // indirect
117-
golang.org/x/text v0.8.0 // indirect
115+
golang.org/x/sys v0.13.0 // indirect
116+
golang.org/x/term v0.13.0 // indirect
117+
golang.org/x/text v0.13.0 // indirect
118118
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
119119
golang.org/x/tools v0.6.0 // indirect
120120
google.golang.org/appengine v1.6.7 // indirect

‎staging/src/k8s.io/apiextensions-apiserver/go.sum‎

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

‎staging/src/k8s.io/apimachinery/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ require (
1919
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f
2020
github.com/spf13/pflag v1.0.5
2121
github.com/stretchr/testify v1.8.0
22-
golang.org/x/net v0.8.0
22+
golang.org/x/net v0.17.0
2323
gopkg.in/inf.v0 v0.9.1
2424
k8s.io/klog/v2 v2.60.1
2525
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42
@@ -41,7 +41,7 @@ require (
4141
github.com/onsi/gomega v1.10.1 // indirect
4242
github.com/pkg/errors v0.9.1 // indirect
4343
github.com/pmezard/go-difflib v1.0.0 // indirect
44-
golang.org/x/text v0.8.0 // indirect
44+
golang.org/x/text v0.13.0 // indirect
4545
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
4646
google.golang.org/protobuf v1.27.1 // indirect
4747
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect

‎staging/src/k8s.io/apimachinery/go.sum‎

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

‎staging/src/k8s.io/apiserver/go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ require (
3333
go.opentelemetry.io/otel/trace v0.20.0
3434
go.uber.org/atomic v1.7.0
3535
go.uber.org/zap v1.19.0
36-
golang.org/x/crypto v0.0.0-20220214200702-86341886e292
37-
golang.org/x/net v0.8.0
36+
golang.org/x/crypto v0.14.0
37+
golang.org/x/net v0.17.0
3838
golang.org/x/sync v0.1.0
39-
golang.org/x/sys v0.6.0
39+
golang.org/x/sys v0.13.0
4040
google.golang.org/grpc v1.40.0
4141
gopkg.in/natefinch/lumberjack.v2 v2.0.0
4242
gopkg.in/square/go-jose.v2 v2.2.2
@@ -106,8 +106,8 @@ require (
106106
go.opentelemetry.io/proto/otlp v0.7.0 // indirect
107107
go.uber.org/multierr v1.6.0 // indirect
108108
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
109-
golang.org/x/term v0.6.0 // indirect
110-
golang.org/x/text v0.8.0 // indirect
109+
golang.org/x/term v0.13.0 // indirect
110+
golang.org/x/text v0.13.0 // indirect
111111
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
112112
google.golang.org/appengine v1.6.7 // indirect
113113
google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 // indirect

0 commit comments

Comments
 (0)