From 0a97acdc0f66cc7d3fcd4c19f232c3dc98eff104 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Mon, 29 Dec 2014 00:39:04 +0100
Subject: [PATCH] grsecurity: Update stable and test patches

stable: 3.0-3.14.27-201412211908 -> 3.0-3.14.27-201412280859
test:   3.0-3.17.7-201412211910  -> 3.0-3.18.1-201412281149
---
 nixos/modules/security/grsecurity.nix        |  4 ++--
 pkgs/build-support/grsecurity/default.nix    |  2 +-
 pkgs/os-specific/linux/kernel/linux-3.17.nix |  1 -
 pkgs/os-specific/linux/kernel/linux-3.18.nix |  1 +
 pkgs/os-specific/linux/kernel/patches.nix    | 10 +++++-----
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix
index cbad94007088..5c8c49939510 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.17.
+          Enable the testing grsecurity patch, based on Linux 3.18.
         '';
       };
 
@@ -227,7 +227,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.17) to continue.
+            kernel 3.18) 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 19e8f14ebf1c..919728382301 100644
--- a/pkgs/build-support/grsecurity/default.nix
+++ b/pkgs/build-support/grsecurity/default.nix
@@ -32,7 +32,7 @@ let
 
     grKernel = if cfg.stable
                then mkKernel pkgs.linux_3_14 stable-patch
-               else mkKernel pkgs.linux_3_17 test-patch;
+               else mkKernel pkgs.linux_3_18 test-patch;
 
     ## -- grsecurity configuration ---------------------------------------------
 
diff --git a/pkgs/os-specific/linux/kernel/linux-3.17.nix b/pkgs/os-specific/linux/kernel/linux-3.17.nix
index fd21f3c285cc..a459e33f4d66 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.17.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.17.nix
@@ -2,7 +2,6 @@
 
 import ./generic.nix (args // rec {
   version = "3.17.7";
-  # Remember to update grsecurity!
   extraMeta.branch = "3.17";
 
   src = fetchurl {
diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix
index 7e8fd723dd23..e12588e052ba 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.18.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix
@@ -2,6 +2,7 @@
 
 import ./generic.nix (args // rec {
   version = "3.18.1";
+  # 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 561eadf2f21a..8c707c7e570d 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -61,16 +61,16 @@ rec {
 
   grsecurity_stable = grsecPatch
     { kversion  = "3.14.27";
-      revision  = "201412211908";
+      revision  = "201412280859";
       branch    = "stable";
-      sha256    = "1xs34v1k970sv4i0a9qjcgk7i4cihl2xlgp1q7v320idpxrcym3a";
+      sha256    = "185sq4bsgwmpq9g0g5fhm69ba875xhxha2rs0cn6n647v90rxrjk";
     };
 
   grsecurity_unstable = grsecPatch
-    { kversion  = "3.17.7";
-      revision  = "201412211910";
+    { kversion  = "3.18.1";
+      revision  = "201412281149";
       branch    = "test";
-      sha256    = "1s3ksf44mah398ix4ar49m6d8xwkk991pl1m8m441yhpm8h1ss3w";
+      sha256    = "10pq6lslfn6ck7pm1651s6pd5mqmjxvqv3iv70qrpwwb2gdhpdin";
     };
 
   grsec_fix_path =