From c498bc01805c42dce8457b99fd4c5a12bf6d8890 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 27 Aug 2021 01:12:05 +0000 Subject: [PATCH 01/14] linux: 4.14.244 -> 4.14.245 (cherry picked from commit 637878c8af79298ad8e3d905d95907488f7f1696) --- 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 6f72d35fcf4..0b44d039a81 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.244"; + version = "4.14.245"; # 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 = "0x554dck5f78ljknwahjvf49952s1w0zja3yh4vfz6lmf6hvzq5n"; + sha256 = "085jls7b2rzxlmvp0zsp4l3wi5xdrqlv2qczzwvbhzna1f4n2x0d"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ]; From c180aa5608cb9c3ecbb190f1f1113e271c0c09ce Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 27 Aug 2021 01:12:17 +0000 Subject: [PATCH 02/14] linux: 4.19.204 -> 4.19.205 (cherry picked from commit 88be0cc40c26eb5152443d0d3f542a1c5aea8954) --- 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 62de063c29d..14712c47e83 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.204"; + version = "4.19.205"; # 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 = "1rcx99sz4fgr2d138i92dw2vfplnqgys58hxywgmjb56c83l3qy4"; + sha256 = "1ii9l44d6jxhyd5qkc5h83ixailma9v7hyl60wi3rskkafqnwv2m"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ]; From 9f131e8464f25bb7e453fa8396bd47372fe383c1 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 27 Aug 2021 01:12:28 +0000 Subject: [PATCH 03/14] linux: 4.4.281 -> 4.4.282 (cherry picked from commit 083c38da7abd7956a3ed47df3b0b2da75d124c0f) --- 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 146ff42c060..eafef9a7556 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.281"; + version = "4.4.282"; extraMeta.branch = "4.4"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "12grr2vc2mcvy7k8w1apqs9mhfg0lvz6mrpksym234m4n5yy48ng"; + sha256 = "1rgxznjb6gsi64wk7x2rylyi64y2nx5yiah5gfm40c6l2f7lb9cc"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ]; From f77576ec34e0d4649207415a1a04dd0c094e3614 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 27 Aug 2021 01:12:40 +0000 Subject: [PATCH 04/14] linux: 4.9.280 -> 4.9.281 (cherry picked from commit 4442d7b8ddd5c826baad3c541d16a317be447e54) --- 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 bbc5a58ec0c..71ea75253d6 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.280"; + version = "4.9.281"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0am9qg9j18j4fc5zi6bk1g0mi8dp31pl62wlihxhhkc5yspzrna3"; + sha256 = "1dg70jv3bqanmjs31s0x2p7nd5g37bqzjn9rc1y6wvkgm4pwahi6"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ]; From d3dd950f8c32535faf5564751ddb05339a8d0f35 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 27 Aug 2021 01:12:51 +0000 Subject: [PATCH 05/14] linux: 5.10.60 -> 5.10.61 (cherry picked from commit 78eea2b5d20e33616492242ba82966f9b2609036) --- 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 292691fea2a..96b46750ac0 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.60"; + version = "5.10.61"; # 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 = "13gpamqj0shvad4nd9v11iv8qdfbjgb242nbvcim2z3c7xszfvv9"; + sha256 = "1lci78584c0rg5m5rkylssppnv001pzh4769m9mds4fdqn6f7sl2"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ]; From 9dfb717fb9134e25d283a0e4b0bf81249b72adcd Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 27 Aug 2021 01:13:03 +0000 Subject: [PATCH 06/14] linux: 5.13.12 -> 5.13.13 (cherry picked from commit ca0b7b4e189583f44b0e53eb029dab45e45f03c6) --- pkgs/os-specific/linux/kernel/linux-5.13.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.13.nix b/pkgs/os-specific/linux/kernel/linux-5.13.nix index dbbd4a9e876..8e651c0dc2c 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.13.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.13.12"; + version = "5.13.13"; # 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 = "0948w1zc2gqnl8x60chjqngfzdi0kcxm12i1nx3nx4ksiwj5vc98"; + sha256 = "0d1lr3rivgf9j3bn2a9hpzdf74nq8kybf3rfxxvw68vr1hhd4cam"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_13 ]; From ceb5fc136c61382326b38a2d6c643585258907f2 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 27 Aug 2021 01:13:34 +0000 Subject: [PATCH 07/14] linux: 5.4.142 -> 5.4.143 (cherry picked from commit 48183dde30f12435bc59f92d9de3ca0cbcfddb7c) --- 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 7cf9473451c..85db83189fd 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.142"; + version = "5.4.143"; # 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 = "0l8l4cg04p5vx890jm45r35js1v0nljd0lp5qwkvlr45jql5fy4r"; + sha256 = "090x087p8hxnc1daf2xwj7vg8hg1jhz5i4andkbhdy550l5nalq9"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ]; From b137e4f19fb54d40a5c0a811c0ef1ed4751d4f01 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 27 Aug 2021 01:14:15 +0000 Subject: [PATCH 08/14] linux-rt_5_10: 5.10.56-rt49 -> 5.10.59-rt52 (cherry picked from commit 0adbd0852faa0baf26e4be9e1a23e9819431fcf9) --- pkgs/os-specific/linux/kernel/linux-rt-5.10.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index 6c06dcb2000..a00e7ad33a9 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.56-rt49"; # updated by ./update-rt.sh + version = "5.10.59-rt52"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "0szcj0lbs33wmphxzvcc8jzfdvzncgxy2q8b1s4l9yjhkighssjd"; + sha256 = "107anv16khx055rpkvfd532rdcfg4ffbs7bhp45hdqi3bz0ssg1k"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "17r7d8xj5nph1j1fyjra887mqjlf6is9pgpw0jyhd46z1jy2bw3v"; + sha256 = "0i66z1njppn9qvl8msarcgbvmgby6hv8w0k0rmlizwj09i1pmwdx"; }; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; From ac519a8f8430e3794f98bca3935b4a7822c72900 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 27 Aug 2021 01:14:34 +0000 Subject: [PATCH 09/14] linux_latest-libre: 18239 -> 18260 (cherry picked from commit 5b94350a90c86c69d2d8e2bea14dc490d3b219e8) --- 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 0e123e89418..a183b685949 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 = "18239"; - sha256 = "1nzxkc53jmsyaxnl5q9hmgrfd3c8sn2y0pcv7ng042bnvr8hhh82"; + rev = "18260"; + sha256 = "11mmdix0vq9yrivx300ay6np3xx1gdqdr4cqdxr1wa84dbl7c2dm"; } , ... }: From 1d1f808935b266f65312715177bbb75918831a8a Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 27 Aug 2021 01:14:50 +0000 Subject: [PATCH 10/14] linux/hardened/patches/4.14: 4.14.244-hardened1 -> 4.14.245-hardened1 (cherry picked from commit d002bb6e6f35cbb4de3df5e41d53906c5d983e2f) --- 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 5625cb6e0eb..8520fc8c289 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.244-hardened1.patch", - "sha256": "0cm5ylwxz2lzjx8c7z90h443sw7mjbr33cbrgfhaczvdzm6wxx0b", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.244-hardened1/linux-hardened-4.14.244-hardened1.patch" + "name": "linux-hardened-4.14.245-hardened1.patch", + "sha256": "035sq0l15afhyfivkavd08pyaywsrcl6f468gykmbq9j3i2swbb6", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.245-hardened1/linux-hardened-4.14.245-hardened1.patch" }, "4.19": { "extra": "-hardened1", From 5aeb5af282bc21404d08dc07a41b82728e8e6cd7 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 27 Aug 2021 01:14:51 +0000 Subject: [PATCH 11/14] linux/hardened/patches/4.19: 4.19.204-hardened1 -> 4.19.205-hardened1 (cherry picked from commit 885a18686b2ba40d527b27c12a2e72d3b1ecda19) --- 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 8520fc8c289..df809cf7723 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.204-hardened1.patch", - "sha256": "08i7985aqiiyi6h42rgf4hc09di3iy5p3i7iajzyfrzxfmgkdgdz", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.204-hardened1/linux-hardened-4.19.204-hardened1.patch" + "name": "linux-hardened-4.19.205-hardened1.patch", + "sha256": "14v3kwkkhyng0wfz4spca6z7wvsxj4kplj144qv1k3fm9yy2cy3h", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.205-hardened1/linux-hardened-4.19.205-hardened1.patch" }, "5.10": { "extra": "-hardened1", From e22a87d1d2088ffd434a295d896fc8644f7af2aa Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 27 Aug 2021 01:14:52 +0000 Subject: [PATCH 12/14] linux/hardened/patches/5.10: 5.10.60-hardened1 -> 5.10.61-hardened1 (cherry picked from commit efcb008ba44845e3aec2a3d2d44e53f2ea4dac26) --- 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 df809cf7723..5f550618f0b 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.60-hardened1.patch", - "sha256": "0hnc12ypggwln4b5i1zqd9mmhdkcky24xj4jxqp23dwzp03pwfh8", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.60-hardened1/linux-hardened-5.10.60-hardened1.patch" + "name": "linux-hardened-5.10.61-hardened1.patch", + "sha256": "0hg67w9s6nzfmar8y01cnc46b2m2sa6s1xz85x1z1c46vw9558f0", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.61-hardened1/linux-hardened-5.10.61-hardened1.patch" }, "5.4": { "extra": "-hardened1", From 53a62325917bba1c98204c01e13375cd5993acdc Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 27 Aug 2021 01:14:53 +0000 Subject: [PATCH 13/14] linux/hardened/patches/5.13: init at 5.13.13-hardened1 (cherry picked from commit b9f854004e76fd448ca8f41e444593038eaefdff) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 5f550618f0b..57cd7198d98 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -17,6 +17,12 @@ "sha256": "0hg67w9s6nzfmar8y01cnc46b2m2sa6s1xz85x1z1c46vw9558f0", "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.61-hardened1/linux-hardened-5.10.61-hardened1.patch" }, + "5.13": { + "extra": "-hardened1", + "name": "linux-hardened-5.13.13-hardened1.patch", + "sha256": "1rb4jpz8zbpijybpm7dwxr05f9nmf6b9av2b651ffxg5vziw17l3", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.13.13-hardened1/linux-hardened-5.13.13-hardened1.patch" + }, "5.4": { "extra": "-hardened1", "name": "linux-hardened-5.4.142-hardened1.patch", From e5b4b37c5ad1c7b15da874ed586b415cdf17c770 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 27 Aug 2021 01:14:54 +0000 Subject: [PATCH 14/14] linux/hardened/patches/5.4: 5.4.142-hardened1 -> 5.4.143-hardened1 (cherry picked from commit e2fbc79e446ce1695b09da9521e339d6e3e2a5d0) --- 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 57cd7198d98..dc379de3161 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.142-hardened1.patch", - "sha256": "05195sxrs99gfwbb8icg8rzvqljhf1gpyhxr8da3qg6b4rvvnf0p", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.142-hardened1/linux-hardened-5.4.142-hardened1.patch" + "name": "linux-hardened-5.4.143-hardened1.patch", + "sha256": "0xv29cclypywq52908zppxpjrxllcdb67chw7lcia60y1aqsg83z", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.143-hardened1/linux-hardened-5.4.143-hardened1.patch" } }