MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

grsecurity: Update stable and test patches

Browse source 
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
This commit is contained in:
Ricardo M. Correia 2014-01-20 02:18:33 +01:00
parent fd896d09fa
commit aeda8d63b9
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -78,25 +78,25 @@ rec {
}; };
grsecurity_3_0_3_2_53 = grsecurity_3_0_3_2_54 =
{ name = "grsecurity-3.0-3.2.53"; { name = "grsecurity-3.0-3.2.54";
patch = fetchurl { patch = fetchurl {
url = https://grsecurity.net/stable/grsecurity-3.0-3.2.53-201312021727.patch; url = https://grsecurity.net/stable/grsecurity-3.0-3.2.54-201401191012.patch;
sha256 = "1ifndcbpz552d0n2dgb38di8lhqd4x2msshdbdx33jlfdl7mk6x4"; sha256 = "10kfdk46fgd1awys8f8520w7kanc4m0ckn28xg36473fi76i6snx";
}; };
features.grsecurity = true; 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; features.apparmor = true;
}; };
grsecurity_3_0_3_12_2 = grsecurity_3_0_3_12_8 =
{ name = "grsecurity-3.0-3.12.2"; { name = "grsecurity-3.0-3.12.8";
patch = fetchurl { patch = fetchurl {
url = https://grsecurity.net/test/grsecurity-3.0-3.12.2-201312021733.patch; url = https://grsecurity.net/test/grsecurity-3.0-3.12.8-201401191015.patch;
sha256 = "0xcsq6778rk9afg3078d772iflz7p4ahvr6wdq5c4s3jyssam783"; sha256 = "0dy7daar873jp0afkf48l8ij1ii8cgcc9z5pn50h1fvhc9ap1j4f";
}; };
features.grsecurity = true; 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; features.apparmor = true;
}; };

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

@ -6573,12 +6573,12 @@ let
# 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"; 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)); })) (args: grsecurityOverrider args));
linux_3_12_grsecurity = lowPrio (lib.overrideDerivation (linux_3_12.override (args: { linux_3_12_grsecurity = lowPrio (lib.overrideDerivation (linux_3_12.override (args: {
modDirVersion = "${linux_3_12.version}-grsec"; 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)); })) (args: grsecurityOverrider args));
linux_3_2_apparmor = lowPrio (linux_3_2.override { linux_3_2_apparmor = lowPrio (linux_3_2.override {