[AUTO-CHERRYPICK] [AutoPR- Security] Patch flannel for CVE-2026-73500 [HIGH] - branch 3.0-dev - #18493
Open
azurelinux-ci-jwt-app[bot] wants to merge 4 commits into
Open
Conversation
(cherry picked from commit 1127304)
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
Author
Auto Cherry-Pick SPEC Validation Summary
|
| Source (fasttrack) | Target (3.0-dev) | Resolved | |
|---|---|---|---|
| Version | 0.24.2 | 0.24.2 | None |
| Release | 30 | 30 | None |
| Patches | 10 | 9 | 14 |
| Conflict | Yes |
- Version-release None-None is not higher than Source 0.24.2-30
- Version-release None-None is not higher than Target 0.24.2-30
- Patch line found after BuildRequires/Requires: Patch6: CVE-2026-32241.patch
- Directive present in both Source and Target was dropped: BuildRequires: gcc
- Directive present in both Source and Target was dropped: BuildRequires: glibc-devel
- Directive present in both Source and Target was dropped: BuildRequires: golang < 1.25
- Directive present in both Source and Target was dropped: BuildRequires: kernel-headers
- Directive present in both Source and Target was dropped: Source0: https://github.com/flannel-io/%{name}/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
- Directive present in both Source and Target was dropped: Source1: %{name}-%{version}-vendor.tar.gz
12 tasks
The AI conflict resolver corrupted the spec: deleted Version/Release from the preamble, relocated %changelog into the header, and duplicated Patch6-9 into %files. Rebuilt from the canonical fasttrack/3.0 spec (Release 30 + CVE-2026-73500 at Patch9) and re-sequenced the 3.0-dev glibc rebuild bump on top as 0.24.2-31.
Follow-up to the spec rebuild: the 3.0-dev '-30' glibc rebuild bump also raised glibc-static from 2.38-20 to 2.38-21. Keep the higher requirement alongside the re-sequenced 0.24.2-31 changelog entry.
Collaborator
|
The auto cherry-pick garbled Manually repaired by rebuilding from the canonical
Result: preamble intact, patches |
jslobodzian
marked this pull request as ready for review
August 19, 2026 20:05
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
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.
This is an auto-generated pull request to cherry-pick commit 1127304 to 3.0-dev. Original PR: #18455
In case of no merge conflicts, the PR is merged without approval because it's an automated cherry-pick of an already approved PR.
In case of merge conflicts, an AI-based conflict resolver will attempt to resolve conflicts and might make mistakes. The reviewer must check AI's work before approving.