Skip to content

Commit 43bc298

Browse files
anik120anik120
committed
d3160ca only changed the stagin directory, and not what is actually being vendor-ed in. This PR modifies the top level go.mod file and ensure the correct version of the package is being vendored in for https://bugzilla.redhat.com/show_bug.cgi?id=2347423
1 parent bb4f142 commit 43bc298

File tree

10 files changed

+43
-42
lines changed

10 files changed

+43
-42
lines changed

‎go.mod

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,15 +184,15 @@ require (
184184
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
185185
go.uber.org/multierr v1.11.0 // indirect
186186
go.uber.org/zap v1.26.0 // indirect
187-
golang.org/x/crypto v0.31.0 // indirect
187+
golang.org/x/crypto v0.32.0 // indirect
188188
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect
189189
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
190190
golang.org/x/mod v0.21.0 // indirect
191191
golang.org/x/net v0.32.0 // indirect
192192
golang.org/x/oauth2 v0.24.0 // indirect
193193
golang.org/x/sync v0.10.0 // indirect
194-
golang.org/x/sys v0.28.0 // indirect
195-
golang.org/x/term v0.27.0 // indirect
194+
golang.org/x/sys v0.29.0 // indirect
195+
golang.org/x/term v0.28.0 // indirect
196196
golang.org/x/text v0.21.0 // indirect
197197
golang.org/x/time v0.8.0 // indirect
198198
golang.org/x/tools v0.26.0 // indirect
@@ -225,6 +225,7 @@ require (
225225
)
226226

227227
replace (
228+
github.com/go-jose/go-jose/v4 => github.com/go-jose/go-jose/v4 v4.0.5 // CVE-2025-27144
228229
// controller runtime
229230
github.com/openshift/api => github.com/openshift/api v0.0.0-20210517065120-b325f58df679
230231
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0 // release-4.5

‎go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1546,8 +1546,8 @@ github.com/go-git/go-git/v5 v5.11.0/go.mod h1:6GFcX2P3NM7FPBfpePbpLd21XxsgdAt+lK
15461546
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
15471547
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
15481548
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
1549-
github.com/go-jose/go-jose/v4 v4.0.4 h1:VsjPI33J0SB9vQM6PLmNjoHqMQNGPiZ0rHL7Ni7Q6/E=
1550-
github.com/go-jose/go-jose/v4 v4.0.4/go.mod h1:NKb5HO1EZccyMpiZNbdUw/14tiXNyUJh188dfnMCAfc=
1549+
github.com/go-jose/go-jose/v4 v4.0.5 h1:M6T8+mKZl/+fNNuFHvGIzDz7BTLQPIounk/b9dw3AaE=
1550+
github.com/go-jose/go-jose/v4 v4.0.5/go.mod h1:s3P1lRrkT8igV8D9OjyL4WRyHvjB6a4JSllnOrmmBOA=
15511551
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
15521552
github.com/go-latex/latex v0.0.0-20210118124228-b3d85cf34e07/go.mod h1:CO1AlKB2CSIqUrmQPqA0gdRIlnLEY0gK5JGjh37zN5U=
15531553
github.com/go-latex/latex v0.0.0-20210823091927-c0d11ff05a81/go.mod h1:SX0U8uGpxhq9o2S/CELCSUxEWWAuoCUcVCQWv7G2OCk=
@@ -2236,8 +2236,8 @@ golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq
22362236
golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
22372237
golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
22382238
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
2239-
golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
2240-
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
2239+
golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
2240+
golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
22412241
golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
22422242
golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
22432243
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -2544,8 +2544,8 @@ golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
25442544
golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
25452545
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
25462546
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
2547-
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
2548-
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
2547+
golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
2548+
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
25492549
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
25502550
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
25512551
golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -2563,8 +2563,8 @@ golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww=
25632563
golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
25642564
golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
25652565
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
2566-
golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
2567-
golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
2566+
golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
2567+
golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
25682568
golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
25692569
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
25702570
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

‎vendor/github.com/go-jose/go-jose/v4/CONTRIBUTING.md

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

‎vendor/github.com/go-jose/go-jose/v4/README.md

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

‎vendor/github.com/go-jose/go-jose/v4/jwe.go

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

‎vendor/github.com/go-jose/go-jose/v4/jwk.go

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

‎vendor/github.com/go-jose/go-jose/v4/jws.go

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

‎vendor/golang.org/x/sys/unix/syscall_dragonfly.go

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

‎vendor/golang.org/x/sys/windows/dll_windows.go

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

‎vendor/modules.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ github.com/go-git/go-git/v5/internal/path_util
296296
github.com/go-git/go-git/v5/plumbing/format/config
297297
github.com/go-git/go-git/v5/plumbing/format/gitignore
298298
github.com/go-git/go-git/v5/utils/ioutil
299-
# github.com/go-jose/go-jose/v4 v4.0.4
299+
# github.com/go-jose/go-jose/v4 v4.0.4 => github.com/go-jose/go-jose/v4 v4.0.5
300300
## explicit; go 1.21
301301
github.com/go-jose/go-jose/v4
302302
github.com/go-jose/go-jose/v4/cipher
@@ -974,7 +974,7 @@ go.uber.org/zap/internal/pool
974974
go.uber.org/zap/internal/stacktrace
975975
go.uber.org/zap/zapcore
976976
go.uber.org/zap/zapgrpc
977-
# golang.org/x/crypto v0.31.0
977+
# golang.org/x/crypto v0.32.0
978978
## explicit; go 1.20
979979
golang.org/x/crypto/cryptobyte
980980
golang.org/x/crypto/cryptobyte/asn1
@@ -1023,14 +1023,14 @@ golang.org/x/oauth2/internal
10231023
golang.org/x/sync/errgroup
10241024
golang.org/x/sync/semaphore
10251025
golang.org/x/sync/singleflight
1026-
# golang.org/x/sys v0.28.0
1026+
# golang.org/x/sys v0.29.0
10271027
## explicit; go 1.18
10281028
golang.org/x/sys/cpu
10291029
golang.org/x/sys/plan9
10301030
golang.org/x/sys/unix
10311031
golang.org/x/sys/windows
10321032
golang.org/x/sys/windows/registry
1033-
# golang.org/x/term v0.27.0
1033+
# golang.org/x/term v0.28.0
10341034
## explicit; go 1.18
10351035
golang.org/x/term
10361036
# golang.org/x/text v0.21.0
@@ -2121,6 +2121,7 @@ sigs.k8s.io/structured-merge-diff/v4/value
21212121
sigs.k8s.io/yaml
21222122
sigs.k8s.io/yaml/goyaml.v2
21232123
# google.golang.org/grpc => google.golang.org/grpc v1.63.2
2124+
# github.com/go-jose/go-jose/v4 => github.com/go-jose/go-jose/v4 v4.0.5
21242125
# github.com/openshift/api => github.com/openshift/api v0.0.0-20210517065120-b325f58df679
21252126
# github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0
21262127
# github.com/operator-framework/api => ./staging/api

0 commit comments

Comments
 (0)