Skip to content

fix: bump pyasn1 for CVE-2026-59885 (backport #6330) - #6333

Merged
cdoern merged 2 commits into
release-1.0.xfrom
mergify/bp/release-1.0.x/pr-6330
Jul 24, 2026
Merged

fix: bump pyasn1 for CVE-2026-59885 (backport #6330)#6333
cdoern merged 2 commits into
release-1.0.xfrom
mergify/bp/release-1.0.x/pr-6330

Conversation

@mergify

@mergify mergify Bot commented Jul 21, 2026

Copy link
Copy Markdown
Contributor

bump to >=0.6.4 for CVE-2026-59885 as outlined in GHSA-8ppf-4f7h-5ppj


This is an automatic backport of pull request #6330 done by Mergify.

bump to >=0.6.4 for CVE-2026-59885 as outlined in GHSA-8ppf-4f7h-5ppj

Signed-off-by: Charlie Doern <cdoern@redhat.com>
(cherry picked from commit d6e9242)

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

mergify Bot commented Jul 21, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of d6e9242 has failed:

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

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

Mergify committed unresolved conflict markers when cherry-picking the
pyasn1 bump. Keep the release branch dependency pins and apply only the
intended pyasn1>=0.6.4 change, then re-sync uv.lock.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015FwHCHkuggaiyjB1fGhaBd
Signed-off-by: Charlie Doern <cdoern@redhat.com>
@cdoern
cdoern merged commit 7fd564d into release-1.0.x Jul 24, 2026
36 checks passed
@cdoern
cdoern deleted the mergify/bp/release-1.0.x/pr-6330 branch July 24, 2026 14:39
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