From 18f65f3640e49c119d984444223a436ac9d91fad Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 20 Feb 2014 19:55:45 -0600 Subject: [PATCH] grsecurity: stable/testing updates - stable: 3.0-3.2.55-201402192249 -> 3.0-3.2.55-201402201903 - testing: 3.0-3.13.3-201402192252 -> 3.0-3.13.4-201402201908 Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/kernel/patches.nix | 12 ++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index d14a124dd05..49d0d37586c 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -81,19 +81,19 @@ rec { grsecurity_3_0_3_2_55 = { name = "grsecurity-3.0-3.2.55"; patch = fetchurl { - url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201402192249.patch; - sha256 = "16q531j9gphqgqw6v0g45l9hzpz6gnsmh72b9435xs3pjwz1wp44"; + url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201402201903.patch; + sha256 = "01kvs5z4ia5d5s4z8kfqyvh06qlw4v14hfll9n9qav6z8s5wyx10"; }; features.grsecurity = true; # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.54 features.apparmor = true; }; - grsecurity_3_0_3_13_3 = - { name = "grsecurity-3.0-3.13.3"; + grsecurity_3_0_3_13_4 = + { name = "grsecurity-3.0-3.13.4"; patch = fetchurl { - url = http://grsecurity.net/test/grsecurity-3.0-3.13.3-201402192252.patch; - sha256 = "09f2ym9hyfff83yvaflj7zzk78c2xw4xvn70bj1x3ybawv3sw83k"; + url = http://grsecurity.net/test/grsecurity-3.0-3.13.4-201402201908.patch; + sha256 = "140rp57hzbjljhcgvdcczfhw0ghyw1x1ga2xv5ma2pk3dml158lh"; }; features.grsecurity = true; # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.2 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f19613bd88b..53326d6e6fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6695,7 +6695,7 @@ let })) (args: grsecurityOverrider args)); linux_3_13_grsecurity = lowPrio (lib.overrideDerivation (linux_3_13.override (args: { - kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_3 kernelPatches.grsec_path ]; + kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_4 kernelPatches.grsec_path ]; argsOverride = { modDirVersion = "${linux_3_13.modDirVersion}-grsec"; };