diff options
author | Joachim Fasting <joachifm@fastmail.fm> | 2016-08-15 19:52:30 +0200 |
---|---|---|
committer | Joachim Fasting <joachifm@fastmail.fm> | 2016-08-15 20:36:46 +0200 |
commit | 9062c6791431b79640b55dcd84b95fedcd1dda60 (patch) | |
tree | 566b6db3258042d310b65f36fc75fba619c08d22 | |
parent | 567640d80caeaa70abd95b9841111f31a5193685 (diff) | |
download | nixlib-9062c6791431b79640b55dcd84b95fedcd1dda60.tar nixlib-9062c6791431b79640b55dcd84b95fedcd1dda60.tar.gz nixlib-9062c6791431b79640b55dcd84b95fedcd1dda60.tar.bz2 nixlib-9062c6791431b79640b55dcd84b95fedcd1dda60.tar.lz nixlib-9062c6791431b79640b55dcd84b95fedcd1dda60.tar.xz nixlib-9062c6791431b79640b55dcd84b95fedcd1dda60.tar.zst nixlib-9062c6791431b79640b55dcd84b95fedcd1dda60.zip |
grsecurity: 4.6.5-201607312210 -> 4.7-201608131240
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-grsecurity.nix | 7 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/patches.nix | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix index 0559df72ae6d..be84d5f76da1 100644 --- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix +++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix @@ -1,12 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.6.5"; - extraMeta.branch = "4.6"; + version = "4.7"; + modDirVersion = "4.7.0"; + extraMeta.branch = "4.7"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1i8ksv8w6dn86q54gzk230gxrylqx3m55x789d29q5balg456bby"; + sha256 = "042z53ik3mqaqlfrn5b70kw882fwd42zanqld10s1vcs438w742i"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index f0aa4c92b3c5..62b70ac67c2a 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -93,9 +93,9 @@ rec { grsecurity_4_4 = throw "grsecurity stable is no longer supported"; grsecurity_testing = grsecPatch - { kver = "4.6.5"; - grrev = "201607312210"; - sha256 = "17dnp6w092kvqxqxbdgjpl4mrsn2wkb7z8q5d8ck7dfanpmqap0w"; + { kver = "4.7"; + grrev = "201608131240"; + sha256 = "0bcng47xk5nf4xwcl1l6a2nfb54b8v5piwg42nf3d99hy4si8fvd"; }; # This patch relaxes grsec constraints on the location of usermode helpers, |