Skip to content

fix: bump aiohttp for CVE-2026-69244 (backport #6375) - #6381

Open
mergify[bot] wants to merge 2 commits into
release-0.4.xfrom
mergify/bp/release-0.4.x/pr-6375
Open

fix: bump aiohttp for CVE-2026-69244 (backport #6375)#6381
mergify[bot] wants to merge 2 commits into
release-0.4.xfrom
mergify/bp/release-0.4.x/pr-6375

Conversation

@mergify

@mergify mergify Bot commented Aug 5, 2026

Copy link
Copy Markdown
Contributor

What does this PR do?

see CVE-2026-69244 for more details.

GHSA-cq5v-8q36-5273


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

# What does this PR do?

see CVE-2026-69244 for more details.

GHSA-cq5v-8q36-5273

---------

Signed-off-by: Charlie Doern <cdoern@redhat.com>
Co-authored-by: Matthew Farrellee <matt@cs.wisc.edu>
(cherry picked from commit 4c34ce1)

# Conflicts:
#	pyproject.toml
#	uv.lock
@mergify mergify Bot added the conflicts label Aug 5, 2026
@mergify

mergify Bot commented Aug 5, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of 4c34ce1 has failed:

On branch mergify/bp/release-0.4.x/pr-6375
Your branch is up to date with 'origin/release-0.4.x'.

You are currently cherry-picking commit 4c34ce13.
  (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:   pyproject.toml
	both modified:   uv.lock

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

The automated backport left unresolved conflict markers in pyproject.toml and
uv.lock, which broke TOML parsing and failed every downstream job. The conflict
is resolved in favour of this release branch's own constraint list plus the
single aiohttp>=3.14.3 bump that this backport is for, rather than importing
main's full constraint list, which would pull in unrelated dependency bumps.
The lockfile is regenerated from the resolved pyproject.toml.

Signed-off-by: Charlie Doern <cdoern@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant