From 7c8247a8c50c1a4aa56fa5cfd3dae33f1aeae2ac Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Sun, 15 Mar 2015 03:38:33 +0100 Subject: [PATCH] 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 --- nixos/modules/security/grsecurity.nix | 4 ++-- pkgs/build-support/grsecurity/default.nix | 2 +- pkgs/os-specific/linux/kernel/linux-3.18.nix | 1 - pkgs/os-specific/linux/kernel/patches.nix | 10 +++++----- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix index 66eeab7503d..8cd40093348 100644 --- a/nixos/modules/security/grsecurity.nix +++ b/nixos/modules/security/grsecurity.nix @@ -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); diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix index b2bffc781b3..7bafd78d76a 100644 --- a/pkgs/build-support/grsecurity/default.nix +++ b/pkgs/build-support/grsecurity/default.nix @@ -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 --------------------------------------------- diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix index 93ddecbf4a5..154c9633cdb 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix @@ -2,7 +2,6 @@ import ./generic.nix (args // rec { version = "3.18.9"; - # Remember to update grsecurity! extraMeta.branch = "3.18"; src = fetchurl { diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index c2d35ce4d2e..f239d459967 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -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 =