mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-16 06:47:09 +03:00
Merge pull request #13769 from aneeshusa/openssh-decouple-gssapi-from-kerberos
openssh: decouple gssapi patch from kerberos
This commit is contained in:
commit
d92bb56f74
@ -2,12 +2,13 @@
|
||||
, etcDir ? null
|
||||
, hpnSupport ? false
|
||||
, withKerberos ? false
|
||||
, withGssapiPatches ? withKerberos
|
||||
, withGssapiPatches ? false
|
||||
, kerberos
|
||||
, linkOpenssl? true
|
||||
}:
|
||||
|
||||
assert withKerberos -> kerberos != null;
|
||||
assert withGssapiPatches -> withKerberos;
|
||||
|
||||
let
|
||||
|
||||
@ -17,13 +18,15 @@ let
|
||||
};
|
||||
|
||||
gssapiSrc = fetchpatch {
|
||||
url = "http://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian/patches/gssapi.patch?h=debian/7.1p2-2";
|
||||
sha256 = "05nsch879nlpyyiwm240wlq9rasy71j9d03j1rfi8kp865zhjfbm";
|
||||
url = "https://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian/patches/gssapi.patch?id=46961f5704f8e86cea3e99253faad55aef4d8f35";
|
||||
sha256 = "01mf2vx1gavypbdx06mcbmcrkm2smff0h3jfmr61k6h6j3xk88y5";
|
||||
};
|
||||
|
||||
in
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
# Please ensure that openssh_with_kerberos still builds when
|
||||
# bumping the version here!
|
||||
name = "openssh-7.2p1";
|
||||
|
||||
src = fetchurl {
|
||||
|
Loading…
Reference in New Issue
Block a user