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

grsecurity updates.

Browse Source 
- stable:  3.0-3.2.54-201402062221 -> 3.0-3.2.55-201402152203
  - testing: 3.0-3.13.3-201402132113 -> 3.0-3.13.3-201402152204

Signed-off-by: Austin Seipp <aseipp@pobox.com>
This commit is contained in:
Austin Seipp 2014-02-17 04:09:17 -06:00
parent 8e349e721c
commit c137015328
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,11 +78,11 @@ rec {
}; };
grsecurity_3_0_3_2_54 = grsecurity_3_0_3_2_55 =
{ name = "grsecurity-3.0-3.2.54"; { name = "grsecurity-3.0-3.2.55";
patch = fetchurl { patch = fetchurl {
url = https://grsecurity.net/stable/grsecurity-3.0-3.2.54-201402062221.patch; url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201402152203.patch;
sha256 = "14x887xibl7d50a1pxmi0snnwcnh27z8bnidhxg2xfasxxp248m5"; sha256 = "1600hydfq2dwyqqzfmsvy50kcicdm2lq44yiiwgnbiykq2135fwx";
}; };
features.grsecurity = true; features.grsecurity = true;
# The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.54 # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.54
@ -92,8 +92,8 @@ rec {
grsecurity_3_0_3_13_3 = grsecurity_3_0_3_13_3 =
{ name = "grsecurity-3.0-3.13.3"; { name = "grsecurity-3.0-3.13.3";
patch = fetchurl { patch = fetchurl {
url = http://grsecurity.net/test/grsecurity-3.0-3.13.3-201402132113.patch; url = http://grsecurity.net/test/grsecurity-3.0-3.13.3-201402152204.patch;
sha256 = "143givk7xk54c2f9q7h2v5gdc3sy1kcd8j83vn1jfcyipzqkdqnk"; sha256 = "0c4mswka95zivil3a28ipsbnv2nhrmqwj4l4dig3n8pr6d2vgwc9";
}; };
features.grsecurity = true; features.grsecurity = true;
# The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.2 # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.2

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

@ -6674,7 +6674,7 @@ let
# config options you need (e.g. by overriding extraConfig). See list of options here: # config options you need (e.g. by overriding extraConfig). See list of options here:
# https://en.wikibooks.org/wiki/Grsecurity/Appendix/Grsecurity_and_PaX_Configuration_Options # https://en.wikibooks.org/wiki/Grsecurity/Appendix/Grsecurity_and_PaX_Configuration_Options
linux_3_2_grsecurity = lowPrio (lib.overrideDerivation (linux_3_2.override (args: { linux_3_2_grsecurity = lowPrio (lib.overrideDerivation (linux_3_2.override (args: {
kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_54 kernelPatches.grsec_path ]; kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_55 kernelPatches.grsec_path ];
argsOverride = { argsOverride = {
modDirVersion = "${linux_3_2.modDirVersion}-grsec"; modDirVersion = "${linux_3_2.modDirVersion}-grsec";
}; };