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

grsecurity: Update stable and test patches

Browse Source 
stable: 3.0-3.14.27-201412211908 -> 3.0-3.14.27-201412280859
test:   3.0-3.17.7-201412211910  -> 3.0-3.18.1-201412281149
This commit is contained in:
Ricardo M. Correia 2014-12-29 00:39:04 +01:00
parent d477b4c51c
commit 1d44322d53
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/security/grsecurity.nix
View File

@ -38,7 +38,7 @@ in
type = types.bool;
default = false;
description = ''
Enable the testing grsecurity patch, based on Linux 3.17.
Enable the testing grsecurity patch, based on Linux 3.18.
'';
};
@ -227,7 +227,7 @@ in
message = ''
If grsecurity is enabled, you must select either the
stable patch (with kernel 3.14), or the testing patch (with
kernel 3.17) to continue.
kernel 3.18) to continue.
'';
}
{ assertion = (cfg.stable -> !cfg.testing) || (cfg.testing -> !cfg.stable);

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

@ -32,7 +32,7 @@ let
grKernel = if cfg.stable
then mkKernel pkgs.linux_3_14 stable-patch
else mkKernel pkgs.linux_3_17 test-patch;
else mkKernel pkgs.linux_3_18 test-patch;
## -- grsecurity configuration ---------------------------------------------

1
pkgs/os-specific/linux/kernel/linux-3.17.nix
View File

@ -2,7 +2,6 @@
import ./generic.nix (args // rec {
version = "3.17.7";
# Remember to update grsecurity!
extraMeta.branch = "3.17";
src = fetchurl {

1
pkgs/os-specific/linux/kernel/linux-3.18.nix
View File

@ -2,6 +2,7 @@
import ./generic.nix (args // rec {
version = "3.18.1";
# Remember to update grsecurity!
extraMeta.branch = "3.18";
src = fetchurl {

10
pkgs/os-specific/linux/kernel/patches.nix
View File

@ -61,16 +61,16 @@ rec {
grsecurity_stable = grsecPatch
{ kversion = "3.14.27";
revision = "201412211908";
revision = "201412280859";
branch = "stable";
sha256 = "1xs34v1k970sv4i0a9qjcgk7i4cihl2xlgp1q7v320idpxrcym3a";
sha256 = "185sq4bsgwmpq9g0g5fhm69ba875xhxha2rs0cn6n647v90rxrjk";
};
grsecurity_unstable = grsecPatch
{ kversion = "3.17.7";
revision = "201412211910";
{ kversion = "3.18.1";
revision = "201412281149";
branch = "test";
sha256 = "1s3ksf44mah398ix4ar49m6d8xwkk991pl1m8m441yhpm8h1ss3w";
sha256 = "10pq6lslfn6ck7pm1651s6pd5mqmjxvqv3iv70qrpwwb2gdhpdin";
};
grsec_fix_path =