public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

grsecurity: Update stable and test patches 

stable: 3.0-3.2.55-201403022154 -> 3.0-3.2.55-201403072107
test:   3.0-3.13.5-201403031445 -> 3.0-3.13.6-201403072241
This commit is contained in:
Ricardo M. Correia 2014-03-08 21:49:38 +01:00
parent 9b650b074b
commit d999872b8d
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/os-specific/linux/kernel/patches.nix
View File

@ -81,22 +81,22 @@ rec {
grsecurity_3_0_3_2_55 = grsecurity_3_0_3_2_55 =
{ name = "grsecurity-3.0-3.2.55"; { name = "grsecurity-3.0-3.2.55";
patch = fetchurl { patch = fetchurl {
url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201403022154.patch; url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201403072107.patch;
sha256 = "0pqp8mfj4zbgb94c7g6ykh0amlwlilxjiqsyc6smmwwbg6klgvkr"; sha256 = "128dbspwg8hvshz6rjykcl42kam5g0db50rbyaagskh9jm9a0zyz";
}; };
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.55
features.apparmor = true; features.apparmor = true;
}; };
grsecurity_3_0_3_13_5 = grsecurity_3_0_3_13_6 =
{ name = "grsecurity-3.0-3.13.5"; { name = "grsecurity-3.0-3.13.6";
patch = fetchurl { patch = fetchurl {
url = http://grsecurity.net/test/grsecurity-3.0-3.13.5-201403031445.patch; url = http://grsecurity.net/test/grsecurity-3.0-3.13.6-201403072241.patch;
sha256 = "0b22jbm9swghhj7a9c07z5yprk88bgp0iv3c8xmfqqyy0yighq1l"; sha256 = "006w89pvb9jasb7413nnphz5mrdmq10mkpmjcglbhs5ps915jczy";
}; };
features.grsecurity = true; features.grsecurity = true;
# The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.5 # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.6
features.apparmor = true; features.apparmor = true;
}; };

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

@ -6740,7 +6740,7 @@ let
})) (args: grsecurityOverrider args)); })) (args: grsecurityOverrider args));
linux_3_13_grsecurity = lowPrio (lib.overrideDerivation (linux_3_13.override (args: { linux_3_13_grsecurity = lowPrio (lib.overrideDerivation (linux_3_13.override (args: {
kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_5 kernelPatches.grsec_path ]; kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_6 kernelPatches.grsec_path ];
argsOverride = { argsOverride = {
modDirVersion = "${linux_3_13.modDirVersion}-grsec"; modDirVersion = "${linux_3_13.modDirVersion}-grsec";
}; };