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

Fix CVE-2024-1135 (backport #3251) #3257

Merged
merged 2 commits into from May 16, 2024
Merged

Fix CVE-2024-1135 (backport #3251) #3257

merged 2 commits into from May 16, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 10, 2024

What type of PR?

bug-fix

What does this PR do?

Fix CVE-2024-1135

Related issue(s)

Prerequisites

Before we can consider review and merge, please make sure the following list is done and checked.
If an entry in not applicable, you can check it or remove it from the list.

  • In case of feature or enhancement: documentation updated accordingly
  • Unless it's docs or a minor change: add changelog entry file.

This is an automatic backport of pull request #3251 done by [Mergify](https://mergify.com).

(cherry picked from commit 5b5d526)

# Conflicts:
#	core/base/requirements-prod.txt
Copy link
Contributor Author

mergify bot commented May 10, 2024

Cherry-pick of 5b5d526 has failed:

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

You are currently cherry-picking commit 5b5d526d.
  (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)

Changes to be committed:
	new file:   towncrier/newsfragments/3251.bugfix

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   core/base/requirements-prod.txt

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

@mergify mergify bot added the conflicts label May 10, 2024
Copy link
Contributor Author

mergify bot commented May 10, 2024

Thanks for submitting this pull request.
Bors-ng will now build test images. When it succeeds, we will continue to review and test your PR.

bors try

Note: if this build fails, read this.

bors-mailu bot added a commit that referenced this pull request May 10, 2024
@bors-mailu
Copy link
Contributor

bors-mailu bot commented May 10, 2024

try

Build failed:

@nextgens
Copy link
Contributor

bors try

bors-mailu bot added a commit that referenced this pull request May 10, 2024
@bors-mailu
Copy link
Contributor

bors-mailu bot commented May 10, 2024

try

Build succeeded:

Copy link
Contributor Author

mergify bot commented May 16, 2024

bors r+

bors-mailu bot added a commit that referenced this pull request May 16, 2024
3257: Fix CVE-2024-1135 (backport #3251) r=mergify[bot] a=mergify[bot]

## What type of PR?

bug-fix

## What does this PR do?

Fix CVE-2024-1135

### Related issue(s)

## Prerequisites
Before we can consider review and merge, please make sure the following list is done and checked.
If an entry in not applicable, you can check it or remove it from the list.

- [ ] In case of feature or enhancement: documentation updated accordingly
- [x] Unless it's docs or a minor change: add [changelog](https://mailu.io/master/contributors/workflow.html#changelog) entry file.
<hr>This is an automatic backport of pull request #3251 done by [Mergify](https://mergify.com).

Co-authored-by: Florent Daigniere <[email protected]>
Co-authored-by: Florent Daigniere <[email protected]>
@bors-mailu
Copy link
Contributor

bors-mailu bot commented May 16, 2024

Timed out.

@nextgens
Copy link
Contributor

bors r+

@bors-mailu
Copy link
Contributor

bors-mailu bot commented May 16, 2024

Build succeeded:

@bors-mailu bors-mailu bot merged commit a83a973 into 2.0 May 16, 2024
2 checks passed
@mergify mergify bot deleted the mergify/bp/2.0/pr-3251 branch May 16, 2024 15:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants