From 911f33227940aa7a5d446827af52c4887b7834fd Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Wed, 26 Mar 2014 21:21:05 +0100 Subject: [PATCH] grsecurity: Update stable and test patches stable: 3.0-3.2.55-201403202347 -> 3.0-3.2.55-201403252026 test: 3.0-3.13.6-201403202349 -> 3.0-3.13.7-201403252047 --- pkgs/os-specific/linux/kernel/patches.nix | 14 +++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index a41290168fe0..492fe647a887 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -75,22 +75,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-201403202347.patch; - sha256 = "19fwbpnfgq7iylrd0akazmh349xvxc9saxcsiqzhficfrsc4fyd3"; + url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201403252026.patch; + sha256 = "1jfy4cfzgfixyyq5436fzwhg9ch31ynq6d5sxzajqkvmprq5kbhn"; }; features.grsecurity = true; # 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_6 = - { name = "grsecurity-3.0-3.13.6"; + grsecurity_3_0_3_13_7 = + { name = "grsecurity-3.0-3.13.7"; patch = fetchurl { - url = http://grsecurity.net/test/grsecurity-3.0-3.13.6-201403202349.patch; - sha256 = "0a1alz46k1g9nryx7qb040v5zf09ax7shj5wb0xj58gfpm67g86p"; + url = http://grsecurity.net/test/grsecurity-3.0-3.13.7-201403252047.patch; + sha256 = "0f3mhkf15fpgy28rkfkd0wnccvz2n7s21gppnksl5w9dlw8m7mib"; }; features.grsecurity = true; - # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.6 + # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.7 features.apparmor = true; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47515b4b575d..41646b7a25cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6812,7 +6812,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_6 kernelPatches.grsec_path ]; + kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_7 kernelPatches.grsec_path ]; argsOverride = { modDirVersion = "${linux_3_13.modDirVersion}-grsec"; };