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

Update net-misc/openssh #1551

Merged
merged 3 commits into from
Jan 9, 2024
Merged

Update net-misc/openssh #1551

merged 3 commits into from
Jan 9, 2024

Conversation

krnowak
Copy link
Member

@krnowak krnowak commented Jan 5, 2024

Closes flatcar/Flatcar#1301

CI: http://jenkins.infra.kinvolk.io:8080/job/container/job/packages_all_arches/3227/cldsv/

Reworked the insertion of Include clause a bit:

  • Dropped the check for absolute path. Technically the check was incorrect as relative paths are valid here - they would be interpreted as relative to ~/.ssh or /etc/ssh.
  • Paste include directory verbatim into the config file. The EPREFIX stuff is now passed as a parameter explicitly.

Other changes in the ebuild come from upstream:

--

  • changelog
  • image diff

It's from Gentoo commit c0d5daf5c2e4b927127c6e92a78e870fa6ef5d61.
None of these modifications are Flatcar-specific. We are trying to
upstream them in gentoo/gentoo#31615. When
they reach Gentoo, we can move net-misc/openssh to portage-stable.

An exception from above paragraph is marking the ebuild as stable on
amd64 and arm64.
@krnowak krnowak added the main label Jan 5, 2024
@krnowak krnowak marked this pull request as ready for review January 8, 2024 16:33
@krnowak krnowak requested a review from a team January 8, 2024 16:33
@krnowak krnowak merged commit eed6e16 into main Jan 9, 2024
1 of 5 checks passed
@krnowak krnowak deleted the krnowak/openssh-update branch January 9, 2024 09:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

update: net-misc/openssh (Terrapin)
2 participants