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

openssh: 8.2p1 -> 8.3p1

Browse Source 
compile openssh_hpn with recent openssl
This commit is contained in:
Pavol Rusnak 2020-06-14 00:40:04 +02:00 committed by Frederik Rietdijk
parent 650b652732
commit f034637a5b
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,12 @@
{ stdenv, fetchurl, fetchpatch, zlib, openssl, libedit, pkgconfig, pam, autoreconfHook { stdenv
, fetchurl
, fetchpatch
, zlib
, openssl
, libedit
, pkgconfig
, pam
, autoreconfHook
, etcDir ? null , etcDir ? null
, hpnSupport ? false , hpnSupport ? false
, withKerberos ? true , withKerberos ? true
@ -6,33 +14,35 @@
, kerberos , kerberos
, libfido2 , libfido2
, withFIDO ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isMusl , withFIDO ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isMusl
, linkOpenssl? true , linkOpenssl ? true
}: }:
let let
version = "8.3p1";
# **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.2p1-1/debian/patches/gssapi.patch"; url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%25${version}-1/debian/patches/gssapi.patch";
sha256 = "081gryqkfr5zr4f5m4v0piq1sxz06sb38z5lqxccgpivql7pa8d8"; sha256 = "0j22ccg6msyi88mpsb6x0il5cg8v2b7qdah57ninbwx5isyld80l";
}; };
in in
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "openssh"; pname = "openssh";
version = if hpnSupport then "8.1p1" else "8.2p1"; inherit version;
src = if hpnSupport then src = if hpnSupport then
fetchurl { fetchurl {
url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-8_1_P1.tar.gz"; url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-${replaceStrings [ "." "p" ] [ "_" "_P" ] version}.tar.gz";
sha256 = "1xiv28df9c15h44fv1i93fq8rvkyapjj9vj985ndnw3xk1nvqjyd"; sha256 = "0lwr7xzhy8m4y0vzi1a78ddhag3qp6cba0c37mnhivbhb67dkywp";
} }
else else
fetchurl { fetchurl {
url = "mirror://openbsd/OpenSSH/portable/${pname}-${version}.tar.gz"; url = "mirror://openbsd/OpenSSH/portable/${pname}-${version}.tar.gz";
sha256 = "0wg6ckzvvklbzznijxkk28fb8dnwyjd0w30ra0afwv6gwr8m34j3"; sha256 = "1cl74ghi9y21dc3f4xa0qamb7dhwacbynh1ks9syprrg8zhgpgpj";
}; };
patches = patches =
@ -99,8 +109,9 @@ stdenv.mkDerivation rec {
]; ];
meta = { meta = {
homepage = "http://www.openssh.com/";
description = "An implementation of the SSH protocol"; description = "An implementation of the SSH protocol";
homepage = "https://www.openssh.com/";
changelog = "https://www.openssh.com/releasenotes.html";
license = stdenv.lib.licenses.bsd2; license = stdenv.lib.licenses.bsd2;
platforms = platforms.unix ++ platforms.windows; platforms = platforms.unix ++ platforms.windows;
maintainers = with maintainers; [ eelco aneeshusa ]; maintainers = with maintainers; [ eelco aneeshusa ];

3
pkgs/top-level/all-packages.nix
View File

@ -5786,9 +5786,6 @@ in
openssh_hpn = pkgs.appendToName "with-hpn" (openssh.override { openssh_hpn = pkgs.appendToName "with-hpn" (openssh.override {
hpnSupport = true; hpnSupport = true;
# the hpn patchset does not yet support openssl>1.0.2
# https://github.com/rapier1/openssh-portable/issues/14
openssl = openssl_1_0_2;
}); });
openssh_gssapi = pkgs.appendToName "with-gssapi" (openssh.override { openssh_gssapi = pkgs.appendToName "with-gssapi" (openssh.override {