Skip to content

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

Merged
worldofpeace merged 5 commits intoNixOS:staging-20.03from
prusnak:openssh-20.03
Mar 1, 2020
Merged

[20.03] openssh: 8.1p1 -> 8.2p1#81368
worldofpeace merged 5 commits intoNixOS:staging-20.03from
prusnak:openssh-20.03

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
@mmahut @prusnak
libfido2: linux build only
7f3cf25 
(cherry picked from commit 852d2bc)
@mmahut @prusnak
libfido2: evaluate systemd only on Linux
f06ab62 
(cherry picked from commit 1ea0a24)
@artemist @prusnak
libfido2: add macOS support
9ea34a5 
* 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)
@prusnak
openssh: 8.1p1 -> 8.2p1
f93be3e 
https://www.openssh.com/txt/release-8.2

add libfido2 to enable hardware tokens support added in this release

(cherry picked from commit 44864b2)
@prusnak
openssh_hpn: 7.8p1 -> 8.1p1
811013c 
fix build failure

(cherry picked from commit 205f42b)
This was referenced Feb 29, 2020
Merged
Closed
@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Feb 29, 2020
@ofborg ofborg bot requested review from dtzWill and edolstra February 29, 2020 13:13
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. labels Feb 29, 2020
flokli
flokli reviewed Mar 1, 2020
View reviewed changes
@worldofpeace
Copy link
Contributor

worldofpeace commented Mar 1, 2020

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 •
edited
Loading

@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 •
edited
Loading

@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

worldofpeace commented Mar 1, 2020

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

Reviewers

@flokli flokli flokli left review comments

@edolstra edolstra Awaiting requested review from edolstra

@dtzWill dtzWill Awaiting requested review from dtzWill

Assignees

No one assigned

Labels

8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@prusnak @worldofpeace @flokli @mmahut @artemist