[release/1.7] vendor: golang.org/x/[email protected]#10204
Merged
dmcgowan merged 5 commits intocontainerd:release/1.7from May 13, 2024
Merged
Conversation
|
Hi @austinvazquez. Thanks for your PR. I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
austinvazquez
force-pushed
the
vendor-x-crypto-v0.17.0-to-release-1.7
branch
2 times, most recently
from
20d26f9 to
e06cde2
Compare
austinvazquez
changed the title
partial cherry-pick of 9937909 which updated golang.org/x/sys from v0.13.0 to v0.15.0 full diff: golang/sys@v0.13.0...v0.15.0 Signed-off-by: Kohei Tokunaga <[email protected]> (cherry picked from commit 9937909) Signed-off-by: Austin Vazquez <[email protected]>
parital cherry-pick of 7842161 which updated golang.org/x/term from v0.13.0 to v0.15.0 and golang.org/x/text from v0.13.0 to v0.14.0. full diff: golang/term@v0.13.0...v0.15.0 full diff: golang/text@v0.13.0...v0.14.0 Signed-off-by: Bryant Biggs <[email protected]> (cherry picked from commit 7842161) Signed-off-by: Austin Vazquez <[email protected]>
partial cherry-pick of dfb1753 full diff: golang/sys@v0.15.0...v0.16.0 Signed-off-by: dependabot[bot] <[email protected]> (cherry picked from commit dfb1753) Signed-off-by: Austin Vazquez <[email protected]>
partial cherry-pick of 5e3e12d which updates golang.org/x/term from v0.15.0 to v0.16.0 full diff: golang/term@v0.15.0...v0.16.0 Signed-off-by: dependabot[bot] <[email protected]> (cherry picked from commit 5e3e12d) Signed-off-by: Austin Vazquez <[email protected]>
imgcrypt and transitively golang.org/x/crypto was removed in d69ae81 in mainline to resolve a circular dependency issue, so there would not be an update to cherry-pick from mainline. full diff: golang/crypto@v0.14.0...v0.18.0 Resolves warnings for https://pkg.go.dev/vuln/GO-2023-2402 Signed-off-by: Austin Vazquez <[email protected]>
austinvazquez
force-pushed
the
vendor-x-crypto-v0.17.0-to-release-1.7
branch
from
e06cde2 to
4b52104
Compare
dmcgowan
approved these changes
May 10, 2024
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Issue
Follow-up to #9707 which vendored golang.org/x/[email protected] on release/1.6 to resolve warnings for https://pkg.go.dev/vuln/GO-2023-2402.
imgcrypt (and transitively golang.org/x/crypto) has been temporarily removed from main (see d69ae81) so there wouldn't be a commit to cherry-pick from main.
Description
This change vendors golang.org/x/[email protected] for the 1.7 release branch to resolve warnings for https://pkg.go.dev/vuln/GO-2023-2402.
Note: golang.org/x/[email protected] is the minimum recommended version but release/1.6 vendors v0.18.0 so it would be good to align here as well.
Signed-of-by: Austin Vazquez [email protected]