From 72f49af65b5f0466d88cb6ed374c1c60a562c392 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Fri, 13 Sep 2013 05:01:20 +0200 Subject: [PATCH 1/2] linux: Update to 3.2.51 --- pkgs/os-specific/linux/kernel/linux-3.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index 7597a9c695ec..46c9108ec08a 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.2.50"; + version = "3.2.51"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0yg936syhay9x0qxqxdqrgi6ijdqklhqdrd8zk7l4zvgxaayaj68"; + sha256 = "1x1yk07ihfbrhsycmd44h9fn6ajg6akwgsxxdi2rk5cs8g706s63"; }; features.iwlwifi = true; From 342fcfc82f6461d20720981bc892834bafdf4677 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Thu, 29 Aug 2013 03:54:22 +0000 Subject: [PATCH 2/2] grsecurity: Update to 2.9.1-3.2.51-201309101928 --- pkgs/os-specific/linux/kernel/patches.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 561cdc8f9576..73533104ca9a 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -131,11 +131,11 @@ rec { patch = ./mips-ext3-n32.patch; }; - grsecurity_2_9_1_3_2_50 = - { name = "grsecurity-2.9.1-3.2.50"; + grsecurity_2_9_1_3_2_51 = + { name = "grsecurity-2.9.1-3.2.51"; patch = fetchurl { - url = http://grsecurity.net/stable/grsecurity-2.9.1-3.2.50-201308052151.patch; - sha256 = "178y68bx4h4r9gq1p4izbjah8vhjmb3yvr3sfjglz8blxxahgd6n"; + url = http://grsecurity.net/stable/grsecurity-2.9.1-3.2.51-201309101928.patch; + sha256 = "90f9ddc74d56f4525b8faa8505a95f45c23a2e763c7519ba5ae953069a51aca2"; }; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b6b3cad514a..16c3ad019a7a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6460,7 +6460,7 @@ let }; linux_3_2_grsecurity = lowPrio (lib.overrideDerivation (linux_3_2.override (args: { - kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_2_9_1_3_2_50 ]; + kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_2_9_1_3_2_51 ]; })) (args: { makeFlags = "DISABLE_PAX_PLUGINS=y";})); linux_3_2_apparmor = lowPrio (linux_3_2.override {