Repository navigation
Update to latest Gentoo, drop outdated patches - #4359
Merged
Merged
Conversation
This change drops user patches from - coreos-overlay/coreos/user-patches/sys-apps/coreutils (only apply to coreutils 9.11 and older) - coreos-overlay/coreos/user-patches/dev-lang/python (only apply to python 3.13.16 and older) It also updates the Gentoo submodule to latest upstream, which (among other changes) stabilises coreutils 9.12. Without removing our custom patches, that upgrade would cause build breakage.
Contributor
There was a problem hiding this comment.
🔵 Needs a closer look
The missing Gentoo gitlink update and unavailable ebuilds require human verification that the pinned coreutils and Python versions include all three removed security fixes and affected builds succeed.
No open issues 🎉
What changed in this PR
Removes obsolete Flatcar user patches to avoid build failures with the coreutils 9.12 and Python 3.13.18 upgrades described in the PR.
Changes:
- Removes the coreutils
uniqread-overrun andunexpandheap-overflow patches. - Removes the Python
tarfilesecurity patch. - Deletes the accompanying patch-retirement documentation.
| File | Description |
|---|---|
sdk_container/src/third_party/coreos-overlay/coreos/user-patches/sys-apps/coreutils/README.md |
Removes retirement notes for the coreutils patches. |
sdk_container/src/third_party/coreos-overlay/coreos/user-patches/sys-apps/coreutils/0002-unexpand-fix-heap-overflow.patch |
Removes the obsolete unexpand heap-overflow fix. |
sdk_container/src/third_party/coreos-overlay/coreos/user-patches/sys-apps/coreutils/0001-uniq-fix-read-overrun-with-w.patch |
Removes the obsolete uniq -w read-overrun fix. |
sdk_container/src/third_party/coreos-overlay/coreos/user-patches/dev-lang/python/README.md |
Removes retirement notes for the Python patch. |
sdk_container/src/third_party/coreos-overlay/coreos/user-patches/dev-lang/python/0001-cve-2026-19672.patch |
Removes the obsolete tarfile extraction security fix. |
Review effort: Balanced
t-lo
marked this pull request as ready for review
November 5, 2026 09:15
Member
Author
|
Image builds successfully (local build), PR is ready for review. |
tormath1
approved these changes
Nov 5, 2026
tormath1
left a comment
Contributor
There was a problem hiding this comment.
LGTM - always nice to see some downstream patches leaving the boat.
This branch is waiting to be deployed
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 change drops user patches from
It also updates the Gentoo submodule to latest upstream, which (among other changes) stabilises coreutils 9.12 and python-3.13.18. Without removing our custom patches, that upgrade would cause build breakage.
This change is required to fix the gentoo update CI job (#4348).
Hopefully, we can drop most of our custom coreos-overlay/coreos/user-patches/ patches in the long term.