From 194357ad2036ba723bf8bd66ad250dfb19384c4b Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 15 Oct 2015 10:41:00 -0700 Subject: [PATCH] grsecurityUnstable: 4.1.7 -> 4.2.3 --- pkgs/build-support/grsecurity/default.nix | 2 +- pkgs/os-specific/linux/kernel/linux-4.1.nix | 1 - pkgs/os-specific/linux/kernel/linux-4.2.nix | 1 + pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix index f26291e7daae..3bf40a2e8d6b 100644 --- a/pkgs/build-support/grsecurity/default.nix +++ b/pkgs/build-support/grsecurity/default.nix @@ -33,7 +33,7 @@ let grKernel = if cfg.stable then mkKernel pkgs.linux_3_14 stable-patch - else mkKernel pkgs.linux_4_1 test-patch; + else mkKernel pkgs.linux_4_2 test-patch; ## -- grsecurity configuration --------------------------------------------- diff --git a/pkgs/os-specific/linux/kernel/linux-4.1.nix b/pkgs/os-specific/linux/kernel/linux-4.1.nix index ba0ff2a5ede6..8a1f27afb8aa 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.1.nix @@ -2,7 +2,6 @@ import ./generic.nix (args // rec { version = "4.1.10"; - # Remember to update grsecurity! extraMeta.branch = "4.1"; src = fetchurl { diff --git a/pkgs/os-specific/linux/kernel/linux-4.2.nix b/pkgs/os-specific/linux/kernel/linux-4.2.nix index a2d9b5076dd6..24df9a7eb92b 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.2.nix @@ -2,6 +2,7 @@ import ./generic.nix (args // rec { version = "4.2.3"; + # Remember to update grsecurity! extraMeta.branch = "4.2"; src = fetchurl { diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index de1b16347e16..cd34819a8489 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -87,10 +87,10 @@ rec { }; grsecurity_unstable = grsecPatch - { kversion = "4.1.7"; - revision = "201509131604"; + { kversion = "4.2.3"; + revision = "201510130858"; branch = "test"; - sha256 = "1frfyi1pkiqc3awri3sr7xv41qxc8m2kb1yhfvj6xkrwb9li2bki"; + sha256 = "0ndzcx9i94c065dlyvgykmin5bfkbydrv0kxxq52a4c9is6nlsrb"; }; grsec_fix_path =