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

Merge pull request #12079 from benley/ssh-gssapi

Browse Source 
openssh: Add gssapi patch used by other major distros
This commit is contained in:
Peter Simons
2016-01-06 20:04:09 +01:00
parent 476847c40a 67f4c2a779
commit 4e50af7e63
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/networking/openssh/default.nix
+9 -2
View File
@@ -1,7 +1,8 @@
{ stdenv, fetchurl, zlib, openssl, perl, libedit, pkgconfig, pam { stdenv, fetchurl, fetchpatch, zlib, openssl, perl, libedit, pkgconfig, pam
, etcDir ? null , etcDir ? null
, hpnSupport ? false , hpnSupport ? false
, withKerberos ? false , withKerberos ? false
, withGssapiPatches ? withKerberos
, kerberos , kerberos
}: }:
@@ -14,6 +15,11 @@ let
sha256 = "682b4a6880d224ee0b7447241b684330b731018585f1ba519f46660c10d63950"; sha256 = "682b4a6880d224ee0b7447241b684330b731018585f1ba519f46660c10d63950";
}; };
gssapiSrc = fetchpatch {
url = "http://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian/patches/gssapi.patch?h=debian/6.9p1-3";
sha256 = "03zlgkb3a1igj20kn8cz55ggaxg65h6f0kg20m39m0wsb94qjdb1";
};
in in
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@@ -30,7 +36,8 @@ stdenv.mkDerivation rec {
export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s" export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s"
''; '';
patches = [ ./locale_archive.patch ./openssh-6.9p1-security-7.0.patch]; patches = [ ./locale_archive.patch ./openssh-6.9p1-security-7.0.patch ]
++ optional withGssapiPatches gssapiSrc;
buildInputs = [ zlib openssl libedit pkgconfig pam ] buildInputs = [ zlib openssl libedit pkgconfig pam ]
++ optional withKerberos [ kerberos ]; ++ optional withKerberos [ kerberos ];