pyrox.dev
linux_mptcp: 0.90.1 (kernel 3.18) -> 0.91 (kernel 4.1) (#17675)
authored by Guillaume Maudoux and committed by Franz Pletz b1817fa8 bd20aaa7
+6
-4
pkgs/os-specific/linux/kernel/linux-mptcp.nix
+6
-4
pkgs/os-specific/linux/kernel/linux-mptcp.nix
···
1
1
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
2
2
3
3
import ./generic.nix (args // rec {
4
-
mptcpVersion = "0.90.1";
5
-
modDirVersion = "3.18.25";
4
+
mptcpVersion = "0.91";
5
+
modDirVersion = "4.1.26";
6
6
version = "${modDirVersion}-mptcp_v${mptcpVersion}";
7
7
8
8
extraMeta = {
9
-
branch = "3.18";
9
+
branch = "4.1";
10
10
maintainers = stdenv.lib.maintainers.layus;
11
11
};
12
12
13
13
src = fetchurl {
14
14
url = "https://github.com/multipath-tcp/mptcp/archive/v${mptcpVersion}.tar.gz";
15
-
sha256 = "088cpxl960xzrsz7x2lkq28ksa4gzjb1hp5yf8hxshihyhdaspwl";
15
+
sha256 = "0rbvgz89j5wk781y201qdxy2kz4gmlamb72wdbxj8mxv92x56lh3";
16
16
};
17
+
18
+
kernelPatches = args.kernelPatches;
17
19
18
20
extraConfig = ''
19
21
IPV6 y
+4
-1
pkgs/top-level/all-packages.nix
+4
-1
pkgs/top-level/all-packages.nix
···
11074
11074
klibcShrunk = lowPrio (callPackage ../os-specific/linux/klibc/shrunk.nix { });
11075
11075
11076
11076
linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix {
11077
-
kernelPatches = [ kernelPatches.bridge_stp_helper ]
11077
+
kernelPatches =
11078
+
[ kernelPatches.bridge_stp_helper
11079
+
kernelPatches.hiddev_CVE_2016_5829
11080
+
]
11078
11081
++ lib.optionals ((platform.kernelArch or null) == "mips")
11079
11082
[ kernelPatches.mips_fpureg_emu
11080
11083
kernelPatches.mips_fpu_sigill