alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

openssh_hpn: use new sources and version (7_5_P1)

Browse source 
Close #23990.
This commit is contained in:
Tristan Helmich 2017-03-17 17:20:48 +01:00 committed by Vladimír Čunát
parent 5b3f807597
commit c395568b7a
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
1 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
pkgs/tools/networking/openssh/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, zlib, openssl, perl, libedit, pkgconfig, pam { stdenv, fetchurl, fetchpatch, zlib, openssl, perl, libedit, pkgconfig, pam, autoreconfHook
, etcDir ? null , etcDir ? null
, hpnSupport ? false , hpnSupport ? false
, withKerberos ? false , withKerberos ? false
@ -12,11 +12,6 @@ assert withGssapiPatches -> withKerberos;
let let
hpnSrc = fetchurl {
url = mirror://sourceforge/hpnssh/openssh-6.6p1-hpnssh14v5.diff.gz;
sha256 = "682b4a6880d224ee0b7447241b684330b731018585f1ba519f46660c10d63950";
};
# **please** update this patch when you update to a new openssh release. # **please** update this patch when you update to a new openssh release.
gssapiSrc = fetchpatch { gssapiSrc = fetchpatch {
name = "openssh-gssapi.patch"; name = "openssh-gssapi.patch";
@ -33,16 +28,16 @@ stdenv.mkDerivation rec {
name = "openssh-${version}"; name = "openssh-${version}";
version = "7.5p1"; version = "7.5p1";
src = fetchurl { src = if hpnSupport then
url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz"; fetchurl {
sha256 = "1w7rb5gbrikxdkp8w7zxnci4549gk4bw1lml01s59w5rzb2y6ilq"; url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-7_5_P1.tar.gz";
}; sha256 = "1hasdcfjl6xf5nbbbvqyyq5v7ad10nywrq89j7naxz9wln58nhnn";
}
prePatch = optionalString hpnSupport else
'' fetchurl {
gunzip -c ${hpnSrc} | patch -p1 url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz";
export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s" sha256 = "1w7rb5gbrikxdkp8w7zxnci4549gk4bw1lml01s59w5rzb2y6ilq";
''; };
patches = patches =
[ [
@ -55,7 +50,8 @@ stdenv.mkDerivation rec {
++ optional withGssapiPatches gssapiSrc; ++ optional withGssapiPatches gssapiSrc;
buildInputs = [ zlib openssl libedit pkgconfig pam ] buildInputs = [ zlib openssl libedit pkgconfig pam ]
++ optional withKerberos kerberos; ++ optional withKerberos kerberos
++ optional hpnSupport autoreconfHook;
# I set --disable-strip because later we strip anyway. And it fails to strip # I set --disable-strip because later we strip anyway. And it fails to strip
# properly when cross building. # properly when cross building.
@ -94,6 +90,5 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.bsd2; license = stdenv.lib.licenses.bsd2;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ eelco aneeshusa ]; maintainers = with maintainers; [ eelco aneeshusa ];
broken = hpnSupport; # probably after 6.7 update
}; };
} }