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

Merge pull request #24253 from layus/mptcp-v91.3

Browse Source 
linux_mptcp: 0.91.2 -> 0.91.3 (kernel 4.1.38)
This commit is contained in:
Michael Raskin 2017-05-01 01:07:29 +02:00 committed by GitHub
commit ff84e3ed92
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,8 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args: { stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec { import ./generic.nix (args // rec {
mptcpVersion = "0.91.2"; mptcpVersion = "0.91.3";
modDirVersion = "4.1.35"; modDirVersion = "4.1.38";
version = "${modDirVersion}-mptcp_v${mptcpVersion}"; version = "${modDirVersion}-mptcp_v${mptcpVersion}";
extraMeta = { extraMeta = {
@ -12,7 +12,7 @@ import ./generic.nix (args // rec {
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 = "1jfxycg8i99ry2cr2ksarvqjzlr46sp192wkpb4sb2mynbzf3dmk"; sha256 = "0vqjnkzcbbvyq24w3cryfmw7hhws1xqkkxqcv71szkbqqs6mcr14";
}; };
kernelPatches = args.kernelPatches; kernelPatches = args.kernelPatches;

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

@ -11642,7 +11642,6 @@ with pkgs;
kernelPatches = kernelPatches =
[ kernelPatches.bridge_stp_helper [ kernelPatches.bridge_stp_helper
kernelPatches.p9_fixes kernelPatches.p9_fixes
kernelPatches.packet_fix_race_condition_CVE_2016_8655
kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074 kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074
] ]
++ lib.optionals ((platform.kernelArch or null) == "mips") ++ lib.optionals ((platform.kernelArch or null) == "mips")