summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoachim Fasting <joachifm@fastmail.fm>2017-04-10 03:34:18 +0200
committerJoachim Fasting <joachifm@fastmail.fm>2017-04-10 03:34:42 +0200
commit7701cbca6b55eb9dee6e61766376dba42a8b32f2 (patch)
tree7d723d5d37633092f9168e1f22b22cd038a18068
parentb023370f3757a76acb244e647f29e388e076cab0 (diff)
downloadnixpkgs-7701cbca6b55eb9dee6e61766376dba42a8b32f2.tar
nixpkgs-7701cbca6b55eb9dee6e61766376dba42a8b32f2.tar.gz
nixpkgs-7701cbca6b55eb9dee6e61766376dba42a8b32f2.tar.bz2
nixpkgs-7701cbca6b55eb9dee6e61766376dba42a8b32f2.tar.lz
nixpkgs-7701cbca6b55eb9dee6e61766376dba42a8b32f2.tar.xz
nixpkgs-7701cbca6b55eb9dee6e61766376dba42a8b32f2.tar.zst
nixpkgs-7701cbca6b55eb9dee6e61766376dba42a8b32f2.zip
grsecurity: 4.9.20-201703310823 -> 4.9.21-201704091948
-rw-r--r--pkgs/os-specific/linux/kernel/linux-grsecurity.nix4
-rw-r--r--pkgs/os-specific/linux/kernel/patches.nix6
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
index b32dfbc4b35..7df48850fd1 100644
--- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
+++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.20";
+  version = "4.9.21";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha512 = "3israf7zhq92wi0py8y299f7cz6z6xr0y4i5b1xvb46ljyx39jwrrdjrf5nxngz6c1641l9qalwzg5r15pp4gqyr09ilmwn8i7kbqwi";
+    sha512 = "1l1m23qdcz4pqnawq2xxiw8pwapgf84ggvb16696qfsh36dhwr62hmg0k5vip2c7yp74dls2gw9qcwhgv9dp7ki74xhzbhpv3148fjd";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index d8676413e82..0a3b51a4e6e 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -100,9 +100,9 @@ rec {
   };
 
   grsecurity_testing = grsecPatch
-    { kver   = "4.9.20";
-      grrev  = "201703310823";
-      sha512 = "0pm3wmcip73imjjx13yar5l5bhpii45mjac5vb1snypmbwqmywmikiixqslq84i1yqw0c8pi822znkz7650dhxrmdmagy0yirwfdrhf";
+    { kver   = "4.9.21";
+      grrev  = "201704091948";
+      sha512 = "1pa9vchnii319w3jarp4aclyjpwpk2s3ddi9facvy0r148xxqsl30hk2l0ihb9wwr9pz5a8l2z85skkkp65hpaz6fr9wmy9d1lb1hwh";
     };
 
   # This patch relaxes grsec constraints on the location of usermode helpers,