summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoachim Fasting <joachifm@fastmail.fm>2017-04-12 18:58:24 +0200
committerJoachim Fasting <joachifm@fastmail.fm>2017-04-12 18:58:29 +0200
commit3fa5605b416bcfabf6884cce04716ef11786fa51 (patch)
treef5050cad2cba2e07da3ecf0f846ec8b2f666ea7d
parentb2c87fbf98cf5d4a57cb4528cf60cabefc4d5282 (diff)
downloadnixlib-3fa5605b416bcfabf6884cce04716ef11786fa51.tar
nixlib-3fa5605b416bcfabf6884cce04716ef11786fa51.tar.gz
nixlib-3fa5605b416bcfabf6884cce04716ef11786fa51.tar.bz2
nixlib-3fa5605b416bcfabf6884cce04716ef11786fa51.tar.lz
nixlib-3fa5605b416bcfabf6884cce04716ef11786fa51.tar.xz
nixlib-3fa5605b416bcfabf6884cce04716ef11786fa51.tar.zst
nixlib-3fa5605b416bcfabf6884cce04716ef11786fa51.zip
grsecurity: 4.9.21-201704091948 -> 4.9.22-201704120836
-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 7df48850fd12..779a80208d15 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.21";
+  version = "4.9.22";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha512 = "1l1m23qdcz4pqnawq2xxiw8pwapgf84ggvb16696qfsh36dhwr62hmg0k5vip2c7yp74dls2gw9qcwhgv9dp7ki74xhzbhpv3148fjd";
+    sha512 = "1hnbadbfvsqsdp7rd1zy07wi3wvryfr0cibk7jq0f35zfkpf4qyry9l1p28kca64p6zg2qb2arnr2p2qgbpx8dzsnwq6q072qddq4hg";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 0a3b51a4e6e9..2f0073ef25fa 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.21";
-      grrev  = "201704091948";
-      sha512 = "1pa9vchnii319w3jarp4aclyjpwpk2s3ddi9facvy0r148xxqsl30hk2l0ihb9wwr9pz5a8l2z85skkkp65hpaz6fr9wmy9d1lb1hwh";
+    { kver   = "4.9.22";
+      grrev  = "201704120836";
+      sha512 = "3320r4myn9y5wf2i2aybl1aapcl9sms0z6p343xh5x0pvaphsjhksnh7cndrq0qxc7fqdwzh9nw1vf84qy02cg5nf8bq025jpkfp7qh";
     };
 
   # This patch relaxes grsec constraints on the location of usermode helpers,