From 085ba8376c58f5dbc962dd29ef6f23eb928af6d0 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 21 Jun 2021 18:42:38 +0000 Subject: [PATCH 1/8] linux: 5.10.44 -> 5.10.45 (cherry picked from commit 67ff76420c76413c31482c6677b8051e2989fe8d) --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 7606af51276..e11b5db3d30 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.44"; + version = "5.10.45"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0ry7hfcj07xc6l9mrm5f0ylz54ca3aklgf9x6plf2k45kjjyzgkp"; + sha256 = "01rmw5rnxyybr8sh0v9rgamrg71ign2nr7m0ilrq9704k6dj9dzj"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ]; From 257571a90810f7ba61d020cefc32a4e29fede1cc Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 21 Jun 2021 18:42:45 +0000 Subject: [PATCH 2/8] linux: 5.12.11 -> 5.12.12 (cherry picked from commit c4df7bfef79a71d7c12b40a3cae4e3272db97b2d) --- pkgs/os-specific/linux/kernel/linux-5.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.12.nix b/pkgs/os-specific/linux/kernel/linux-5.12.nix index 9c70f150e2d..5cc25f4a6da 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.12.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.12.11"; + version = "5.12.12"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0ykzyvb4c6mqcy0fl3wvpn4laj1cllsg80dxnv0gssjz6q836z5f"; + sha256 = "1a1ymbgkp8ngrkf7cfjrn56zb9qz1mm1j1pmd60g85ln7nyb4ai1"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ]; From e539ffea84dd7e59034048aed1dd4519e7a48c30 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 21 Jun 2021 18:42:52 +0000 Subject: [PATCH 3/8] linux: 5.4.126 -> 5.4.127 (cherry picked from commit 7c23102d0309360ba5649067ede6b8029cc198b3) --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 751295f435d..377a5308345 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.126"; + version = "5.4.127"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0xsjcdgiix8slykzi9c12pl5hk2fnz1bqrxxdcr79d9nmfc7kzf7"; + sha256 = "1gr89x1ymxaslp9fqcchaa7939yvhxy67z3pgskmx6z2vrd9pgd0"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ]; From f8a4c84f1bd7c5e520ba7e79e6bdf74fbb5d6fc4 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 21 Jun 2021 18:43:13 +0000 Subject: [PATCH 4/8] linux_latest-libre: 18115 -> 18132 (cherry picked from commit c43cd094c7eaf1e5c373658061f14e9a43f759a9) --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 2001b350ecc..76b5c1cf146 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "18115"; - sha256 = "00wsxlhz7lc4qk7jcgshb05hvv3mm4m8r3zalc9wvp4r1r6xbbjp"; + rev = "18132"; + sha256 = "01mgpfx5cddq4bgffydkxpm3xlgf7zfjr1c1icsyn7f2pibd114q"; } , ... }: From 33ec269818dfdafc7ab46ac8c11db12883bf9e10 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 21 Jun 2021 18:43:23 +0000 Subject: [PATCH 5/8] linux/hardened/patches/5.10: 5.10.44-hardened1 -> 5.10.45-hardened1 (cherry picked from commit cfd71fa4b5cbb3764818878b5b304e55c4a3ab14) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 1fedb688920..279e44705e1 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -13,9 +13,9 @@ }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.44-hardened1.patch", - "sha256": "12bxv87w74lj73vqflpfk022x2ig81lfn4pf1gfanw9zxjrapw4m", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.44-hardened1/linux-hardened-5.10.44-hardened1.patch" + "name": "linux-hardened-5.10.45-hardened1.patch", + "sha256": "1382dflkv31b9apf3l0b5wcq8hyi69jm03139z3m0vbxi93pk44z", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.45-hardened1/linux-hardened-5.10.45-hardened1.patch" }, "5.12": { "extra": "-hardened1", From d2c67458d95136e7c7bfe4dfd70e2e72fc47a7e1 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 21 Jun 2021 18:43:24 +0000 Subject: [PATCH 6/8] linux/hardened/patches/5.12: 5.12.11-hardened1 -> 5.12.12-hardened1 (cherry picked from commit d1e2575c4c7114ab1f6e2f7fd0fda2918d0e7a89) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 279e44705e1..29a3d790d86 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -19,9 +19,9 @@ }, "5.12": { "extra": "-hardened1", - "name": "linux-hardened-5.12.11-hardened1.patch", - "sha256": "15qi1znszdg6c0v077k1p4gs0kbpvp6hqjcyg262yqjlpn1c7hcb", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.11-hardened1/linux-hardened-5.12.11-hardened1.patch" + "name": "linux-hardened-5.12.12-hardened1.patch", + "sha256": "10923kjxhfphsh1wr0zjj3lk16bxkq9ana4hyy8af7cn2k30k4iw", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.12-hardened1/linux-hardened-5.12.12-hardened1.patch" }, "5.4": { "extra": "-hardened1", From 1f180eafdb44a811202e4499080a3846a392d721 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 21 Jun 2021 18:43:25 +0000 Subject: [PATCH 7/8] linux/hardened/patches/5.4: 5.4.126-hardened1 -> 5.4.127-hardened1 (cherry picked from commit df60fdef552ef8a1aaaf3b63a0e7941165a2e893) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 29a3d790d86..3d3ddfc3310 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -25,8 +25,8 @@ }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.126-hardened1.patch", - "sha256": "05bjry8390iy01nfvkp12x78brgndwm5rsqhnl7yp6vwgdi0fyj1", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.126-hardened1/linux-hardened-5.4.126-hardened1.patch" + "name": "linux-hardened-5.4.127-hardened1.patch", + "sha256": "1qsz5cnm0ny138pbd9f7j5avvz69g51db7dgr1q4farrjml3nshy", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.127-hardened1/linux-hardened-5.4.127-hardened1.patch" } } From 220b8ca902cb245f89cbba4dc9d76453c466d7e1 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 21 Jun 2021 18:52:06 +0000 Subject: [PATCH 8/8] linux: fix regression in bridge VLAN configuration (cherry picked from commit 24a08441d52480cf3332a100e24fdf9b83a8351a) --- pkgs/os-specific/linux/kernel/patches.nix | 9 +++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index f41cedca0f6..48dd9b38d9b 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -102,4 +102,13 @@ name = "mac_nvme_t2"; patch = ./mac-nvme-t2.patch; }; + + rtnetlink_fix_regression_in_bridge_vlan_configuration = rec { + name = "rtnetlink_fix_regression_in_bridge_vlan_configuration"; + patch = fetchpatch { + name = name + ".patch"; + url = "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch/?id=d2e381c4963663bca6f30c3b996fa4dbafe8fcb5"; + sha256 = "0ragdi13yh5ypp9x49vrdjqx8ddh7sq7i1qjp8fyrbk3n0jdaac3"; + }; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db116204e9e..417c2e0faf8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20381,6 +20381,7 @@ in kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.rtl8761b_support + kernelPatches.rtnetlink_fix_regression_in_bridge_vlan_configuration ]; }; @@ -20395,6 +20396,7 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.rtnetlink_fix_regression_in_bridge_vlan_configuration ]; }; @@ -20402,6 +20404,7 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.rtnetlink_fix_regression_in_bridge_vlan_configuration ]; }; @@ -20461,6 +20464,7 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.rtnetlink_fix_regression_in_bridge_vlan_configuration ]; };