From ba20363f11a68ae531886aa1ec3be43fff751082 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 17 Aug 2016 11:50:50 +0200 Subject: [PATCH] grsecurity: 4.7-201608151842 -> 4.7.1-201608161813 --- pkgs/os-specific/linux/kernel/linux-grsecurity.nix | 5 ++--- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix index bce591f44d3..ad14eb20a63 100644 --- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix +++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix @@ -1,13 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.7"; - modDirVersion = "4.7.0-grsec"; + version = "4.7.1"; extraMeta.branch = "4.7"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "042z53ik3mqaqlfrn5b70kw882fwd42zanqld10s1vcs438w742i"; + sha256 = "0dl1zc4xb8lwrryrpwfqmbnwciypzpah8vkhsl5nx0l3qcck6n15"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index d92fd1b1a72..96fb00a1816 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.7"; - grrev = "201608151842"; - sha256 = "0hzzkmhqamj2010dfyz0hkc0hmcap672yhrvaarkp5d1zzbnkpgz"; + { kver = "4.7.1"; + grrev = "201608161813"; + sha256 = "0ppay8gv7ml7kajbin7gclhrpkmc6pggxcbzzngm7qwdjjk5pppj"; }; # This patch relaxes grsec constraints on the location of usermode helpers,