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

openssh_hpn: 7.8p1 -> 8.1p1

Browse Source 
fix build failure
This commit is contained in:
Pavol Rusnak 2020-02-16 19:27:56 +01:00 committed by Frederik Rietdijk
parent 44864b292f
commit 205f42b142
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,12 +22,12 @@ 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.2p1"; version = if hpnSupport then "8.1p1" else "8.2p1";
src = if hpnSupport then src = if hpnSupport then
fetchurl { fetchurl {
url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-7_8_P1.tar.gz"; url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-8_1_P1.tar.gz";
sha256 = "05q5hxx7fzcgd8a5i0zk4fwvmnz4xqk04j489irnwm7cka7xdqxw"; sha256 = "1xiv28df9c15h44fv1i93fq8rvkyapjj9vj985ndnw3xk1nvqjyd";
} }
else else
fetchurl { fetchurl {
@ -43,15 +43,7 @@ stdenv.mkDerivation rec {
./dont_create_privsep_path.patch ./dont_create_privsep_path.patch
./ssh-keysign.patch ./ssh-keysign.patch
] ++ optional hpnSupport ]
# CVE-2018-20685, can probably be dropped with next version bump
# See https://sintonen.fi/advisories/scp-client-multiple-vulnerabilities.txt
# for details
(fetchpatch {
name = "CVE-2018-20685.patch";
url = https://github.com/openssh/openssh-portable/commit/6010c0303a422a9c5fa8860c061bf7105eb7f8b2.patch;
sha256 = "0q27i9ymr97yb628y44qi4m11hk5qikb1ji1vhvax8hp18lwskds";
})
++ optional withGssapiPatches (assert withKerberos; gssapiPatch); ++ optional withGssapiPatches (assert withKerberos; gssapiPatch);
postPatch = postPatch =
@ -112,6 +104,5 @@ stdenv.mkDerivation rec {
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 ];
broken = hpnSupport;
}; };
} }