kernelmptcp: 0.91.3 -> 0.92.1

authored by Matthieu Coudron and committed by Robin Gloster 7dce131b 1fc6f469

+7 -15
+5 -5
pkgs/os-specific/linux/kernel/linux-mptcp.nix
··· 1 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: 2 3 import ./generic.nix (args // rec { 4 - mptcpVersion = "0.91.3"; 5 - modDirVersion = "4.1.38"; 6 version = "${modDirVersion}-mptcp_v${mptcpVersion}"; 7 8 extraMeta = { 9 - branch = "4.1"; 10 - maintainers = [ stdenv.lib.maintainers.layus ]; 11 }; 12 13 src = fetchurl { 14 url = "https://github.com/multipath-tcp/mptcp/archive/v${mptcpVersion}.tar.gz"; 15 - sha256 = "0vqjnkzcbbvyq24w3cryfmw7hhws1xqkkxqcv71szkbqqs6mcr14"; 16 }; 17 18 extraConfig = ''
··· 1 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: 2 3 import ./generic.nix (args // rec { 4 + mptcpVersion = "0.92.1"; 5 + modDirVersion = "4.4.83"; 6 version = "${modDirVersion}-mptcp_v${mptcpVersion}"; 7 8 extraMeta = { 9 + branch = "4.4"; 10 + maintainers = with stdenv.lib.maintainers; [ teto layus ]; 11 }; 12 13 src = fetchurl { 14 url = "https://github.com/multipath-tcp/mptcp/archive/v${mptcpVersion}.tar.gz"; 15 + sha256 = "1afjqmxq9p5gyr6r607bx3mqpnx451kfpwlffzxwgdwnf93alngz"; 16 }; 17 18 extraConfig = ''
-9
pkgs/os-specific/linux/kernel/patches.nix
··· 58 59 cpu-cgroup-v2 = import ./cpu-cgroup-v2-patches; 60 61 - DCCP_double_free_vulnerability_CVE-2017-6074 = rec 62 - { name = "DCCP_double_free_vulnerability_CVE-2017-6074.patch"; 63 - patch = fetchpatch { 64 - inherit name; 65 - url = "https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=5edabca9d4cff7f1f2b68f0bac55ef99d9798ba4"; 66 - sha256 = "10dmv3d3gj8rvj9h40js4jh8xbr5wyaqiy0kd819mya441mj8ll2"; 67 - }; 68 - }; 69 - 70 tag_hardened = rec { 71 name = "tag-hardened"; 72 patch = ./tag-hardened.patch;
··· 58 59 cpu-cgroup-v2 = import ./cpu-cgroup-v2-patches; 60 61 tag_hardened = rec { 62 name = "tag-hardened"; 63 patch = ./tag-hardened.patch;
+2 -1
pkgs/top-level/all-packages.nix
··· 12394 }; 12395 }; 12396 12397 linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix { 12398 kernelPatches = 12399 [ kernelPatches.bridge_stp_helper 12400 kernelPatches.p9_fixes 12401 - kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074 12402 ] 12403 ++ lib.optionals ((platform.kernelArch or null) == "mips") 12404 [ kernelPatches.mips_fpureg_emu
··· 12394 }; 12395 }; 12396 12397 + # linux mptcp is based on the 4.4 kernel 12398 linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix { 12399 kernelPatches = 12400 [ kernelPatches.bridge_stp_helper 12401 kernelPatches.p9_fixes 12402 + kernelPatches.cpu-cgroup-v2."4.4" 12403 ] 12404 ++ lib.optionals ((platform.kernelArch or null) == "mips") 12405 [ kernelPatches.mips_fpureg_emu