JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #1325: linux-3.2 and grsecurity updates

Browse Source
This commit is contained in:
Vladimír Čunát 2013-12-05 23:20:18 +01:00
commit 3d3b19d767
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/linux/kernel/linux-3.2.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
version = "3.2.52";
version = "3.2.53";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "1wpr5xs6vg0xjlzrlbkv7bjvv34psw57crkdh4lybghi4rgrmkzl";
sha256 = "1fvg76g3ixyz8spzzmw5gdfr0ni9wzi2g745vphknnd9a9rgwjdm";
};
features.iwlwifi = true;

20
pkgs/os-specific/linux/kernel/patches.nix
View File

@ -124,25 +124,25 @@ rec {
};
grsecurity_3_0_3_2_52 =
{ name = "grsecurity-3.0-3.2.52";
grsecurity_3_0_3_2_53 =
{ name = "grsecurity-3.0-3.2.53";
patch = fetchurl {
url = https://grsecurity.net/stable/grsecurity-3.0-3.2.52-201311261307.patch;
sha256 = "1zmzgjpbq90q2w3yl3dgdc79qan7qkh5w6g3y3nvzr6ww6jl8hqw";
url = https://grsecurity.net/stable/grsecurity-3.0-3.2.53-201312021727.patch;
sha256 = "1ifndcbpz552d0n2dgb38di8lhqd4x2msshdbdx33jlfdl7mk6x4";
};
features.grsecurity = true;
# The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.52
# The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.53
features.apparmor = true;
};
grsecurity_3_0_3_12_1 =
{ name = "grsecurity-3.0-3.12.1";
grsecurity_3_0_3_12_2 =
{ name = "grsecurity-3.0-3.12.2";
patch = fetchurl {
url = https://grsecurity.net/test/grsecurity-3.0-3.12.1-201311261309.patch;
sha256 = "129q740m2iivc4i9a465lvzcph9gxlivxzg2p9dsi7c136p42mdz";
url = https://grsecurity.net/test/grsecurity-3.0-3.12.2-201312021733.patch;
sha256 = "0xcsq6778rk9afg3078d772iflz7p4ahvr6wdq5c4s3jyssam783";
};
features.grsecurity = true;
# The grsec kernel patch seems to include the apparmor patches as of 3.0-3.12.1
# The grsec kernel patch seems to include the apparmor patches as of 3.0-3.12.2
features.apparmor = true;
};

4
pkgs/top-level/all-packages.nix
View File

@ -6705,11 +6705,11 @@ 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_3_0_3_2_52 kernelPatches.grsec_path ];
kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_53 kernelPatches.grsec_path ];
})) (args: grsecurityOverrider args));
linux_3_12_grsecurity = lowPrio (lib.overrideDerivation (linux_3_12.override (args: {
kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_12_1 kernelPatches.grsec_path ];
kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_12_2 kernelPatches.grsec_path ];
})) (args: grsecurityOverrider args));
linux_3_2_apparmor = lowPrio (linux_3_2.override {