ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 15:27:20 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1801 from thoughtpolice/kernel-grsec

Browse Source 
kernel: stable updates, grsecurity patch updates
This commit is contained in:
Ricardo Correia 2014-02-21 19:23:49 +01:00
commit 308015e213
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/linux/kernel/linux-3.10.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, ... } @ args: { stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec { import ./generic.nix (args // rec {
version = "3.10.30"; version = "3.10.31";
extraMeta.branch = "3.10"; extraMeta.branch = "3.10";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "0a9x27g026gvy64w2xkpkdf3kzjfzzgy0kgikdyk604zdz4ha2hm"; sha256 = "1nz8203avjjin3sivx6h6ddsramk37vp02g9lw2ix3hxji0lsz1m";
}; };
features.iwlwifi = true; features.iwlwifi = true;

4
pkgs/os-specific/linux/kernel/linux-3.12.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, ... } @ args: { stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec { import ./generic.nix (args // rec {
version = "3.12.11"; version = "3.12.12";
extraMeta.branch = "3.12"; extraMeta.branch = "3.12";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "1zqwfzb0hmx69caw54np6if2nybmin4mhxj9milfflc6z40fn06r"; sha256 = "0wndjj5bdjfl4i9s5mj9wylhspygsvnl3pnwps6d65q2jm813lrv";
}; };
features.iwlwifi = true; features.iwlwifi = true;

4
pkgs/os-specific/linux/kernel/linux-3.13.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, ... } @ args: { stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec { import ./generic.nix (args // rec {
version = "3.13.3"; version = "3.13.4";
extraMeta.branch = "3.13"; extraMeta.branch = "3.13";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "0x277h0ccdjivi16w20aj59ncazr7zs07zprazm0ph4qyffv0r4g"; sha256 = "0hzxr8gsafnyc96x5p2clgi827ahidk1hma0yd48gdx9dhynrq2r";
}; };
features.iwlwifi = true; features.iwlwifi = true;

4
pkgs/os-specific/linux/kernel/linux-3.4.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, ... } @ args: { stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec { import ./generic.nix (args // rec {
version = "3.4.80"; version = "3.4.81";
extraMeta.branch = "3.4"; extraMeta.branch = "3.4";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "1vma3bxydryhcg7iimndq4rbpzbpjvnq7qa5md6wm6iill011pil"; sha256 = "17m8b9wcsz8ryakhk8v85iknylkjlbsx69wkj1rbvqi2f1sjihx5";
}; };
features.iwlwifi = true; features.iwlwifi = true;

12
pkgs/os-specific/linux/kernel/patches.nix
View File

@ -81,19 +81,19 @@ rec {
grsecurity_3_0_3_2_55 = grsecurity_3_0_3_2_55 =
{ name = "grsecurity-3.0-3.2.55"; { name = "grsecurity-3.0-3.2.55";
patch = fetchurl { patch = fetchurl {
url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201402192249.patch; url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201402201903.patch;
sha256 = "16q531j9gphqgqw6v0g45l9hzpz6gnsmh72b9435xs3pjwz1wp44"; sha256 = "01kvs5z4ia5d5s4z8kfqyvh06qlw4v14hfll9n9qav6z8s5wyx10";
}; };
features.grsecurity = true; features.grsecurity = true;
# The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.54 # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.54
features.apparmor = true; features.apparmor = true;
}; };
grsecurity_3_0_3_13_3 = grsecurity_3_0_3_13_4 =
{ name = "grsecurity-3.0-3.13.3"; { name = "grsecurity-3.0-3.13.4";
patch = fetchurl { patch = fetchurl {
url = http://grsecurity.net/test/grsecurity-3.0-3.13.3-201402192252.patch; url = http://grsecurity.net/test/grsecurity-3.0-3.13.4-201402201908.patch;
sha256 = "09f2ym9hyfff83yvaflj7zzk78c2xw4xvn70bj1x3ybawv3sw83k"; sha256 = "140rp57hzbjljhcgvdcczfhw0ghyw1x1ga2xv5ma2pk3dml158lh";
}; };
features.grsecurity = true; features.grsecurity = true;
# The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.2 # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.2

2
pkgs/top-level/all-packages.nix
View File

@ -6699,7 +6699,7 @@ let
})) (args: grsecurityOverrider args)); })) (args: grsecurityOverrider args));
linux_3_13_grsecurity = lowPrio (lib.overrideDerivation (linux_3_13.override (args: { linux_3_13_grsecurity = lowPrio (lib.overrideDerivation (linux_3_13.override (args: {
kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_3 kernelPatches.grsec_path ]; kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_4 kernelPatches.grsec_path ];
argsOverride = { argsOverride = {
modDirVersion = "${linux_3_13.modDirVersion}-grsec"; modDirVersion = "${linux_3_13.modDirVersion}-grsec";
}; };