From a560026ecd7901765856790721a48bd867628845 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 26 Sep 2021 17:02:15 +0000 Subject: [PATCH 01/12] linux: 4.14.247 -> 4.14.248 (cherry picked from commit b0f3a99f00efe85145a5c537a2d25865e3f39a53) --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 8c044c2b2ec..f0e7ffccc36 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.247"; + version = "4.14.248"; # 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/v4.x/linux-${version}.tar.xz"; - sha256 = "1kdhlsqpmw68xnfiyx98id8wis6kkxca2d4n7w2ncax0kyzrwyz7"; + sha256 = "0m5nsd41b08xppcf7vvx8zgj3h3sp3n6xrgxfkccn6n4bk7yx4y9"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ]; From 6195899398fa683bea71ae4e07268d12809738bc Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 26 Sep 2021 17:02:19 +0000 Subject: [PATCH 02/12] linux: 4.19.207 -> 4.19.208 (cherry picked from commit 7fad98993cd0da2f14ea30e895f168c7eebfba40) --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index cf771bbff46..dd700a9a467 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.207"; + version = "4.19.208"; # 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/v4.x/linux-${version}.tar.xz"; - sha256 = "1fb658n89xf9asnaqi0bnh64ir2f78bdqyjvfb983qad9wqsadym"; + sha256 = "1556bk46v7pjd2xrvkldq254yc18cn9jll25ba8zig57562ahkg7"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ]; From d1df9958b64444ccc224e2d1d0219ce2b3f179b8 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 26 Sep 2021 17:02:23 +0000 Subject: [PATCH 03/12] linux: 4.4.284 -> 4.4.285 (cherry picked from commit bae26c4e05ddb2cf032e875c4a8d2ba06e44e4c0) --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 5d8f535fe4f..33afb0f9852 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.4.284"; + version = "4.4.285"; extraMeta.branch = "4.4"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "00xkd2p181cfkys4nri93xy7snmn8g2481x3qz0js7g9p3kz5bqf"; + sha256 = "0h8jzb2cg0wg4s07iqkghfxkxrnlxadwk3i3gvg2xs3ra0wrisp1"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ]; From 05e033d6f12ad728716f63c01bc61877671b165e Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 26 Sep 2021 17:02:30 +0000 Subject: [PATCH 04/12] linux: 4.9.283 -> 4.9.284 (cherry picked from commit bb9a54d5ee3c1d28e64ff0a05cd0960a4313cf93) --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 552fe143448..6128c35eb4b 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.283"; + version = "4.9.284"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0pdh1lyhdp5c5n39wpr622kgchgf30iqk853a2rv9m3s3fry50lm"; + sha256 = "0054b0cm0h2mbf6rxzdgd3c2rfz7xa32qkyr5lv58l2852hf0ri8"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ]; From 27e5593772c63f7b5e43caddee0d1c87795d71f6 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 26 Sep 2021 17:02:36 +0000 Subject: [PATCH 05/12] linux: 5.10.68 -> 5.10.69 (cherry picked from commit bba95d376306c37e535e3ab5555ac2f9279afaa5) --- 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 10984ce9638..8ecad893e58 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.68"; + version = "5.10.69"; # 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 = "08cl4bg9k331apj5fjl3jx6s6l543dnbjc1cfvin951m7l787ahv"; + sha256 = "1jhcl8qh4w4m2jnbp0glr6xbpn7phv17q6w3d247djnc7g2rwbr3"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ]; From eaccf16f0500b2cc409d17778507e9ea58c26b98 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 26 Sep 2021 17:02:44 +0000 Subject: [PATCH 06/12] linux: 5.14.7 -> 5.14.8 (cherry picked from commit 10fee833c9220242961d9f7b7d3a82c0a3a1a407) --- pkgs/os-specific/linux/kernel/linux-5.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.14.nix b/pkgs/os-specific/linux/kernel/linux-5.14.nix index 45d39795db6..35e03223d31 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.14.7"; + version = "5.14.8"; # 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,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1avypasvic298823xzpzzkjbmfv9s8bjnmq92ri62qbakx23j9dg"; + sha256 = "12cvvrxky92z1g9kj7pgb83yg9pnv2fvi7jf0pyagvqjqladl3na"; }; } // (args.argsOverride or { })) From 7da735d2048b2392758c889819ead208c0bf1ef8 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 26 Sep 2021 17:02:51 +0000 Subject: [PATCH 07/12] linux: 5.4.148 -> 5.4.149 (cherry picked from commit fa3a7105266abd6f9302d8864dbd60283204a314) --- 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 ba3ff00df78..2158d69d20f 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.148"; + version = "5.4.149"; # 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 = "1cwibh0y112hip5yd0n692rv44jh4sk2g6mj5n44g754k4i366a6"; + sha256 = "1s1zka0iay0drgkdnmzf587jbrg1gx13xv26k5r1qc7dik8xc6p7"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ]; From 422b30ce66219145bc62f5fe70a2ac9e919d073e Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 26 Sep 2021 17:03:26 +0000 Subject: [PATCH 08/12] linux/hardened/patches/4.14: 4.14.246-hardened1 -> 4.14.247-hardened1 (cherry picked from commit 7b29a72e545ee913dbdb07b8379d7d7ccd08b173) --- 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 832e516e6ef..01ab331713e 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,9 +1,9 @@ { "4.14": { "extra": "-hardened1", - "name": "linux-hardened-4.14.246-hardened1.patch", - "sha256": "1b15687ac2pkz46qliq1blyja7cjwn19q2bkd0c5912kzly76ghd", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.246-hardened1/linux-hardened-4.14.246-hardened1.patch" + "name": "linux-hardened-4.14.247-hardened1.patch", + "sha256": "0k3ii26ry0cszxs5n4ljll61p1kdi3dn5cvzjr8zb78bfrk7lbra", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.247-hardened1/linux-hardened-4.14.247-hardened1.patch" }, "4.19": { "extra": "-hardened1", From 8a0a9f3597f6a0f55b608e01c33f55ce9c0665b6 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 26 Sep 2021 17:03:27 +0000 Subject: [PATCH 09/12] linux/hardened/patches/4.19: 4.19.206-hardened1 -> 4.19.207-hardened1 (cherry picked from commit b754a3c355b21bd2d4503d0f1b5b7c98448e5496) --- 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 01ab331713e..ce46ff5a66b 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -7,9 +7,9 @@ }, "4.19": { "extra": "-hardened1", - "name": "linux-hardened-4.19.206-hardened1.patch", - "sha256": "12ylhvjvabal29gi00cpjh3s47qj0vav6f2y145z4c9r2z77816k", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.206-hardened1/linux-hardened-4.19.206-hardened1.patch" + "name": "linux-hardened-4.19.207-hardened1.patch", + "sha256": "1yn6c8axvnmck1ignw4k3pi458x0m2qm7g5vjwf2rw8cnzskrs48", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.207-hardened1/linux-hardened-4.19.207-hardened1.patch" }, "5.10": { "extra": "-hardened1", From 1febaecabb897afb5c981aef61b844f8d84a1bff Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 26 Sep 2021 17:03:28 +0000 Subject: [PATCH 10/12] linux/hardened/patches/5.10: 5.10.67-hardened1 -> 5.10.68-hardened1 (cherry picked from commit 34fe5d827ca5a1cee89b5abfde73a540977f3722) --- 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 ce46ff5a66b..f09db85b47f 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.67-hardened1.patch", - "sha256": "1yvfqkcffrva9hf4ns0jkksnvkj58h87msim0yhanlyp5jyz3l1p", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.67-hardened1/linux-hardened-5.10.67-hardened1.patch" + "name": "linux-hardened-5.10.68-hardened1.patch", + "sha256": "11cn72lzgc6vcbx4xbdvfxrfwy3hfn7sqjxf5laqw9jdhacnlhvn", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.68-hardened1/linux-hardened-5.10.68-hardened1.patch" }, "5.13": { "extra": "-hardened1", From 4b3fd66a5b0c0db44ec8f4625258bf09698f3df1 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 26 Sep 2021 17:03:29 +0000 Subject: [PATCH 11/12] linux/hardened/patches/5.14: 5.14.6-hardened1 -> 5.14.7-hardened1 (cherry picked from commit 5b71d92f9ad21a39b8ed957b1d5d54ecb5536da6) --- 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 f09db85b47f..1c7e87dc386 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -25,9 +25,9 @@ }, "5.14": { "extra": "-hardened1", - "name": "linux-hardened-5.14.6-hardened1.patch", - "sha256": "0db5jvbvrk93x745ylxwnmx6ldwhmaqdnb2hfa35j0i2xjaw4hxx", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.6-hardened1/linux-hardened-5.14.6-hardened1.patch" + "name": "linux-hardened-5.14.7-hardened1.patch", + "sha256": "18i0qxhzga2vg0kal5ifsks0vra6gj21q6whcjry9sglxandn2vg", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.7-hardened1/linux-hardened-5.14.7-hardened1.patch" }, "5.4": { "extra": "-hardened1", From 74d0889655183378822f042673ee05900141712a Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 26 Sep 2021 17:03:30 +0000 Subject: [PATCH 12/12] linux/hardened/patches/5.4: 5.4.147-hardened1 -> 5.4.148-hardened1 (cherry picked from commit bb21f231cf1556318346f7476a2ae4cc234c2cd6) --- 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 1c7e87dc386..36c7b557818 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -31,8 +31,8 @@ }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.147-hardened1.patch", - "sha256": "1jkvfpckmj9ig4nsxxiigawkay05lk8r9fps16iaq6lz2mf9vqsb", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.147-hardened1/linux-hardened-5.4.147-hardened1.patch" + "name": "linux-hardened-5.4.148-hardened1.patch", + "sha256": "0kb2d9csm8bbjark2ii0n1jpfcr6avdr8r5g97awzbg9jxkfs0j4", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.148-hardened1/linux-hardened-5.4.148-hardened1.patch" } }