Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-04-03 11:01:57 +00:00
parent 5df521abda b8755a4cdf
commit 696d85a62d
99 changed files with 1762 additions and 709 deletions
@@ -41,7 +41,9 @@ stdenv.mkDerivation rec {
    '';

  patches =
-    [ ./locale_archive.patch ]
+    [ ./locale_archive.patch
+      ./fix-host-key-algorithms-plus.patch
+    ]
    ++ optional withGssapiPatches gssapiSrc;

  buildInputs = [ zlib openssl libedit pkgconfig pam ]