Skip to content

Update to latest Gentoo, drop outdated patches - #4359

Merged
t-lo merged 1 commit into
mainfrom
t-lo/update-gentoo-remove-stale-patches
Nov 5, 2026
Merged

t-lo merged 1 commit into
mainfrom
t-lo/update-gentoo-remove-stale-patches

Conversation

@t-lo

@t-lo t-lo commented Nov 5, 2026 •

Copy link
Copy Markdown
Member

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 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.

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.
Copilot AI balanced review requested due to automatic review settings November 5, 2026 08:13

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔵 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 uniq read-overrun and unexpand heap-overflow patches.
  • Removes the Python tarfile security 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
t-lo marked this pull request as ready for review November 5, 2026 09:15
@t-lo
t-lo requested a review from a team as a code owner November 5, 2026 09:15
@t-lo

t-lo commented Nov 5, 2026

Copy link
Copy Markdown
Member Author

Image builds successfully (local build), PR is ready for review.

@tormath1 tormath1 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM - always nice to see some downstream patches leaving the boat.

@t-lo
t-lo merged commit 722cc28 into main Nov 5, 2026
1 of 3 checks passed
@t-lo
t-lo deleted the t-lo/update-gentoo-remove-stale-patches branch November 5, 2026 09:38
@github-project-automation github-project-automation Bot moved this from ✅ Testing / in Review to Implemented in Flatcar tactical, release planning, and roadmap Nov 5, 2026

This branch is waiting to be deployed

1 waiting deployment
development — 25d6478d Waiting Nov 5, 2026 by t-lo via Wait for approval #6073
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

Development

Successfully merging this pull request may close these issues.

3 participants