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

grsecurity: make GRKERNSEC y and PAX y implicit

Browse Source 
These options should always be specified. Note, an implication of this
change is that not specifying any grsec/PaX options results in a build
failure.
This commit is contained in:
Joachim Fasting 2016-10-02 18:30:15 +02:00
parent a58f5ffbb9
commit 1bb7b44cd7
No known key found for this signature in database
GPG Key ID: 7544761007FE4E08
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/security/grsecurity.xml
View File

@ -208,8 +208,6 @@
let let
kernel = pkgs.linux_grsec_nixos.override { kernel = pkgs.linux_grsec_nixos.override {
extraConfig = '' extraConfig = ''
GRKERNSEC y
PAX y
GRKERNSEC_CONFIG_AUTO y GRKERNSEC_CONFIG_AUTO y
GRKERNSEC_CONFIG_SERVER y GRKERNSEC_CONFIG_SERVER y
GRKERNSEC_CONFIG_SECURITY y GRKERNSEC_CONFIG_SECURITY y

6
pkgs/build-support/grsecurity/default.nix
View File

@ -22,7 +22,11 @@ assert (kernel.version == grsecPatch.kver);
overrideDerivation (kernel.override { overrideDerivation (kernel.override {
inherit modDirVersion; inherit modDirVersion;
kernelPatches = [ grsecPatch ] ++ kernelPatches ++ (kernel.kernelPatches or []); kernelPatches = [ grsecPatch ] ++ kernelPatches ++ (kernel.kernelPatches or []);
inherit extraConfig; extraConfig = ''
GRKERNSEC y
PAX y
${extraConfig}
'';
ignoreConfigErrors = true; ignoreConfigErrors = true;
}) (attrs: { }) (attrs: {
nativeBuildInputs = (lib.chooseDevOutputs [ gmp libmpc mpfr ]) ++ (attrs.nativeBuildInputs or []); nativeBuildInputs = (lib.chooseDevOutputs [ gmp libmpc mpfr ]) ++ (attrs.nativeBuildInputs or []);

3
pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix
View File

@ -3,9 +3,6 @@
with stdenv.lib; with stdenv.lib;
'' ''
GRKERNSEC y
PAX y
GRKERNSEC_CONFIG_AUTO y GRKERNSEC_CONFIG_AUTO y
GRKERNSEC_CONFIG_DESKTOP y GRKERNSEC_CONFIG_DESKTOP y
GRKERNSEC_CONFIG_VIRT_HOST y GRKERNSEC_CONFIG_VIRT_HOST y

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

@ -10955,8 +10955,6 @@ in
# An unsupported grsec xen guest kernel # An unsupported grsec xen guest kernel
linux_grsec_server_xen = linux_grsec_nixos.override { linux_grsec_server_xen = linux_grsec_nixos.override {
extraConfig = '' extraConfig = ''
GRKERNSEC y
PAX y
GRKERNSEC_CONFIG_AUTO y GRKERNSEC_CONFIG_AUTO y
GRKERNSEC_CONFIG_PRIORITY_SECURITY y GRKERNSEC_CONFIG_PRIORITY_SECURITY y
GRKERNSEC_CONFIG_SERVER y GRKERNSEC_CONFIG_SERVER y