From aa75bb25d8a681d971aefe9bcd263c9dbf8acf50 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Mon, 11 May 2015 02:45:26 +0200
Subject: [PATCH] grsecurity: Update stable and test patches
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
---
nixos/modules/security/grsecurity.nix | 4 ++--
pkgs/os-specific/linux/kernel/patches.nix | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix
index b116d8bfef28..40942644868a 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.19.
+ Enable the testing grsecurity patch, based on Linux 4.0.
'';
};
@@ -223,7 +223,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.19) to continue.
+ kernel 4.0) to continue.
'';
}
{ assertion = !(cfg.stable && cfg.testing);
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 628dda0ac4b7..4e5facc4483b 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.41";
- revision = "201505072056";
+ revision = "201505101121";
branch = "stable";
- sha256 = "1fgi63y61mjmxj0mq2a24lwq0i0186kyvcdsjflw48adwjm6v0kg";
+ sha256 = "1jiwc6qvimccmlm62sfp2ch173h7ki1h11facywpnb4wms7izk6g";
};
grsecurity_unstable = grsecPatch
{ kversion = "4.0.2";
- revision = "201505072057";
+ revision = "201505101122";
branch = "test";
- sha256 = "0njvgd6n9z35hyxnligb8aq9shxzbwrkrdvpbxc0qxmwya0midv2";
+ sha256 = "14fi31xwlgirbwk7f1xh8vanjxk8b473rz7z38savl4nx2wr5r24";
};
grsec_fix_path =