grsecurity: Update stable and test patches

stable: 3.1-3.14.35-201503071140 -> 3.1-3.14.35-201503092203
test:   3.1-3.18.9-201503071142  -> 3.1-3.19.1-201503122205
This commit is contained in:
Ricardo M. Correia 2015-03-15 03:38:33 +01:00
parent 180da0d463
commit 7c8247a8c5
4 changed files with 8 additions and 9 deletions

View file

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

View file

@ -33,7 +33,7 @@ let
grKernel = if cfg.stable
then mkKernel pkgs.linux_3_14 stable-patch
else mkKernel pkgs.linux_3_18 test-patch;
else mkKernel pkgs.linux_3_19 test-patch;
## -- grsecurity configuration ---------------------------------------------

View file

@ -2,7 +2,6 @@
import ./generic.nix (args // rec {
version = "3.18.9";
# Remember to update grsecurity!
extraMeta.branch = "3.18";
src = fetchurl {

View file

@ -66,16 +66,16 @@ rec {
grsecurity_stable = grsecPatch
{ kversion = "3.14.35";
revision = "201503071140";
revision = "201503092203";
branch = "stable";
sha256 = "076kmzyrmg8g82xhaccysdgblfkdd21rfn8wvdpf6kxavg8xn855";
sha256 = "0l8m0ixh0qcgwy8vcmfl8pal93wc03ahc3ci3sca79nx33a050v9";
};
grsecurity_unstable = grsecPatch
{ kversion = "3.18.9";
revision = "201503071142";
{ kversion = "3.19.1";
revision = "201503122205";
branch = "test";
sha256 = "0acrz6v827y8pdrl26wb652hmq0qglkwdgq0ffrw6k052f5lpfx2";
sha256 = "0g22wfmlim163gmsl4cn4nq4zif8zni3cpkk7cr93z92r9kafp4y";
};
grsec_fix_path =