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

Merge #1654: grsecurity: fix build and update

Browse Source
This commit is contained in:
Vladimír Čunát 2014-02-08 17:46:27 +01:00
commit 94ae555c06
4 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/kernel/linux-3.13.nix
View File

@ -13,4 +13,4 @@ import ./generic.nix (args // rec {
features.needsCifsUtils = true; features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true; features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true; features.netfilterRPFilter = true;
}) } // (args.argsOverride or {}))

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

@ -9,4 +9,4 @@ import ./generic.nix (args // rec {
}; };
features.iwlwifi = true; features.iwlwifi = true;
}) } // (args.argsOverride or {}))

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

@ -81,22 +81,22 @@ rec {
grsecurity_3_0_3_2_54 = grsecurity_3_0_3_2_54 =
{ name = "grsecurity-3.0-3.2.54"; { name = "grsecurity-3.0-3.2.54";
patch = fetchurl { patch = fetchurl {
url = https://grsecurity.net/stable/grsecurity-3.0-3.2.54-201401191012.patch; url = https://grsecurity.net/stable/grsecurity-3.0-3.2.54-201402062221.patch;
sha256 = "10kfdk46fgd1awys8f8520w7kanc4m0ckn28xg36473fi76i6snx"; sha256 = "14x887xibl7d50a1pxmi0snnwcnh27z8bnidhxg2xfasxxp248m5";
}; };
features.grsecurity = true; 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.54
features.apparmor = true; features.apparmor = true;
}; };
grsecurity_3_0_3_12_8 = grsecurity_3_0_3_13_2 =
{ name = "grsecurity-3.0-3.12.8"; { name = "grsecurity-3.0-3.13.2";
patch = fetchurl { patch = fetchurl {
url = https://grsecurity.net/test/grsecurity-3.0-3.12.8-201401191015.patch; url = https://grsecurity.net/test/grsecurity-3.0-3.13.2-201402062224.patch;
sha256 = "0dy7daar873jp0afkf48l8ij1ii8cgcc9z5pn50h1fvhc9ap1j4f"; sha256 = "0w42d76bv7yzpr23bicsadf64csbmq988kmpzxg4yv5qwzhhbyh7";
}; };
features.grsecurity = true; features.grsecurity = true;
# The grsec kernel patch seems to include the apparmor patches as of 3.0-3.12.8 # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.2
features.apparmor = true; features.apparmor = true;
}; };

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

@ -6661,13 +6661,17 @@ let
# config options you need (e.g. by overriding extraConfig). See list of options here: # 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 # https://en.wikibooks.org/wiki/Grsecurity/Appendix/Grsecurity_and_PaX_Configuration_Options
linux_3_2_grsecurity = lowPrio (lib.overrideDerivation (linux_3_2.override (args: { 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_54 kernelPatches.grsec_path ]; kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_54 kernelPatches.grsec_path ];
argsOverride = {
modDirVersion = "${linux_3_2.modDirVersion}-grsec";
};
})) (args: grsecurityOverrider args)); })) (args: grsecurityOverrider args));
linux_3_12_grsecurity = lowPrio (lib.overrideDerivation (linux_3_12.override (args: { linux_3_13_grsecurity = lowPrio (lib.overrideDerivation (linux_3_13.override (args: {
modDirVersion = "${linux_3_12.version}-grsec"; kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_2 kernelPatches.grsec_path ];
kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_12_8 kernelPatches.grsec_path ]; argsOverride = {
modDirVersion = "${linux_3_13.modDirVersion}-grsec";
};
})) (args: grsecurityOverrider args)); })) (args: grsecurityOverrider args));
linux_3_2_apparmor = lowPrio (linux_3_2.override { linux_3_2_apparmor = lowPrio (linux_3_2.override {
@ -6851,7 +6855,7 @@ let
linuxPackages_3_10_tuxonice = linuxPackagesFor pkgs.linux_3_10_tuxonice linuxPackages_3_10_tuxonice; linuxPackages_3_10_tuxonice = linuxPackagesFor pkgs.linux_3_10_tuxonice linuxPackages_3_10_tuxonice;
linuxPackages_3_11 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_11 linuxPackages_3_11); linuxPackages_3_11 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_11 linuxPackages_3_11);
linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12); linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12);
linuxPackages_3_12_grsecurity = linuxPackagesFor pkgs.linux_3_12_grsecurity linuxPackages_3_12_grsecurity; linuxPackages_3_13_grsecurity = linuxPackagesFor pkgs.linux_3_13_grsecurity linuxPackages_3_13_grsecurity;
linuxPackages_3_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_13 linuxPackages_3_13); linuxPackages_3_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_13 linuxPackages_3_13);
# Update this when adding a new version! # Update this when adding a new version!
linuxPackages_latest = pkgs.linuxPackages_3_13; linuxPackages_latest = pkgs.linuxPackages_3_13;