Skip to content

grsecurity: Fix build (again) and update patches #1654

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vcunat merged 2 commits into from
Feb 8, 2014
Merged

grsecurity: Fix build (again) and update patches #1654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31fa2cd
grsecurity: Fix building grsec-3.x.0 kernels
wizeman Jan 29, 2014
b315476
grsecurity: Update stable and test patches
wizeman Jan 29, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkgs/os-specific/linux/kernel/linux-3.13.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ import ./generic.nix (args // rec {
features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true;
})
} // (args.argsOverride or {}))
2 changes: 1 addition & 1 deletion pkgs/os-specific/linux/kernel/linux-3.2.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ import ./generic.nix (args // rec {
};

features.iwlwifi = true;
})
} // (args.argsOverride or {}))
14 changes: 7 additions & 7 deletions pkgs/os-specific/linux/kernel/patches.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,22 +81,22 @@ rec {
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.54-201401191012.patch;
sha256 = "10kfdk46fgd1awys8f8520w7kanc4m0ckn28xg36473fi76i6snx";
url = https://grsecurity.net/stable/grsecurity-3.0-3.2.54-201402062221.patch;
sha256 = "14x887xibl7d50a1pxmi0snnwcnh27z8bnidhxg2xfasxxp248m5";
};
features.grsecurity = true;
# 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_8 =
{ name = "grsecurity-3.0-3.12.8";
grsecurity_3_0_3_13_2 =
{ name = "grsecurity-3.0-3.13.2";
patch = fetchurl {
url = https://grsecurity.net/test/grsecurity-3.0-3.12.8-201401191015.patch;
sha256 = "0dy7daar873jp0afkf48l8ij1ii8cgcc9z5pn50h1fvhc9ap1j4f";
url = https://grsecurity.net/test/grsecurity-3.0-3.13.2-201402062224.patch;
sha256 = "0w42d76bv7yzpr23bicsadf64csbmq988kmpzxg4yv5qwzhhbyh7";
};
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;
};

Expand Down
14 changes: 9 additions & 5 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6660,13 +6660,17 @@ 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: {
modDirVersion = "${linux_3_2.version}-grsec";
kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_54 kernelPatches.grsec_path ];
argsOverride = {
modDirVersion = "${linux_3_2.modDirVersion}-grsec";
};
})) (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_8 kernelPatches.grsec_path ];
linux_3_13_grsecurity = lowPrio (lib.overrideDerivation (linux_3_13.override (args: {
kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_2 kernelPatches.grsec_path ];
argsOverride = {
modDirVersion = "${linux_3_13.modDirVersion}-grsec";
};
})) (args: grsecurityOverrider args));

linux_3_2_apparmor = lowPrio (linux_3_2.override {
Expand Down Expand Up @@ -6850,7 +6854,7 @@ let
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_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);
# Update this when adding a new version!
linuxPackages_latest = pkgs.linuxPackages_3_13;
Expand Down