nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-01 15:11:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

openssh: Build with Kerberos by default

Browse Source 
This reverts commit 09696e32c390c232ec7ac506df6457fb93c1f536.
which reverted f596aa0f4a
to move it to staging
This commit is contained in:
Graham Christensen 2018-01-28 16:34:04 -05:00
parent 15a4977409
commit e2a54266c4
No known key found for this signature in database
GPG Key ID: ACA1C1D120C83D5C
4 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/misc/nixpkgs.nix
View File

@ -69,7 +69,6 @@ in
[ (self: super: { [ (self: super: {
openssh = super.openssh.override { openssh = super.openssh.override {
hpnSupport = true; hpnSupport = true;
withKerberos = true;
kerberos = self.libkrb5; kerberos = self.libkrb5;
}; };
}; };

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

@ -1,15 +1,12 @@
{ stdenv, fetchurl, fetchpatch, zlib, openssl, perl, libedit, pkgconfig, pam, autoreconfHook { stdenv, fetchurl, fetchpatch, zlib, openssl, perl, libedit, pkgconfig, pam, autoreconfHook
, etcDir ? null , etcDir ? null
, hpnSupport ? false , hpnSupport ? false
, withKerberos ? false , withKerberos ? true
, withGssapiPatches ? false , withGssapiPatches ? false
, kerberos , kerberos
, linkOpenssl? true , linkOpenssl? true
}: }:
assert withKerberos -> kerberos != null;
assert withGssapiPatches -> withKerberos;
let let
# **please** update this patch when you update to a new openssh release. # **please** update this patch when you update to a new openssh release.
@ -23,8 +20,6 @@ let
in in
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
# Please ensure that openssh_with_kerberos still builds when
# bumping the version here!
name = "openssh-${version}"; name = "openssh-${version}";
version = if hpnSupport then "7.5p1" else "7.6p1"; version = if hpnSupport then "7.5p1" else "7.6p1";
@ -47,7 +42,7 @@ stdenv.mkDerivation rec {
# See discussion in https://github.com/NixOS/nixpkgs/pull/16966 # See discussion in https://github.com/NixOS/nixpkgs/pull/16966
./dont_create_privsep_path.patch ./dont_create_privsep_path.patch
] ]
++ optional withGssapiPatches gssapiPatch; ++ optional withGssapiPatches (assert withKerberos; gssapiPatch);
postPatch = postPatch =
# On Hydra this makes installation fail (sometimes?), # On Hydra this makes installation fail (sometimes?),
@ -59,7 +54,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ zlib openssl libedit pam ] buildInputs = [ zlib openssl libedit pam ]
++ optional withKerberos kerberos ++ optional withKerberos kerberos
++ optional hpnSupport autoreconfHook; ++ optional hpnSupport autoreconfHook
;
preConfigure = '' preConfigure = ''
# Setting LD causes `configure' and `make' to disagree about which linker # Setting LD causes `configure' and `make' to disagree about which linker
@ -78,7 +74,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")
] ++ optional (etcDir != null) "--sysconfdir=${etcDir}" ] ++ optional (etcDir != null) "--sysconfdir=${etcDir}"
++ optional withKerberos "--with-kerberos5=${kerberos}" ++ optional withKerberos (assert kerberos != null; "--with-kerberos5=${kerberos}")
++ optional stdenv.isDarwin "--disable-libutil" ++ optional stdenv.isDarwin "--disable-libutil"
++ optional (!linkOpenssl) "--without-openssl"; ++ optional (!linkOpenssl) "--without-openssl";

1
pkgs/top-level/aliases.nix
View File

@ -142,6 +142,7 @@ mapAliases (rec {
rdmd = dtools; # added 2017-08-19 rdmd = dtools; # added 2017-08-19
robomongo = robo3t; #added 2017-09-28 robomongo = robo3t; #added 2017-09-28
rssglx = rss-glx; #added 2015-03-25 rssglx = rss-glx; #added 2015-03-25
openssh_with_kerberos = openssh; # added 2018-01-28
rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby"; rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby";
rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02 rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02
samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25 samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25

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

@ -3882,15 +3882,12 @@ with pkgs;
openssh = openssh =
callPackage ../tools/networking/openssh { callPackage ../tools/networking/openssh {
hpnSupport = false; hpnSupport = false;
withKerberos = stdenv.isDarwin;
etcDir = "/etc/ssh"; etcDir = "/etc/ssh";
pam = if stdenv.isLinux then pam else null; pam = if stdenv.isLinux then pam else null;
}; };
openssh_hpn = pkgs.appendToName "with-hpn" (openssh.override { hpnSupport = true; }); openssh_hpn = pkgs.appendToName "with-hpn" (openssh.override { hpnSupport = true; });
openssh_with_kerberos = pkgs.appendToName "with-kerberos" (openssh.override { withKerberos = true; });
opensp = callPackage ../tools/text/sgml/opensp { }; opensp = callPackage ../tools/text/sgml/opensp { };
opentracker = callPackage ../applications/networking/p2p/opentracker { }; opentracker = callPackage ../applications/networking/p2p/opentracker { };