Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

app-arch/xz-utils: Sync with Gentoo (revert to known-good) #1816

Merged
merged 1 commit into from
Apr 2, 2024

Conversation

pothos
Copy link
Member

@pothos pothos commented Apr 2, 2024

The 5.6 release contained a backdoor for SSH. The 5.6 release wasn't
used in Flatcar and so far it seems that the backdoor wouldn't even be
compiled for Gentoo. However, we so far don't know whether the other
patches are malicious.

Revert to 5.4.2 as last known-good release (like Gentoo did).
Note that the Flatcar main branch had a copy of the 5.6 ebuild but was
not using it. Flatcar Alpha was on 5.4.6-r1, so before the backdoor but
the malicious contributor did other changes of unclear impact part of
this release. Similarly, Beta is on 5.4.5 and Stable is on 5.4.3. These
should get downgraded, too.

How to use

Backport to Stable, just to be sure

Testing done

Copy link
Contributor

@ader1990 ader1990 left a comment

Choose a reason for hiding this comment

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

https://gitweb.gentoo.org/repo/gentoo.git/log/app-arch/xz-utils -> I think a portage stable update will catch these two commits upstream and there will be no need for a separate commit.

@pothos
Copy link
Member Author

pothos commented Apr 2, 2024

https://gitweb.gentoo.org/repo/gentoo.git/log/app-arch/xz-utils -> I think a portage stable update will catch these two commits upstream and there will be no need for a separate commit.

The sync works on a file base for now at least and we sync the whole directories but not commits.

Copy link

github-actions bot commented Apr 2, 2024

Build action triggered: https://github.com/flatcar/scripts/actions/runs/8534708530

@ader1990
Copy link
Contributor

ader1990 commented Apr 2, 2024

https://gitweb.gentoo.org/repo/gentoo.git/log/app-arch/xz-utils -> I think a portage stable update will catch these two commits upstream and there will be no need for a separate commit.

The sync works on a file base for now at least and we sync the whole directories but not commits.

I was referring to the fact that the portage stable sync will contain the relevant file fixes.

@krnowak
Copy link
Member

krnowak commented Apr 2, 2024

I did similar change in my weekly updates branch. We downgrade to 5.4.2 which is the last version released by the previous maintainer.

@pothos pothos requested a review from a team April 2, 2024 11:57
@pothos
Copy link
Member Author

pothos commented Apr 2, 2024

I want to backport this to Alpha

@pothos pothos changed the title app-arch/xz-utils: Remove unused but malicious ebuild versions app-arch/xz-utils: Sync with Gentoo (revert to known-good) Apr 2, 2024
@pothos
Copy link
Member Author

pothos commented Apr 2, 2024

I want to backport this to Alpha

Updated now that we can backport to Stable and downgrade everything to 5.4.2 as last known-good release like Gentoo did.

@pothos
Copy link
Member Author

pothos commented Apr 2, 2024

Should we also rebuild the SDK? Doing so would need a note for the next person tagging the releases and starting the builds.

The 5.6 release contained a backdoor for SSH. The 5.6 release wasn't
used in Flatcar and so far it seems that the backdoor wouldn't even be
compiled for Gentoo. However, we so far don't know whether the other
patches are malicious.

Revert to 5.4.2 as last known-good release (like Gentoo did).
Note that the Flatcar main branch had a copy of the 5.6 ebuild but was
not using it. Flatcar Alpha was on 5.4.6-r1, so before the backdoor but
the malicious contributor did other changes of unclear impact part of
this release. Similarly, Beta is on 5.4.5 and Stable is on 5.4.3. These
should get downgraded, too.
@pothos pothos merged commit afa363d into main Apr 2, 2024
@pothos pothos deleted the kai/remove-xz-5.6 branch April 2, 2024 14:03
pothos added a commit that referenced this pull request Apr 2, 2024
app-arch/xz-utils: Sync with Gentoo (revert to known-good)
pothos added a commit that referenced this pull request Apr 2, 2024
app-arch/xz-utils: Sync with Gentoo (revert to known-good)
pothos added a commit that referenced this pull request Apr 2, 2024
app-arch/xz-utils: Sync with Gentoo (revert to known-good)
@krnowak
Copy link
Member

krnowak commented Apr 2, 2024

Should we also rebuild the SDK? Doing so would need a note for the next person tagging the releases and starting the builds.

I'd do it. Maybe the note can be added somewhere in release planning board?

@ader1990
Copy link
Contributor

ader1990 commented Apr 3, 2024

@krnowak
Copy link
Member

krnowak commented Apr 3, 2024

FYI ->Gentoo upstream blacklisted xz-utils 5.4.3 this way-> https://github.com/flatcar/scripts/pull/1788/files#diff-0e9c768a2a09eafc2d45cecaf99e8f68735e67877e7986ee387dab561be0f86dR25.

I did the similar in the weekly updates PR: https://github.com/flatcar/scripts/pull/1788/files#diff-0e9c768a2a09eafc2d45cecaf99e8f68735e67877e7986ee387dab561be0f86d

This will be dropped though, on the follow-up weekly updates, when we inherit the mask from Gentoo.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants