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

grsecurity: Push testing from 4.0 -> 4.1

Browse Source
This commit is contained in:
William A. Kennington III 2015-08-04 13:27:06 -07:00
parent b62debe042
commit a5d6e61c2f
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,7 @@ let
grKernel = if cfg.stable grKernel = if cfg.stable
then mkKernel pkgs.linux_3_14 stable-patch then mkKernel pkgs.linux_3_14 stable-patch
else mkKernel pkgs.linux_4_0 test-patch; else mkKernel pkgs.linux_4_1 test-patch;
## -- grsecurity configuration --------------------------------------------- ## -- grsecurity configuration ---------------------------------------------

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

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

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

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

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

@ -72,10 +72,10 @@ rec {
}; };
grsecurity_unstable = grsecPatch grsecurity_unstable = grsecPatch
{ kversion = "4.0.8"; { kversion = "4.1.4";
revision = "201507111211"; revision = "201508032312";
branch = "test"; branch = "test";
sha256 = "1p9ym8hbwaan9pgxgn8k4rm3n33wl8ag1fzmyr5f4mxs634wgwgx"; sha256 = "16p1wq98qgwksav0ry6b5jyyi26s404v1k0cwpj7l7n86hxig67i";
}; };
grsec_fix_path = grsec_fix_path =