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

[20.03] openssh: 8.1p1 -> 8.2p1 #81368

Merged
merged 5 commits into from Mar 1, 2020

Conversation

prusnak
Copy link
Member

@prusnak prusnak commented Feb 29, 2020

Motivation for this change

Backport of OpenSSH 8.2p1 as discussed in #80196

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

mmahut and others added 5 commits February 29, 2020 14:02
(cherry picked from commit 852d2bc)
* pass IOKit to libfido2
* Add a patch so that cmake uses lld flags when linking
* Upgrade from 1.3.0 to 1.3.1 (based off NixOS#80781)
* Specify CMAKE_INSTALL_LIBDIR so that the demo binaries link
  correctly on macOS and libfido2.pc specifies correct arguments

(cherry picked from commit 099359a)
https://www.openssh.com/txt/release-8.2

add libfido2 to enable hardware tokens support added in this release

(cherry picked from commit 44864b2)
fix build failure

(cherry picked from commit 205f42b)
@worldofpeace
Copy link
Contributor

Aren't we going to have to forward port 10c787d if we merge this? Is that on staging?

@prusnak
Copy link
Member Author

prusnak commented Mar 1, 2020

@worldofpeace I don't think that's necessary. There will be a new version of libfido2 in April and I'll do a version update to unstable dropping the patch at that point. However, if you think it's worth changing in unstable now, I'll send another PR.

@worldofpeace
Copy link
Contributor

worldofpeace commented Mar 1, 2020

@prusnak This probably should have been suggested on the initial PR #81368 (comment). It's vanity divergence, so it would be best if it was like this on master also, or dropped here completely. I believe it's still in staging.

@prusnak
Copy link
Member Author

prusnak commented Mar 1, 2020

I dropped the 10c787d from this PR.

@worldofpeace
Copy link
Contributor

Thanks @prusnak, I hope you're ok with this @flokli. This should just be a straightforward backport. No real reason to diverge things unless there's a good reason.

@worldofpeace worldofpeace changed the base branch from release-20.03 to staging-20.03 March 1, 2020 15:11
@worldofpeace worldofpeace merged commit a57de92 into NixOS:staging-20.03 Mar 1, 2020
@prusnak prusnak deleted the openssh-20.03 branch March 1, 2020 15:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants