From eb9d126d2c1a8d3d52442c80b04c2d3dcda09397 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Mon, 7 Nov 2016 14:15:33 +0100 Subject: [PATCH] linux_mptcp: 0.91 -> 0.91.2 --- pkgs/os-specific/linux/kernel/linux-mptcp.nix | 6 +++--- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix index 52a52562d60..199ff9122cb 100644 --- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix +++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - mptcpVersion = "0.91"; - modDirVersion = "4.1.26"; + mptcpVersion = "0.91.2"; + modDirVersion = "4.1.35"; version = "${modDirVersion}-mptcp_v${mptcpVersion}"; extraMeta = { @@ -12,7 +12,7 @@ import ./generic.nix (args // rec { src = fetchurl { url = "https://github.com/multipath-tcp/mptcp/archive/v${mptcpVersion}.tar.gz"; - sha256 = "0rbvgz89j5wk781y201qdxy2kz4gmlamb72wdbxj8mxv92x56lh3"; + sha256 = "1jfxycg8i99ry2cr2ksarvqjzlr46sp192wkpb4sb2mynbzf3dmk"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cac69528d80..1928c5fd5dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10826,7 +10826,6 @@ in linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix { kernelPatches = [ kernelPatches.bridge_stp_helper - kernelPatches.hiddev_CVE_2016_5829 ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu