From 950b2e92357d80cfbe2b48eec730eea6abf2d7a5 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 28 Jun 2022 19:14:04 +0200 Subject: [PATCH 01/11] linux: 4.14.284 -> 4.14.285 (cherry picked from commit 2b50639f43b52134385da802d188f52846936223) --- 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 a18ac3ac5edb..6cd476fcda61 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.284"; + version = "4.14.285"; # 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/v4.x/linux-${version}.tar.xz"; - sha256 = "1f7bidisa6b4ff0mgn66h1nmf94j5mcx4wnkwnd9f49im6hcqllq"; + sha256 = "0ynkcq2cm0q2qcmll1jg76msfa2a186xy5rv81ahfvylbjdkijfs"; }; } // (args.argsOverride or {})) From be96a43b745a8decbd220d3799e84ea18ee12247 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 28 Jun 2022 19:14:14 +0200 Subject: [PATCH 02/11] linux: 4.19.248 -> 4.19.249 (cherry picked from commit 34fe04da8e4ee12c72e7481fa3ac6506657f826b) --- 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 4d322c8ed6d3..24d0df8223fe 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.248"; + version = "4.19.249"; # 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/v4.x/linux-${version}.tar.xz"; - sha256 = "0cdflfk6l13slw1cawpkhpjzbbnffcbyffrh29p9jg73pdqx23y4"; + sha256 = "14aiypira32hsw7wy9bhdw9rvfn705r0sb4415n9pfvi091bsjyf"; }; } // (args.argsOverride or {})) From 2068a7086ed75cb5e806e0914af5b002d649d67e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 28 Jun 2022 19:14:23 +0200 Subject: [PATCH 03/11] linux: 4.9.319 -> 4.9.320 (cherry picked from commit 21c39a09698ce94f0be180027520c3b5169fb68d) --- 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 3c6aed36f398..d13b1a81e45d 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.319"; + version = "4.9.320"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "11242bn95k51knm9da7xk7r10vk7iji06wix1cq4g5nzldrfp9sp"; + sha256 = "16wq86i8ch488372v94r88xr9anda477d46xq43wkpmbj912gn9h"; }; } // (args.argsOverride or {})) From 7eae32a36fca3b22d9020d1b2bceb03bb954286e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 28 Jun 2022 19:14:34 +0200 Subject: [PATCH 04/11] linux: 5.10.124 -> 5.10.126 (cherry picked from commit 48f604ef690b2845ff20c0ac63134cfecff5724b) --- 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 9f4dcb001af5..87ac3427f7a3 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.124"; + version = "5.10.126"; # 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 = "0yz3yw02b6b1sq800r46x5b3dagswb6z4clrfq485c4669sb2ipc"; + sha256 = "0qsg5mxvq11xdbssz3qsmd794c8nydq297jwmgfwbzwkx1ll61ci"; }; } // (args.argsOverride or {})) From bd9cb56b312b3242141391f7ec1e397766cb7bdf Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 28 Jun 2022 19:14:46 +0200 Subject: [PATCH 05/11] linux: 5.15.49 -> 5.15.50 (cherry picked from commit 17996e10f9cccb35fc16e86d8f9dd2c12fc78130) --- pkgs/os-specific/linux/kernel/linux-5.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index 2b96065d84fe..1fb189b1ef9f 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.49"; + version = "5.15.50"; # 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 = "1p2r02h2z0j34hpkp3kr4741pr15ii72b94zllravx27pa9phj9j"; + sha256 = "03yp3gz45059gkzqbijbg503rxx4wihjg4c3ikz10f526xym0kam"; }; } // (args.argsOverride or { })) From cc122120cb97e566a26f77223f319db66a58eb78 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 28 Jun 2022 19:15:09 +0200 Subject: [PATCH 06/11] linux: 5.4.200 -> 5.4.201 (cherry picked from commit dfc38c7baa9ed3d107921f444de6a76f1a3c5cbd) --- 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 2f7a5f372cfe..cd79e9680b11 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.200"; + version = "5.4.201"; # 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 = "1f15al9g4cd17fm43im5rqqrbz1cqhz2hq5ycpqvwa02pydprsga"; + sha256 = "0qbfqfca4ism7k7y8grjqsxby3j50ach576szrljxxy140qxfgc1"; }; } // (args.argsOverride or {})) From 42d63666297ee0fb7960b8ad128439aedace2609 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 28 Jun 2022 19:16:21 +0200 Subject: [PATCH 07/11] linux/hardened/patches/4.14: 4.14.284-hardened1 -> 4.14.285-hardened1 (cherry picked from commit 299b49b53941cccf42aaf32e3bd2e1d75d71f847) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 54f9f9f813fd..cdfd03795142 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,12 +2,12 @@ "4.14": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.14.284-hardened1.patch", - "sha256": "0hj6hmkv3ikgps0jrwl5jgg9pdw6mxi3iblr20r4yp8anxcrvaws", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.284-hardened1/linux-hardened-4.14.284-hardened1.patch" + "name": "linux-hardened-4.14.285-hardened1.patch", + "sha256": "1s7dzzb9aj4xbabddq5jcbd2aci3zxqwryjnmzrhzrdw6j8wszwx", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.285-hardened1/linux-hardened-4.14.285-hardened1.patch" }, - "sha256": "1f7bidisa6b4ff0mgn66h1nmf94j5mcx4wnkwnd9f49im6hcqllq", - "version": "4.14.284" + "sha256": "0ynkcq2cm0q2qcmll1jg76msfa2a186xy5rv81ahfvylbjdkijfs", + "version": "4.14.285" }, "4.19": { "patch": { From 6655cad95fc9c7e6cbf735844539f0d3fbd7a641 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 28 Jun 2022 19:16:32 +0200 Subject: [PATCH 08/11] linux/hardened/patches/4.19: 4.19.248-hardened1 -> 4.19.249-hardened1 (cherry picked from commit 14479c95a203204f6b82d956ebb657ba7ef3ca28) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index cdfd03795142..c97b9f8380ad 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -12,12 +12,12 @@ "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.248-hardened1.patch", - "sha256": "09bnw0f8rd5hf4k4w4n4sb3ggsw48nkxsrnxd9b8vn6jyqhv9n3s", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.248-hardened1/linux-hardened-4.19.248-hardened1.patch" + "name": "linux-hardened-4.19.249-hardened1.patch", + "sha256": "0n2q0vwqxvzkkxn4mdaiqyx7ry8k4cr3hx3czcr3wbqvwh2bbnbz", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.249-hardened1/linux-hardened-4.19.249-hardened1.patch" }, - "sha256": "0cdflfk6l13slw1cawpkhpjzbbnffcbyffrh29p9jg73pdqx23y4", - "version": "4.19.248" + "sha256": "14aiypira32hsw7wy9bhdw9rvfn705r0sb4415n9pfvi091bsjyf", + "version": "4.19.249" }, "5.10": { "patch": { From c279c125de776d607dd37693d04a95a1cbe76125 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 28 Jun 2022 19:16:44 +0200 Subject: [PATCH 09/11] linux/hardened/patches/5.10: 5.10.124-hardened1 -> 5.10.125-hardened1 (cherry picked from commit 3cf33ad016f3aeba8aba13cf68228ada4798924b) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index c97b9f8380ad..64a7c0b45016 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -22,12 +22,12 @@ "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.124-hardened1.patch", - "sha256": "1fjwi5al5i0qb7a7viljb755ylqj3m5qp10835a3q91ad6zkjjnf", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.124-hardened1/linux-hardened-5.10.124-hardened1.patch" + "name": "linux-hardened-5.10.125-hardened1.patch", + "sha256": "04hdgzx7yqv26i74k6yzdh3k4dzyvcmxn9y93whdw0jyal34nj5w", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.125-hardened1/linux-hardened-5.10.125-hardened1.patch" }, - "sha256": "0yz3yw02b6b1sq800r46x5b3dagswb6z4clrfq485c4669sb2ipc", - "version": "5.10.124" + "sha256": "0q4garkqdkr2280ygz44053cbmzv59yfd0lsn7q67h1j4nh6wddr", + "version": "5.10.125" }, "5.15": { "patch": { From 1c16811012327be098fc9dd453b40e42c62c517e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 28 Jun 2022 19:16:57 +0200 Subject: [PATCH 10/11] linux/hardened/patches/5.15: 5.15.49-hardened1 -> 5.15.50-hardened1 (cherry picked from commit d7973cd50258a26105c42111894d53192f5f4705) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 64a7c0b45016..8680e054d524 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -32,12 +32,12 @@ "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.49-hardened1.patch", - "sha256": "0p14bhqk0a4xzr11cc6gqc0ncc1a3cmvwyvisbsp7b74ax9w5qbm", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.49-hardened1/linux-hardened-5.15.49-hardened1.patch" + "name": "linux-hardened-5.15.50-hardened1.patch", + "sha256": "0vridxhn9s21d3r877ndnm7zg5iyqpm9lm319ccw47fwyydwwh4y", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.50-hardened1/linux-hardened-5.15.50-hardened1.patch" }, - "sha256": "1p2r02h2z0j34hpkp3kr4741pr15ii72b94zllravx27pa9phj9j", - "version": "5.15.49" + "sha256": "03yp3gz45059gkzqbijbg503rxx4wihjg4c3ikz10f526xym0kam", + "version": "5.15.50" }, "5.4": { "patch": { From e2be983360778d234d72b4731f26094e00d07b25 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 28 Jun 2022 19:17:22 +0200 Subject: [PATCH 11/11] linux/hardened/patches/5.4: 5.4.200-hardened1 -> 5.4.201-hardened1 (cherry picked from commit 7d58f625e2bf0306255174aa0319f280b32f88b0) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 8680e054d524..fb8be8bf91a2 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -42,11 +42,11 @@ "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.200-hardened1.patch", - "sha256": "1mpcvgri079v8js8y2angwmksyk07vhyi2b5b24bxxdbm1s5a58s", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.200-hardened1/linux-hardened-5.4.200-hardened1.patch" + "name": "linux-hardened-5.4.201-hardened1.patch", + "sha256": "1l0qgkwsp12wn2k78m04bpb88qknckbwn6610xj9jxvhq0n0qg4l", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.201-hardened1/linux-hardened-5.4.201-hardened1.patch" }, - "sha256": "1f15al9g4cd17fm43im5rqqrbz1cqhz2hq5ycpqvwa02pydprsga", - "version": "5.4.200" + "sha256": "0qbfqfca4ism7k7y8grjqsxby3j50ach576szrljxxy140qxfgc1", + "version": "5.4.201" } }