summary refs log tree commit diff
path: root/pkgs/os-specific/linux
diff options
context:
space:
mode:
authorAlexander Kjeldaas <ak@formalprivacy.com>2014-10-22 02:18:41 +0200
committerAlexander Kjeldaas <ak@formalprivacy.com>2014-10-22 02:18:41 +0200
commit005bb796e68b3f69e54ab0c6bc631723eb545136 (patch)
tree60a8649737d10ec543a6bc635f9db8d4f01133c9 /pkgs/os-specific/linux
parentbddf342631ce417dac99f6f222075c51cf4109de (diff)
downloadnixlib-005bb796e68b3f69e54ab0c6bc631723eb545136.tar
nixlib-005bb796e68b3f69e54ab0c6bc631723eb545136.tar.gz
nixlib-005bb796e68b3f69e54ab0c6bc631723eb545136.tar.bz2
nixlib-005bb796e68b3f69e54ab0c6bc631723eb545136.tar.lz
nixlib-005bb796e68b3f69e54ab0c6bc631723eb545136.tar.xz
nixlib-005bb796e68b3f69e54ab0c6bc631723eb545136.tar.zst
nixlib-005bb796e68b3f69e54ab0c6bc631723eb545136.zip
Updated grsec.
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r--pkgs/os-specific/linux/kernel/patches.nix12
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 50bc13191981..10bc141c11db 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -60,17 +60,17 @@ rec {
   };
 
   grsecurity_stable = grsecPatch
-    { kversion  = "3.14.20";
-      revision  = "201410062037";
+    { kversion  = "3.14.22";
+      revision  = "201410192047";
       branch    = "stable";
-      sha256    = "0vs5s7xlnsrs5w59vhi57xhsnx3fryqfpvdgsfg2rxqnc1a5b3sp";
+      sha256    = "0f6mdc0m89idlygm75x3z01rqacla4r26cgz1ai1c6sm5vp9yvw1";
     };
 
   grsecurity_unstable = grsecPatch
-    { kversion  = "3.16.4";
-      revision  = "201410062041";
+    { kversion  = "3.17.1";
+      revision  = "201410192051";
       branch    = "test";
-      sha256    = "17g993gwjbj10gp2in534ycsv5hwggi5hrbqrsar1lm95m3d6pbc";
+      sha256    = "1ny8h6dd5mijg7lwi7zwqc6x5n5wkv19avl1d5qx8g2fs6qxbg0m";
     };
 
   grsec_fix_path =