public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kernelmptcp: 0.91.3 -> 0.92.1

Browse Source
This commit is contained in:
Matthieu Coudron 2017-09-07 03:29:36 +02:00 committed by Robin Gloster
parent 1fc6f4695c
commit 7dce131b86
3 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/os-specific/linux/kernel/linux-mptcp.nix
View File

@ -1,18 +1,18 @@
{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec { import ./generic.nix (args // rec {
mptcpVersion = "0.91.3"; mptcpVersion = "0.92.1";
modDirVersion = "4.1.38"; modDirVersion = "4.4.83";
version = "${modDirVersion}-mptcp_v${mptcpVersion}"; version = "${modDirVersion}-mptcp_v${mptcpVersion}";
extraMeta = { extraMeta = {
branch = "4.1"; branch = "4.4";
maintainers = [ stdenv.lib.maintainers.layus ]; maintainers = with stdenv.lib.maintainers; [ teto layus ];
}; };
src = fetchurl { src = fetchurl {
url = "https://github.com/multipath-tcp/mptcp/archive/v${mptcpVersion}.tar.gz"; url = "https://github.com/multipath-tcp/mptcp/archive/v${mptcpVersion}.tar.gz";
sha256 = "0vqjnkzcbbvyq24w3cryfmw7hhws1xqkkxqcv71szkbqqs6mcr14"; sha256 = "1afjqmxq9p5gyr6r607bx3mqpnx451kfpwlffzxwgdwnf93alngz";
}; };
extraConfig = '' extraConfig = ''

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

@ -58,15 +58,6 @@ rec {
cpu-cgroup-v2 = import ./cpu-cgroup-v2-patches; cpu-cgroup-v2 = import ./cpu-cgroup-v2-patches;
DCCP_double_free_vulnerability_CVE-2017-6074 = rec
{ name = "DCCP_double_free_vulnerability_CVE-2017-6074.patch";
patch = fetchpatch {
inherit name;
url = "https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=5edabca9d4cff7f1f2b68f0bac55ef99d9798ba4";
sha256 = "10dmv3d3gj8rvj9h40js4jh8xbr5wyaqiy0kd819mya441mj8ll2";
};
};
tag_hardened = rec { tag_hardened = rec {
name = "tag-hardened"; name = "tag-hardened";
patch = ./tag-hardened.patch; patch = ./tag-hardened.patch;

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

@ -12394,11 +12394,12 @@ with pkgs;
}; };
}; };
# linux mptcp is based on the 4.4 kernel
linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix { linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix {
kernelPatches = kernelPatches =
[ kernelPatches.bridge_stp_helper [ kernelPatches.bridge_stp_helper
kernelPatches.p9_fixes kernelPatches.p9_fixes
kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074 kernelPatches.cpu-cgroup-v2."4.4"
] ]
++ lib.optionals ((platform.kernelArch or null) == "mips") ++ lib.optionals ((platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu [ kernelPatches.mips_fpureg_emu