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

grsecurity: Update stable and test patches

Browse Source 
stable: 3.0-3.2.55-201402221305 -> 3.0-3.2.55-201402241936
test:   3.0-3.13.4-201402221308 -> 3.0-3.13.5-201402241943
This commit is contained in:
Ricardo M. Correia 2014-02-26 20:35:29 +00:00
parent 8109de905a
commit 69a83ba99f
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
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-201402221305.patch; url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201402241936.patch;
sha256 = "0g6mqbmjmqz4xh18cq5mn3d0zlzjlk76x0lmpwbrcapdcg5apcp5"; sha256 = "0kd6bc9kyvn8y6b32fpn778hc8xfm2y4wmpiglia6dqybpyry600";
}; };
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.55
features.apparmor = true; features.apparmor = true;
}; };
grsecurity_3_0_3_13_4 = grsecurity_3_0_3_13_5 =
{ name = "grsecurity-3.0-3.13.4"; { name = "grsecurity-3.0-3.13.5";
patch = fetchurl { patch = fetchurl {
url = http://grsecurity.net/test/grsecurity-3.0-3.13.4-201402221308.patch; url = http://grsecurity.net/test/grsecurity-3.0-3.13.5-201402241943.patch;
sha256 = "0783an79485wwbsvcf8ggsmc2bwsbj1i7q6r8g22b19i9hzqmr64"; sha256 = "1xv4plviarjprg7bcb4h88wsbrj7x2biypibhzb1pifksmxx25fn";
}; };
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.5
features.apparmor = true; features.apparmor = true;
}; };

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

@ -6710,7 +6710,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_4 kernelPatches.grsec_path ]; kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_5 kernelPatches.grsec_path ];
argsOverride = { argsOverride = {
modDirVersion = "${linux_3_13.modDirVersion}-grsec"; modDirVersion = "${linux_3_13.modDirVersion}-grsec";
}; };