mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-08-26 02:05:02 +00:00
linux: 3.14.46 -> 3.14.47
CVE-2014-7822
(cherry picked from commit 5c9f437d2f)
Conflicts:
pkgs/os-specific/linux/kernel/linux-3.14.nix
pkgs/os-specific/linux/kernel/patches.nix
This commit is contained in:
@@ -1,13 +1,13 @@
|
||||
{ stdenv, fetchurl, ... } @ args:
|
||||
|
||||
import ./generic.nix (args // rec {
|
||||
version = "3.14.44";
|
||||
version = "3.14.47";
|
||||
# Remember to update grsecurity!
|
||||
extraMeta.branch = "3.14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
|
||||
sha256 = "1kgzvdrxslrmb10cwx64qvzijq41kgiz8qy5xpa858mkynq8ydg8";
|
||||
sha256 = "1hh24p0axh0kn49b0rqfmb1h74a0ry1pgy0ps1hgxs5x3lxby783";
|
||||
};
|
||||
|
||||
features.iwlwifi = true;
|
||||
|
||||
@@ -60,10 +60,10 @@ rec {
|
||||
};
|
||||
|
||||
grsecurity_stable = grsecPatch
|
||||
{ kversion = "3.14.43";
|
||||
revision = "201505191737";
|
||||
{ kversion = "3.14.47";
|
||||
revision = "201507050832";
|
||||
branch = "stable";
|
||||
sha256 = "1ijrqmdwpdbkp10lhjw8msv0y02d98v5xgq6xb62ksrdb6k27fiw";
|
||||
sha256 = "0sv7aa7ca2n5jiz4j5vvji1x2p7cb1ah71h1iqmk0981dqs0isp8";
|
||||
};
|
||||
|
||||
grsecurity_unstable = grsecPatch
|
||||
|
||||
Reference in New Issue
Block a user