mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 15:22:59 +01:00
grsecurity: Update stable patch from 3.0-3.2.55-201403300851 -> 3.0-3.2.56-201404012135
This commit is contained in:
parent
e8c6c60b93
commit
52d233af22
2 changed files with 6 additions and 6 deletions
|
@ -72,14 +72,14 @@ rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
grsecurity_3_0_3_2_55 =
|
grsecurity_3_0_3_2_56 =
|
||||||
{ name = "grsecurity-3.0-3.2.55";
|
{ name = "grsecurity-3.0-3.2.56";
|
||||||
patch = fetchurl {
|
patch = fetchurl {
|
||||||
url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201403300851.patch;
|
url = http://grsecurity.net/stable/grsecurity-3.0-3.2.56-201404012135.patch;
|
||||||
sha256 = "1a1bhf5i3jx1c6l1bibc5ppd12xzpdk7a5q83rivjiixv37s1x85";
|
sha256 = "1l7c1l5cxv1j9iw12rxf7nsvbmg6jna96y1bxc8i4yi0jwiwn2nc";
|
||||||
};
|
};
|
||||||
features.grsecurity = true;
|
features.grsecurity = true;
|
||||||
# The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.55
|
# The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.56
|
||||||
features.apparmor = true;
|
features.apparmor = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -6874,7 +6874,7 @@ let
|
||||||
linux_3_2_grsecurity = lowPrio (lib.addMetaAttrs {
|
linux_3_2_grsecurity = lowPrio (lib.addMetaAttrs {
|
||||||
maintainers = with lib.maintainers; [ wizeman ];
|
maintainers = with lib.maintainers; [ wizeman ];
|
||||||
} (lib.overrideDerivation (linux_3_2.override (args: {
|
} (lib.overrideDerivation (linux_3_2.override (args: {
|
||||||
kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_55 kernelPatches.grsec_path ];
|
kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_56 kernelPatches.grsec_path ];
|
||||||
argsOverride = {
|
argsOverride = {
|
||||||
modDirVersion = "${linux_3_2.modDirVersion}-grsec";
|
modDirVersion = "${linux_3_2.modDirVersion}-grsec";
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue