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

tree-wide: remove uses of features.grsecurity

Browse Source
This commit is contained in:
Joachim Fasting 2017-05-12 18:38:27 +02:00
parent f7580a1f06
commit e6c65ecb12
No known key found for this signature in database
GPG Key ID: 7544761007FE4E08
8 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/config/sysctl.nix
View File

@ -60,10 +60,7 @@ in
# Hide kernel pointers (e.g. in /proc/modules) for unprivileged # Hide kernel pointers (e.g. in /proc/modules) for unprivileged
# users as these make it easier to exploit kernel vulnerabilities. # users as these make it easier to exploit kernel vulnerabilities.
# boot.kernel.sysctl."kernel.kptr_restrict" = 1;
# Removed under grsecurity.
boot.kernel.sysctl."kernel.kptr_restrict" =
if (config.boot.kernelPackages.kernel.features.grsecurity or false) then null else 1;
# Disable YAMA by default to allow easy debugging. # Disable YAMA by default to allow easy debugging.
boot.kernel.sysctl."kernel.yama.ptrace_scope" = mkDefault 0; boot.kernel.sysctl."kernel.yama.ptrace_scope" = mkDefault 0;

3
pkgs/development/libraries/accelio/default.nix
View File

@ -59,7 +59,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ wkennington ]; maintainers = with maintainers; [ wkennington ];
# kernel 4.2 is the most recent supported kernel # kernel 4.2 is the most recent supported kernel
broken = kernel != null && broken = kernel != null &&
(builtins.compareVersions kernel.version "4.2" == 1 || (builtins.compareVersions kernel.version "4.2" == 1);
(kernel.features.grsecurity or false));
}; };
} }

1
pkgs/os-specific/linux/batman-adv/default.nix
View File

@ -26,6 +26,5 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl2; license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [ viric fpletz ]; maintainers = with stdenv.lib.maintainers; [ viric fpletz ];
platforms = with stdenv.lib.platforms; linux; platforms = with stdenv.lib.platforms; linux;
broken = (kernel.features.grsecurity or false);
}; };
} }

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

@ -1,7 +1,5 @@
{ stdenv, kernel, perl }: { stdenv, kernel, perl }:
assert (!(kernel.features.grsecurity or false));
let let
baseBuildFlags = [ "INSTALL_HDR_PATH=$(out)" "headers_install" ]; baseBuildFlags = [ "INSTALL_HDR_PATH=$(out)" "headers_install" ];
in stdenv.mkDerivation { in stdenv.mkDerivation {

1
pkgs/os-specific/linux/lttng-modules/default.nix
View File

@ -31,7 +31,6 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.bjornfor ]; maintainers = [ maintainers.bjornfor ];
broken = broken =
(builtins.compareVersions kernel.version "3.18" == -1) || (builtins.compareVersions kernel.version "3.18" == -1) ||
(kernel.features.grsecurity or false) ||
(kernel.features.chromiumos or false); (kernel.features.chromiumos or false);
}; };

3
pkgs/os-specific/linux/rtl8723bs/default.nix
View File

@ -35,8 +35,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/hadess/rtl8723bs"; homepage = "https://github.com/hadess/rtl8723bs";
license = stdenv.lib.licenses.gpl2; license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
broken = (! versionAtLeast kernel.version "3.19") broken = (! versionAtLeast kernel.version "3.19");
|| (kernel.features.grsecurity or false);
maintainers = with maintainers; [ elitak ]; maintainers = with maintainers; [ elitak ];
}; };
} }

1
pkgs/os-specific/linux/rtl8812au/default.nix
View File

@ -31,6 +31,5 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/Grawp/rtl8812au_rtl8821au"; homepage = "https://github.com/Grawp/rtl8812au_rtl8821au";
license = stdenv.lib.licenses.gpl2; license = stdenv.lib.licenses.gpl2;
platforms = [ "x86_64-linux" "i686-linux" ]; platforms = [ "x86_64-linux" "i686-linux" ];
broken = (kernel.features.grsecurity or false);
}; };
} }

3
pkgs/servers/openafs-client/default.nix
View File

@ -48,7 +48,6 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.z77z ]; maintainers = [ maintainers.z77z ];
broken = broken =
(builtins.compareVersions kernel.version "3.18" == -1) || (builtins.compareVersions kernel.version "3.18" == -1) ||
(builtins.compareVersions kernel.version "4.4" != -1) || (builtins.compareVersions kernel.version "4.4" != -1);
(kernel.features.grsecurity or false);
}; };
} }