grsecurity: update stable/testing kernels, refactoring

This updates the new stable kernel to 3.14, and the new testing kernel
to 3.15.

This also removes the vserver kernel, since it's probably not nearly as
used.

Signed-off-by: Austin Seipp <aseipp@pobox.com>

2 files changed, 5 insertions, 13 deletions

diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix
index a9c60a2afbd..e66b348d082 100644
--- a/pkgs/build-support/grsecurity/default.nix
+++ b/pkgs/build-support/grsecurity/default.nix
@@ -5,7 +5,6 @@ with lib;
 let
   cfg = {
     stable  = grsecOptions.stable  or false;
-    vserver = grsecOptions.vserver or false;
     testing = grsecOptions.testing or false;
     config = {
       mode = "auto";
@@ -29,12 +28,11 @@ let
         };
 
     test-patch = with pkgs.kernelPatches; grsecurity_unstable;
-    stable-patch = with pkgs.kernelPatches;
-      if cfg.vserver then grsecurity_vserver else grsecurity_stable;
+    stable-patch = with pkgs.kernelPatches; grsecurity_stable;
 
-    grKernel = if (cfg.stable || cfg.vserver)
-               then mkKernel pkgs.linux_3_2  stable-patch
-               else mkKernel pkgs.linux_3_14 test-patch;
+    grKernel = if cfg.stable
+               then mkKernel pkgs.linux_3_14 stable-patch
+               else mkKernel pkgs.linux_3_15 test-patch;
 
     ## -- grsecurity configuration ---------------------------------------------
 
diff --git a/pkgs/build-support/grsecurity/flavors.nix b/pkgs/build-support/grsecurity/flavors.nix
index 57d52e7cf94..969ca579f5a 100644
--- a/pkgs/build-support/grsecurity/flavors.nix
+++ b/pkgs/build-support/grsecurity/flavors.nix
@@ -16,12 +16,6 @@ in
   linux_grsec_stable_server_xen =
     mkOpts "stable" "security" "server" "guest" "xen" true;
 
-  # Stable+vserver kernels - server versions only
-  linux_grsec_vserver_server  =
-    mkOpts "vserver" "security" "server" "host" "kvm" true;
-  linux_grsec_vserver_server_xen =
-    mkOpts "vserver" "security" "server" "guest" "xen" true;
-
   # Testing kernels
   linux_grsec_testing_desktop =
     mkOpts "testing" "performance" "desktop" "host" "kvm" true;
@@ -29,4 +23,4 @@ in
     mkOpts "testing" "security" "server" "host" "kvm" true;
   linux_grsec_testing_server_xen =
     mkOpts "testing" "security" "server" "guest" "xen" true;
-}
\ No newline at end of file
+}