diff options
author | Ricardo M. Correia <rcorreia@wizy.org> | 2014-01-20 02:18:33 +0100 |
---|---|---|
committer | Ricardo M. Correia <rcorreia@wizy.org> | 2014-01-22 02:14:35 +0100 |
commit | aeda8d63b92dd5059f32b3b79567e714211f1c65 (patch) | |
tree | 77bee3cef3847d2e67f69f37a8b21a465aa6d632 | |
parent | fd896d09fa385481ee08cb5cf171890f624a548e (diff) | |
download | nixlib-aeda8d63b92dd5059f32b3b79567e714211f1c65.tar nixlib-aeda8d63b92dd5059f32b3b79567e714211f1c65.tar.gz nixlib-aeda8d63b92dd5059f32b3b79567e714211f1c65.tar.bz2 nixlib-aeda8d63b92dd5059f32b3b79567e714211f1c65.tar.lz nixlib-aeda8d63b92dd5059f32b3b79567e714211f1c65.tar.xz nixlib-aeda8d63b92dd5059f32b3b79567e714211f1c65.tar.zst nixlib-aeda8d63b92dd5059f32b3b79567e714211f1c65.zip |
grsecurity: Update stable and test patches
stable: 3.0-3.2.53-201312021727 -> 3.0-3.2.54-201401191012 test: 3.0-3.12.2-201312021733 -> 3.0-3.12.8-201401191015
-rw-r--r-- | pkgs/os-specific/linux/kernel/patches.nix | 20 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index efa23f67846b..8b658a6030ec 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -78,25 +78,25 @@ rec { }; - grsecurity_3_0_3_2_53 = - { name = "grsecurity-3.0-3.2.53"; + grsecurity_3_0_3_2_54 = + { name = "grsecurity-3.0-3.2.54"; patch = fetchurl { - url = https://grsecurity.net/stable/grsecurity-3.0-3.2.53-201312021727.patch; - sha256 = "1ifndcbpz552d0n2dgb38di8lhqd4x2msshdbdx33jlfdl7mk6x4"; + url = https://grsecurity.net/stable/grsecurity-3.0-3.2.54-201401191012.patch; + sha256 = "10kfdk46fgd1awys8f8520w7kanc4m0ckn28xg36473fi76i6snx"; }; features.grsecurity = true; - # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.53 + # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.54 features.apparmor = true; }; - grsecurity_3_0_3_12_2 = - { name = "grsecurity-3.0-3.12.2"; + grsecurity_3_0_3_12_8 = + { name = "grsecurity-3.0-3.12.8"; patch = fetchurl { - url = https://grsecurity.net/test/grsecurity-3.0-3.12.2-201312021733.patch; - sha256 = "0xcsq6778rk9afg3078d772iflz7p4ahvr6wdq5c4s3jyssam783"; + url = https://grsecurity.net/test/grsecurity-3.0-3.12.8-201401191015.patch; + sha256 = "0dy7daar873jp0afkf48l8ij1ii8cgcc9z5pn50h1fvhc9ap1j4f"; }; features.grsecurity = true; - # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.12.2 + # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.12.8 features.apparmor = true; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6877a71fe2d2..01b153c4ee1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6573,12 +6573,12 @@ let # https://en.wikibooks.org/wiki/Grsecurity/Appendix/Grsecurity_and_PaX_Configuration_Options linux_3_2_grsecurity = lowPrio (lib.overrideDerivation (linux_3_2.override (args: { modDirVersion = "${linux_3_2.version}-grsec"; - kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_53 kernelPatches.grsec_path ]; + kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_54 kernelPatches.grsec_path ]; })) (args: grsecurityOverrider args)); linux_3_12_grsecurity = lowPrio (lib.overrideDerivation (linux_3_12.override (args: { modDirVersion = "${linux_3_12.version}-grsec"; - kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_12_2 kernelPatches.grsec_path ]; + kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_12_8 kernelPatches.grsec_path ]; })) (args: grsecurityOverrider args)); linux_3_2_apparmor = lowPrio (linux_3_2.override { |