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

OpenSSH: add Kerberos support

Browse Source
This commit is contained in:
Christophe Raffalli 2013-06-15 06:40:01 +00:00 committed by Evgeny Egorochkin
parent 77cf3c3e0c
commit 2c089337e7
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,12 @@
{ stdenv, fetchurl, zlib, openssl, perl, libedit, pkgconfig, pam { stdenv, fetchurl, zlib, openssl, perl, libedit, pkgconfig, pam
, etcDir ? null , etcDir ? null
, hpnSupport ? false , hpnSupport ? false
, withKerberos ? false
, kerberos
}: }:
assert withKerberos -> kerberos != null;
let let
hpnSrc = fetchurl { hpnSrc = fetchurl {
@ -28,7 +32,9 @@ stdenv.mkDerivation rec {
patches = [ ./locale_archive.patch ]; patches = [ ./locale_archive.patch ];
buildInputs = [ zlib openssl libedit pkgconfig pam ]; buildInputs = [ zlib openssl libedit pkgconfig pam ] ++
(if withKerberos then [ kerberos ] else [])
;
# 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.
@ -39,6 +45,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"}
${if etcDir != null then "--sysconfdir=${etcDir}" else ""} ${if etcDir != null then "--sysconfdir=${etcDir}" else ""}
${if withKerberos then "--with-kerberos5=${kerberos}" else ""}
''; '';
preConfigure = preConfigure =

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

@ -1420,11 +1420,14 @@ let
opensc_dnie_wrapper = callPackage ../tools/security/opensc-dnie-wrapper { }; opensc_dnie_wrapper = callPackage ../tools/security/opensc-dnie-wrapper { };
openssh = callPackage ../tools/networking/openssh { openssh =
hpnSupport = false; callPackage ../tools/networking/openssh {
etcDir = "/etc/ssh"; hpnSupport = false;
pam = if stdenv.isLinux then pam else null; withKerberos = false;
}; etcDir = "/etc/ssh";
pam = if stdenv.isLinux then pam else null;
};
openssh_with_kerberos = lowPrio (pkgs.appendToName "with-kerberos" (openssh.override { withKerberos = true; }));
opensp = callPackage ../tools/text/sgml/opensp { }; opensp = callPackage ../tools/text/sgml/opensp { };