diff options
Diffstat (limited to 'pkgs/os-specific/linux/kernel/patches.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/patches.nix | 40 |
1 files changed, 9 insertions, 31 deletions
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 14b0692dbada0..8e198e7a3ed94 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -22,10 +22,11 @@ let assert kversion == kernel.version; { name = "grsecurity-${grversion}-${kversion}"; inherit grversion kernel patches kversion revision; + # When updating versions/hashes, ALWAYS use the official version; we use + # this mirror only because upstream removes sources files immediately upon + # releasing a new version ... patch = fetchurl { - url = if branch == "stable" - then "https://github.com/kdave/grsecurity-patches/blob/master/grsecurity_patches/grsecurity-${grversion}-${kversion}-${revision}.patch?raw=true" - else "https://github.com/slashbeast/grsecurity-scrape/blob/master/${branch}/grsecurity-${grversion}-${kversion}-${revision}.patch?raw=true"; + url = "https://raw.githubusercontent.com/slashbeast/grsecurity-scrape/master/test/grsecurity-${grversion}-${kversion}-${revision}.patch"; inherit sha256; }; features.grsecurity = true; @@ -87,43 +88,20 @@ rec { sha256 = "00b1rqgd4yr206dxp4mcymr56ymbjcjfa4m82pxw73khj032qw3j"; }; - grsecurity_3_14 = grsecPatch - { kernel = pkgs.grsecurity_base_linux_3_14; - patches = [ grsecurity_fix_path_3_14 ]; - kversion = "3.14.51"; - revision = "201508181951"; - branch = "stable"; - sha256 = "1sp1gwa7ahzflq7ayb51bg52abrn5zx1hb3pff3axpjqq7vfai6f"; - }; + grsecurity_3_14 = throw "grsecurity stable is no longer supported"; - grsecurity_4_4 = grsecPatch - { kernel = pkgs.grsecurity_base_linux_4_4; - patches = [ grsecurity_fix_path_4_4 ]; - kversion = "4.4.5"; - revision = "201603131305"; - sha256 = "04k4nhshl6r5n41ha5620s7cd70dmmmvyf9mnn5359jr1720kxpf"; - }; + grsecurity_4_4 = throw "grsecurity stable is no longer supported"; grsecurity_4_5 = grsecPatch { kernel = pkgs.grsecurity_base_linux_4_5; patches = [ grsecurity_fix_path_4_5 ]; - kversion = "4.5.2"; - revision = "201604290633"; - sha256 = "0qrs4fk6lyqngq3fnsmrv0y3yp1lrbiwadfc6v7hy4lyv77wz107"; + kversion = "4.5.4"; + revision = "201605131918"; + sha256 = "0f5s8lj6zc4jp2cpxm7r891px3dmb6m3ximfigwq809yydg5aimv"; }; grsecurity_latest = grsecurity_4_5; - grsecurity_fix_path_3_14 = - { name = "grsecurity-fix-path-3.14"; - patch = ./grsecurity-path-3.14.patch; - }; - - grsecurity_fix_path_4_4 = - { name = "grsecurity-fix-path-4.4"; - patch = ./grsecurity-path-4.4.patch; - }; - grsecurity_fix_path_4_5 = { name = "grsecurity-fix-path-4.5"; patch = ./grsecurity-path-4.5.patch; |