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

2016-04-18 13:49:22 +00:00
parent 3e68106afd 0729f60697
commit d020caa5b2
1369 changed files with 35810 additions and 10571 deletions
@@ -41,8 +41,10 @@ stdenv.mkDerivation rec {
    '';

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