diff options
| author | Ricardo M. Correia <rcorreia@wizy.org> | 2014-04-21 18:37:35 +0200 |
|---|---|---|
| committer | Ricardo M. Correia <rcorreia@wizy.org> | 2014-04-21 18:46:41 +0200 |
| commit | 5d5ca7b26030d8ec96138985d20508909c2c690d (patch) | |
| tree | 3adbdb597fd06da0a88bfc5477c1e6e1c90c320c | |
| parent | 19e9d25e8feedab55ab493f9da349c5ec80687aa (diff) | |
| download | nixlib-5d5ca7b26030d8ec96138985d20508909c2c690d.tar nixlib-5d5ca7b26030d8ec96138985d20508909c2c690d.tar.gz nixlib-5d5ca7b26030d8ec96138985d20508909c2c690d.tar.bz2 nixlib-5d5ca7b26030d8ec96138985d20508909c2c690d.tar.lz nixlib-5d5ca7b26030d8ec96138985d20508909c2c690d.tar.xz nixlib-5d5ca7b26030d8ec96138985d20508909c2c690d.tar.zst nixlib-5d5ca7b26030d8ec96138985d20508909c2c690d.zip | |
grsecurity: Update all patches
stable: 3.0-3.2.57-201404131252 -> 3.0-3.2.57-201404182109 test: 3.0-3.13.10-201404141717 -> 3.0-3.14.1-201404201132 vserver: 3.0-3.2.57-vs2.3.2.16-201404131253 -> 3.0-3.2.57-vs2.3.2.16-201404182110
| -rw-r--r-- | nixos/modules/security/grsecurity.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/patches.nix | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix index 90462a2d6d0d..e6db05e11f43 100644 --- a/nixos/modules/security/grsecurity.nix +++ b/nixos/modules/security/grsecurity.nix @@ -14,7 +14,7 @@ let stable-patch = with pkgs.kernelPatches; if cfg.vserver then grsecurity_vserver else grsecurity_stable; stableKernel = mkKernel pkgs.linux_3_2 stable-patch; - testKernel = mkKernel pkgs.linux_3_13 pkgs.kernelPatches.grsecurity_unstable; + testKernel = mkKernel pkgs.linux_3_14 pkgs.kernelPatches.grsecurity_unstable; ## -- grsecurity configuration ----------------------------------------------- diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index f42bf440c3b9..9f07d9428a8f 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -86,23 +86,23 @@ rec { grsecurity_stable = grsecPatch { kversion = "3.2.57"; - revision = "201404131252"; + revision = "201404182109"; branch = "stable"; - sha256 = "1yic257h2vy3175c34i54873lc93y0m57rw1d059wz1wxy9waiwl"; + sha256 = "1gnyxbwic9f847dz6kqp8d03nspbzb976ljv9ri7f78ydpskij6x"; }; grsecurity_vserver = grsecPatch { kversion = "3.2.57"; - revision = "vs2.3.2.16-201404131253"; + revision = "vs2.3.2.16-201404182110"; branch = "vserver"; - sha256 = "0grhd9hbk952dwr91syi5pda1iccmcd8s0l3ki13689z8ns35f7k"; + sha256 = "05ydjal2w33j6jbi0bm8k7669j0hhgg2mjg23r6gzaln73fg1gww"; }; grsecurity_unstable = grsecPatch - { kversion = "3.13.10"; - revision = "201404141717"; + { kversion = "3.14.1"; + revision = "201404201132"; branch = "test"; - sha256 = "1vraf9g7za0syx5c1x1ks7kgaxc9mjspy6pvgrs0vi326v12sqnx"; + sha256 = "1xydv1846gl98jcnzlydhsy75qqcq9h3krhb7r9zn21vjj7jga9p"; }; grsec_fix_path = |