diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2017-05-01 01:07:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-01 01:07:29 +0200 |
| commit | ff84e3ed92779fb36f68ec2f767e89ecd6d14b5c (patch) | |
| tree | 6a176476b4db98d73b7b04e8c9b0ce8154da3789 | |
| parent | 65220cb2e71f1976284427137f6c69563c0c4e99 (diff) | |
| parent | d2384d6f996ad9fd9f839fa2d1122a47b633ef5e (diff) | |
| download | nixlib-ff84e3ed92779fb36f68ec2f767e89ecd6d14b5c.tar nixlib-ff84e3ed92779fb36f68ec2f767e89ecd6d14b5c.tar.gz nixlib-ff84e3ed92779fb36f68ec2f767e89ecd6d14b5c.tar.bz2 nixlib-ff84e3ed92779fb36f68ec2f767e89ecd6d14b5c.tar.lz nixlib-ff84e3ed92779fb36f68ec2f767e89ecd6d14b5c.tar.xz nixlib-ff84e3ed92779fb36f68ec2f767e89ecd6d14b5c.tar.zst nixlib-ff84e3ed92779fb36f68ec2f767e89ecd6d14b5c.zip | |
Merge pull request #24253 from layus/mptcp-v91.3
linux_mptcp: 0.91.2 -> 0.91.3 (kernel 4.1.38)
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-mptcp.nix | 6 | ||||
| -rw-r--r-- | 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 e533670014b3..3d244b794e94 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.2"; - modDirVersion = "4.1.35"; + mptcpVersion = "0.91.3"; + modDirVersion = "4.1.38"; 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 = "1jfxycg8i99ry2cr2ksarvqjzlr46sp192wkpb4sb2mynbzf3dmk"; + sha256 = "0vqjnkzcbbvyq24w3cryfmw7hhws1xqkkxqcv71szkbqqs6mcr14"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa67db9757ff..3e0f81e431f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11642,7 +11642,6 @@ with pkgs; kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.p9_fixes - kernelPatches.packet_fix_race_condition_CVE_2016_8655 kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074 ] ++ lib.optionals ((platform.kernelArch or null) == "mips") |