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

grsecurity: Update stable and test patches

Browse Source 
stable: 3.1-3.14.41-201505072056 -> 3.1-3.14.41-201505101121
test:   3.1-4.0.2-201505072057   -> 3.1-4.0.2-201505101122
This commit is contained in:
Ricardo M. Correia 2015-05-11 02:45:26 +02:00
parent 7493d6f1f6
commit aa75bb25d8
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/security/grsecurity.nix
View File

@ -38,7 +38,7 @@ in
type = types.bool; type = types.bool;
default = false; default = false;
description = '' description = ''
Enable the testing grsecurity patch, based on Linux 3.19. Enable the testing grsecurity patch, based on Linux 4.0.
''; '';
}; };
@ -223,7 +223,7 @@ in
message = '' message = ''
If grsecurity is enabled, you must select either the If grsecurity is enabled, you must select either the
stable patch (with kernel 3.14), or the testing patch (with stable patch (with kernel 3.14), or the testing patch (with
kernel 3.19) to continue. kernel 4.0) to continue.
''; '';
} }
{ assertion = !(cfg.stable && cfg.testing); { assertion = !(cfg.stable && cfg.testing);

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

@ -66,16 +66,16 @@ rec {
grsecurity_stable = grsecPatch grsecurity_stable = grsecPatch
{ kversion = "3.14.41"; { kversion = "3.14.41";
revision = "201505072056"; revision = "201505101121";
branch = "stable"; branch = "stable";
sha256 = "1fgi63y61mjmxj0mq2a24lwq0i0186kyvcdsjflw48adwjm6v0kg"; sha256 = "1jiwc6qvimccmlm62sfp2ch173h7ki1h11facywpnb4wms7izk6g";
}; };
grsecurity_unstable = grsecPatch grsecurity_unstable = grsecPatch
{ kversion = "4.0.2"; { kversion = "4.0.2";
revision = "201505072057"; revision = "201505101122";
branch = "test"; branch = "test";
sha256 = "0njvgd6n9z35hyxnligb8aq9shxzbwrkrdvpbxc0qxmwya0midv2"; sha256 = "14fi31xwlgirbwk7f1xh8vanjxk8b473rz7z38savl4nx2wr5r24";
}; };
grsec_fix_path = grsec_fix_path =