Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[8.16](backport #42152) security: bump golang.org/x/net to v0.33.0 #42164

Open
wants to merge 5 commits into
base: 8.16
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 26, 2024

Proposed commit message

Update golang.org/x/net Go module to v0.33.0 to remediate GHSA-w32m-9786-jp63.

Checklist

  • [ ] My code follows the style guidelines of this project
  • [ ] I have commented my code, particularly in hard-to-understand areas
  • [ ] I have made corresponding changes to the documentation
  • [ ] I have made corresponding change to the default configuration files
  • [ ] I have added tests that prove my fix is effective or that my feature works
  • [ ] I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.
    This is an automatic backport of pull request security: bump golang.org/x/net to v0.33.0 #42152 done by Mergify.

* security: bump golang.org/x/net to v0.33.0

Fixes GHSA-w32m-9786-jp63

* make notice

(cherry picked from commit 83f5f4e)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Dec 26, 2024
@mergify mergify bot requested a review from a team as a code owner December 26, 2024 19:01
Copy link
Contributor Author

mergify bot commented Dec 26, 2024

Cherry-pick of 83f5f4e has failed:

On branch mergify/bp/8.16/pr-42152
Your branch is up to date with 'origin/8.16'.

You are currently cherry-picking commit 83f5f4e8d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Dec 26, 2024
@botelastic
Copy link

botelastic bot commented Dec 26, 2024

This pull request doesn't have a Team:<team> label.

Copy link
Contributor Author

mergify bot commented Dec 30, 2024

This pull request has not been merged yet. Could you please review and merge it @andrzej-stencel? 🙏

@jlind23 jlind23 enabled auto-merge (squash) December 30, 2024 14:33
Copy link
Contributor Author

mergify bot commented Jan 6, 2025

This pull request has not been merged yet. Could you please review and merge it @andrzej-stencel? 🙏

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants