diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-07-09 15:09:01 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-07-09 15:10:12 +0200 |
| commit | 5c9f437d2fc1409fd5281458fe66c07817078d77 (patch) | |
| tree | d34c6147cec31e9e40b8c1f94ed74fe0f9810706 /pkgs/os-specific | |
| parent | 0109c5a6fb6a5862f55816d95889056fc2c9a7b7 (diff) | |
| download | nixpkgs-5c9f437d2fc1409fd5281458fe66c07817078d77.tar nixpkgs-5c9f437d2fc1409fd5281458fe66c07817078d77.tar.gz nixpkgs-5c9f437d2fc1409fd5281458fe66c07817078d77.tar.bz2 nixpkgs-5c9f437d2fc1409fd5281458fe66c07817078d77.tar.lz nixpkgs-5c9f437d2fc1409fd5281458fe66c07817078d77.tar.xz nixpkgs-5c9f437d2fc1409fd5281458fe66c07817078d77.tar.zst nixpkgs-5c9f437d2fc1409fd5281458fe66c07817078d77.zip | |
linux: 3.14.46 -> 3.14.47
CVE-2014-7822
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-3.14.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/patches.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index 103fbcbcfb9..90a6a59ed4a 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.14.46"; + 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 = "1ran8fi1ldc89x3gpxwkkfl64mln4sl0rq5bbl8imlca5nljmzkb"; + sha256 = "1hh24p0axh0kn49b0rqfmb1h74a0ry1pgy0ps1hgxs5x3lxby783"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index ed202d77b38..d305359061a 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -65,10 +65,10 @@ rec { }; grsecurity_stable = grsecPatch - { kversion = "3.14.46"; - revision = "201506300711"; + { kversion = "3.14.47"; + revision = "201507050832"; branch = "stable"; - sha256 = "0xjqh7yc4vzgbnql16aylla9b0cjh442sywp8bvkh0ny5m3rj64l"; + sha256 = "0sv7aa7ca2n5jiz4j5vvji1x2p7cb1ah71h1iqmk0981dqs0isp8"; }; grsecurity_unstable = grsecPatch |