From 69a83ba99f9d5f6aff7477f5074687512401f414 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Wed, 26 Feb 2014 20:35:29 +0000 Subject: [PATCH] grsecurity: Update stable and test patches stable: 3.0-3.2.55-201402221305 -> 3.0-3.2.55-201402241936 test: 3.0-3.13.4-201402221308 -> 3.0-3.13.5-201402241943 --- pkgs/os-specific/linux/kernel/patches.nix | 16 ++++++++-------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 49fa176d783..a5a8cbff0ba 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -81,22 +81,22 @@ 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-201402221305.patch; - sha256 = "0g6mqbmjmqz4xh18cq5mn3d0zlzjlk76x0lmpwbrcapdcg5apcp5"; + url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201402241936.patch; + sha256 = "0kd6bc9kyvn8y6b32fpn778hc8xfm2y4wmpiglia6dqybpyry600"; }; features.grsecurity = true; - # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.54 + # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.55 features.apparmor = true; }; - grsecurity_3_0_3_13_4 = - { name = "grsecurity-3.0-3.13.4"; + grsecurity_3_0_3_13_5 = + { name = "grsecurity-3.0-3.13.5"; patch = fetchurl { - url = http://grsecurity.net/test/grsecurity-3.0-3.13.4-201402221308.patch; - sha256 = "0783an79485wwbsvcf8ggsmc2bwsbj1i7q6r8g22b19i9hzqmr64"; + url = http://grsecurity.net/test/grsecurity-3.0-3.13.5-201402241943.patch; + sha256 = "1xv4plviarjprg7bcb4h88wsbrj7x2biypibhzb1pifksmxx25fn"; }; features.grsecurity = true; - # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.2 + # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.5 features.apparmor = true; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 08854c2974a..d73e535911f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6710,7 +6710,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_4 kernelPatches.grsec_path ]; + kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_5 kernelPatches.grsec_path ]; argsOverride = { modDirVersion = "${linux_3_13.modDirVersion}-grsec"; };