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-201403202347 -> 3.0-3.2.55-201403252026
test:   3.0-3.13.6-201403202349 -> 3.0-3.13.7-201403252047
This commit is contained in:
Ricardo M. Correia 2014-03-26 21:21:05 +01:00
parent 1c73e6f9d8
commit 911f332279
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

@ -75,22 +75,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-201403202347.patch; url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201403252026.patch;
sha256 = "19fwbpnfgq7iylrd0akazmh349xvxc9saxcsiqzhficfrsc4fyd3"; sha256 = "1jfy4cfzgfixyyq5436fzwhg9ch31ynq6d5sxzajqkvmprq5kbhn";
}; };
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_6 = grsecurity_3_0_3_13_7 =
{ name = "grsecurity-3.0-3.13.6"; { name = "grsecurity-3.0-3.13.7";
patch = fetchurl { patch = fetchurl {
url = http://grsecurity.net/test/grsecurity-3.0-3.13.6-201403202349.patch; url = http://grsecurity.net/test/grsecurity-3.0-3.13.7-201403252047.patch;
sha256 = "0a1alz46k1g9nryx7qb040v5zf09ax7shj5wb0xj58gfpm67g86p"; sha256 = "0f3mhkf15fpgy28rkfkd0wnccvz2n7s21gppnksl5w9dlw8m7mib";
}; };
features.grsecurity = true; features.grsecurity = true;
# The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.6 # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.7
features.apparmor = true; features.apparmor = true;
}; };

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

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