diff options
author | William A. Kennington III <william@wkennington.com> | 2015-09-16 13:35:41 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-09-16 13:35:41 -0700 |
commit | 84505bd36a809e7c3e1d3129664cac5597477094 (patch) | |
tree | 6d3d8c2d3b1d4780421a1faa4a1e2e0b670029f4 | |
parent | 5a0759971f8667133b498e8e8d982052a52d10ad (diff) | |
download | nixlib-84505bd36a809e7c3e1d3129664cac5597477094.tar nixlib-84505bd36a809e7c3e1d3129664cac5597477094.tar.gz nixlib-84505bd36a809e7c3e1d3129664cac5597477094.tar.bz2 nixlib-84505bd36a809e7c3e1d3129664cac5597477094.tar.lz nixlib-84505bd36a809e7c3e1d3129664cac5597477094.tar.xz nixlib-84505bd36a809e7c3e1d3129664cac5597477094.tar.zst nixlib-84505bd36a809e7c3e1d3129664cac5597477094.zip |
grsecurity: Update patches
-rw-r--r-- | pkgs/os-specific/linux/kernel/patches.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 11 |
2 files changed, 11 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index b3c51dc6306e..18e73ae68d45 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -82,10 +82,10 @@ rec { }; grsecurity_unstable = grsecPatch - { kversion = "4.1.6"; - revision = "201508181953"; + { kversion = "4.1.7"; + revision = "201509131604"; branch = "test"; - sha256 = "1m227k1wb1q588vkgmngcz86k0wpzan6vra67pcx2478mabm3s89"; + sha256 = "1frfyi1pkiqc3awri3sr7xv41qxc8m2kb1yhfvj6xkrwb9li2bki"; }; grsec_fix_path = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 16ac093df43f..69198adb1b3d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9667,9 +9667,14 @@ let grPackage = opts: recurseIntoAttrs (mkGrsecurity opts).grsecPackage; # Stable kernels - linux_grsec_stable_desktop = grKernel grFlavors.linux_grsec_stable_desktop; - linux_grsec_stable_server = grKernel grFlavors.linux_grsec_stable_server; - linux_grsec_stable_server_xen = grKernel grFlavors.linux_grsec_stable_server_xen; + # This is no longer supported. Please see the official announcement on the + # grsecurity page. https://grsecurity.net/announce.php + linux_grsec_stable_desktop = throw "No longer supported due to https://grsecurity.net/announce.php. " + + "Please use linux_grsec_testing_desktop."; + linux_grsec_stable_server = throw "No longer supported due to https://grsecurity.net/announce.php. " + + "Please use linux_grsec_testing_server."; + linux_grsec_stable_server_xen = throw "No longer supporteddue to https://grsecurity.net/announce.php. " + + "Please use linux_grsec_testing_server_xen."; # Testing kernels linux_grsec_testing_desktop = grKernel grFlavors.linux_grsec_testing_desktop; |