diff options
| author | Ricardo M. Correia <rcorreia@wizy.org> | 2013-10-29 13:18:44 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-29 13:32:53 +0100 |
| commit | 57e9fd8bcf486a6abf4a84f62a5350eb94d6fd0d (patch) | |
| tree | 6b27e01e8fc7c4d4c9da55bf39803d93129388a7 | |
| parent | 69513d148006b6deedebe9c7c27a1a16449275c1 (diff) | |
| download | nixlib-57e9fd8bcf486a6abf4a84f62a5350eb94d6fd0d.tar nixlib-57e9fd8bcf486a6abf4a84f62a5350eb94d6fd0d.tar.gz nixlib-57e9fd8bcf486a6abf4a84f62a5350eb94d6fd0d.tar.bz2 nixlib-57e9fd8bcf486a6abf4a84f62a5350eb94d6fd0d.tar.lz nixlib-57e9fd8bcf486a6abf4a84f62a5350eb94d6fd0d.tar.xz nixlib-57e9fd8bcf486a6abf4a84f62a5350eb94d6fd0d.tar.zst nixlib-57e9fd8bcf486a6abf4a84f62a5350eb94d6fd0d.zip | |
grsecurity: Update to 2.9.1-3.2.52-201310271550
| -rw-r--r-- | pkgs/os-specific/linux/kernel/patches.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 5bda5b1f263c..613f40c6fc96 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -131,13 +131,13 @@ rec { patch = ./mips-ext3-n32.patch; }; - grsecurity_2_9_1_3_2_51 = - { name = "grsecurity-2.9.1-3.2.51"; + grsecurity_2_9_1_3_2_52 = + { name = "grsecurity-2.9.1-3.2.52"; patch = fetchurl { - url = http://grsecurity.net/stable/grsecurity-2.9.1-3.2.51-201309281102.patch; - sha256 = "0mwwdmccihzhl25c9q92x0k33c5kxbz6mikid9diramvki7sk0l8"; + url = http://grsecurity.net/stable/grsecurity-2.9.1-3.2.52-201310271550.patch; + sha256 = "08y4y323y2lfvdj67gmg3ca8gaf3snhr3pyrmgvj877avaz0475m"; }; - # The grsec kernel patch seems to include the apparmor patches as of 2.9.1-3.2.51 + # The grsec kernel patch seems to include the apparmor patches as of 2.9.1-3.2.52 features.apparmor = true; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc46e5c8002a..223f346cb120 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6607,7 +6607,7 @@ let # config options you need (e.g. by overriding extraConfig). See list of options here: # https://en.wikibooks.org/wiki/Grsecurity/Appendix/Grsecurity_and_PaX_Configuration_Options linux_3_2_grsecurity = lowPrio (lib.overrideDerivation (linux_3_2.override (args: { - kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_2_9_1_3_2_51 ]; + kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_2_9_1_3_2_52 ]; })) (args: { # Install gcc plugins. These are needed for compiling dependant packages. postInstall = '' |