JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

openssh: 8.1p1 -> 8.2p1

Browse Source 
https://www.openssh.com/txt/release-8.2

add libfido2 to enable hardware tokens support added in this release
This commit is contained in:
Pavol Rusnak 2020-02-15 20:51:49 +01:00 committed by Frederik Rietdijk
parent 5d33637dd9
commit 44864b292f
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/tools/networking/openssh/default.nix
View File

@ -4,6 +4,8 @@
, withKerberos ? true , withKerberos ? true
, withGssapiPatches ? false , withGssapiPatches ? false
, kerberos , kerberos
, libfido2
, withFIDO ? stdenv.hostPlatform.isUnix
, linkOpenssl? true , linkOpenssl? true
}: }:
@ -12,15 +14,15 @@ let
# **please** update this patch when you update to a new openssh release. # **please** update this patch when you update to a new openssh release.
gssapiPatch = fetchpatch { gssapiPatch = fetchpatch {
name = "openssh-gssapi.patch"; name = "openssh-gssapi.patch";
url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%258.1p1-2/debian/patches/gssapi.patch"; url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%258.2p1-1/debian/patches/gssapi.patch";
sha256 = "0zfxx46a5lpjp317z354yyswa2wvmb1pp5p0nxsbhsrzw94jvxsj"; sha256 = "081gryqkfr5zr4f5m4v0piq1sxz06sb38z5lqxccgpivql7pa8d8";
}; };
in in
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "openssh"; pname = "openssh";
version = if hpnSupport then "7.8p1" else "8.1p1"; version = if hpnSupport then "7.8p1" else "8.2p1";
src = if hpnSupport then src = if hpnSupport then
fetchurl { fetchurl {
@ -30,7 +32,7 @@ stdenv.mkDerivation rec {
else else
fetchurl { fetchurl {
url = "mirror://openbsd/OpenSSH/portable/${pname}-${version}.tar.gz"; url = "mirror://openbsd/OpenSSH/portable/${pname}-${version}.tar.gz";
sha256 = "1zwk3g57gb13br206k6jdhgnp6y1nibwswzraqspbl1m73pxpx82"; sha256 = "0wg6ckzvvklbzznijxkk28fb8dnwyjd0w30ra0afwv6gwr8m34j3";
}; };
patches = patches =
@ -61,6 +63,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ] ++ optional (hpnSupport || withGssapiPatches) autoreconfHook; nativeBuildInputs = [ pkgconfig ] ++ optional (hpnSupport || withGssapiPatches) autoreconfHook;
buildInputs = [ zlib openssl libedit pam ] buildInputs = [ zlib openssl libedit pam ]
++ optional withFIDO libfido2
++ optional withKerberos kerberos; ++ optional withKerberos kerberos;
preConfigure = '' preConfigure = ''
@ -80,6 +83,7 @@ stdenv.mkDerivation rec {
"--disable-strip" "--disable-strip"
(if pam != null then "--with-pam" else "--without-pam") (if pam != null then "--with-pam" else "--without-pam")
] ++ optional (etcDir != null) "--sysconfdir=${etcDir}" ] ++ optional (etcDir != null) "--sysconfdir=${etcDir}"
++ optional withFIDO "--with-security-key-builtin=yes"
++ optional withKerberos (assert kerberos != null; "--with-kerberos5=${kerberos}") ++ optional withKerberos (assert kerberos != null; "--with-kerberos5=${kerberos}")
++ optional stdenv.isDarwin "--disable-libutil" ++ optional stdenv.isDarwin "--disable-libutil"
++ optional (!linkOpenssl) "--without-openssl"; ++ optional (!linkOpenssl) "--without-openssl";