From 8974d61d6188f03bfb46b64b8a4aed631f73d849 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 5 Nov 2021 17:24:19 +0000 Subject: [PATCH 01/13] linux: 4.14.253 -> 4.14.254 (cherry picked from commit 6ad7cc432340d1ec34d20a8c19ef6ff3a85a9ad4) --- 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 bc94f0d7442..317f2eed282 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.253"; + version = "4.14.254"; # 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 = "1mgl55c8fa2ry4qp0phkdkzjhwfnkbhvi266n348kyjyqnjl234f"; + sha256 = "0ihdlsg4jg9wwhhcbjjmrcchnl9pc0szh21nwmbhwnxgqcdmrnfz"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ]; From 8af4c2d940bd0daf1a4b2bfdb4f91cb321dbabf7 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 5 Nov 2021 17:24:25 +0000 Subject: [PATCH 02/13] linux: 4.19.214 -> 4.19.215 (cherry picked from commit c1f9eef4bc264828fb80cd04e9cd38e86a66d529) --- 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 f95156685c6..fa236958bdb 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.214"; + version = "4.19.215"; # 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 = "0i08np4gxiks7chp6j328pdqb02apbba53mj4zvxb9v37qpxzqgz"; + sha256 = "1czjqa5wbsmzgl7wwqlp9qbdig45ibq11m9pcykrjaclrgwn884y"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ]; From e73d614d6baa3eef75da60f05c1d1b9e219d4028 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 5 Nov 2021 17:24:31 +0000 Subject: [PATCH 03/13] linux: 4.4.290 -> 4.4.291 (cherry picked from commit 6292af0d46c92b1ce236217e32c1e7d5368d13c8) --- 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 1f6ee3f4dc5..d92373119f0 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.290"; + version = "4.4.291"; extraMeta.branch = "4.4"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1dcx58nmzkcc5nz2b5b7mgw4w7y28v3s9wd8h78czdqfa0kxrl20"; + sha256 = "0lbbvv3ha4d8nwzjh8bdk0aqyd12w6gw0nsxsdnp8pbmnndgb9vh"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ]; From 7fbf1d3418a8863a991c0846bd8c07c0d06f7785 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 5 Nov 2021 17:24:37 +0000 Subject: [PATCH 04/13] linux: 4.9.288 -> 4.9.289 (cherry picked from commit 5cab1474d9be130cc83a5cb3c1f0eaa54fac30ff) --- 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 0342785f509..4d85a8e8aec 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.288"; + version = "4.9.289"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0v5592v565bl924c23m1n7p5zddr0w7zn8m97pmikk6p7cyhjq9n"; + sha256 = "19kz74qgw5yzfinnsvljmn2zm855lr4cxgfpn8gwljmkspyx1hm5"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ]; From bc6402b439adbb8d9848bd2318bb66c5e1dd10c7 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 5 Nov 2021 17:24:45 +0000 Subject: [PATCH 05/13] linux: 5.10.76 -> 5.10.77 (cherry picked from commit 4deb3cf76a6b754ab624f4ab989230c02dfd5328) --- 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 11142efb9a6..db407ba24ce 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.76"; + version = "5.10.77"; # 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 = "140qkvs88b5zh6mxxzpf36z1r8bbvyh3yigripqjz1k236x0j2j8"; + sha256 = "1hwgbcfv9wfx9ka25lsqjrnzskynfgmswcyp5vk14wnxq7glxdnk"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ]; From 2000097db405f0cfedd1b61c032c71d88ee3bddf Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 5 Nov 2021 17:24:53 +0000 Subject: [PATCH 06/13] linux: 5.14.15 -> 5.14.16 (cherry picked from commit 104950bafddf4da4c6c6afd6d95ca96ffafe065b) --- 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 e9d10e5d468..84a82377e06 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.15"; + version = "5.14.16"; # 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 = "01m4qw1z7xn3ngsbm1bvcvikqpkjjr9n8585556wkmz9d469mwvl"; + sha256 = "005wis2y5dhksb6n0r4p3xjldppmdnd360dhxa04rfc4z2qwn3f3"; }; } // (args.argsOverride or { })) From 49142fdf19e4c06e2ddf665dc5aded7099b69611 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 5 Nov 2021 17:24:59 +0000 Subject: [PATCH 07/13] linux: 5.4.156 -> 5.4.157 (cherry picked from commit a2dd7acdd8e50c7632d6a4da821968ee507a7d6e) --- 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 a92b1b5bf8b..844e534edb7 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.156"; + version = "5.4.157"; # 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 = "1zkpqfhrc5n0yiij3jzvzywgabva53c8668f1ly1pkrzcbj77zh6"; + sha256 = "0jl62j22vs59bc90mvzavv0ii9hvk436pbnrpqf3x9f8nfybngwz"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ]; From 77f67c676bfbeaa45aebb972f6972955e1985deb Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 5 Nov 2021 17:25:22 +0000 Subject: [PATCH 08/13] linux_latest-libre: 18413 -> 18452 (cherry picked from commit 962be21e1db369e6c6c7e4731df6d095dbc216d6) --- 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 9153b923249..74bb29278f7 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 = "18413"; - sha256 = "1s0nr3pnczr1ijv86307mfhmkk7xn5ah46wx6jrx857agcd73fzq"; + rev = "18452"; + sha256 = "0l9xnblid2nv6afp4d8g6kwlhwbw72cnqfaf2lix65bqc1ivdpl9"; } , ... }: From ae204e9ec393690a5aa5429d0e820e70be39222e Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 5 Nov 2021 17:25:45 +0000 Subject: [PATCH 09/13] linux/hardened/patches/4.14: 4.14.252-hardened1 -> 4.14.254-hardened1 (cherry picked from commit 6cbce224796caabc7762d703f8ae2a6e995c7d11) --- 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 c0f9882cc14..42404f7a9a6 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.252-hardened1.patch", - "sha256": "1isqlqg4diz0i3f77rigvb07fs2p1v9w2h5165l0rnkb6h26i1gn", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.252-hardened1/linux-hardened-4.14.252-hardened1.patch" + "name": "linux-hardened-4.14.254-hardened1.patch", + "sha256": "1mg4zims7ckb0ddnnahk1cj73lhdh7x7xkjz4cgsvwndw0qvmhdi", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.254-hardened1/linux-hardened-4.14.254-hardened1.patch" }, - "sha256": "022rw51s8fzz6wcxa9xq6h60fglfx0hq7bmqgs5dlrci6plv4fwk", - "version": "4.14.252" + "sha256": "0ihdlsg4jg9wwhhcbjjmrcchnl9pc0szh21nwmbhwnxgqcdmrnfz", + "version": "4.14.254" }, "4.19": { "patch": { From 84623a419664c980502f482f676c34f63c899ab7 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 5 Nov 2021 17:25:53 +0000 Subject: [PATCH 10/13] linux/hardened/patches/4.19: 4.19.213-hardened1 -> 4.19.215-hardened1 (cherry picked from commit d4efdd46c7b95fefb687c3f30d130e184cacc203) --- 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 42404f7a9a6..07756ac0b25 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.213-hardened1.patch", - "sha256": "03lk4m6sm3545s0xxx0w4sqgrsvrxqm8qg7swn05s36jj20viprm", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.213-hardened1/linux-hardened-4.19.213-hardened1.patch" + "name": "linux-hardened-4.19.215-hardened1.patch", + "sha256": "05m3x3aafwp9msmqb2h1mys54xlsq17477blhb0d3b3nyj3qv503", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.215-hardened1/linux-hardened-4.19.215-hardened1.patch" }, - "sha256": "162f5y3jplql3ca5xy889mq6izjinryx2kx16zp582yvsqf8rwiq", - "version": "4.19.213" + "sha256": "1czjqa5wbsmzgl7wwqlp9qbdig45ibq11m9pcykrjaclrgwn884y", + "version": "4.19.215" }, "5.10": { "patch": { From 08ed409e51e5767d2f48bb77b6f6d27d72ff826e Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 5 Nov 2021 17:26:02 +0000 Subject: [PATCH 11/13] linux/hardened/patches/5.10: 5.10.75-hardened1 -> 5.10.77-hardened1 (cherry picked from commit 0b37e93d6be273b3cef6021af1a893e0e08d218e) --- 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 07756ac0b25..b2fbf69a51b 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.75-hardened1.patch", - "sha256": "17gm50aislxihfnmr4vi0p0gpg13m2pbldjpi81clnx93a7rrfw2", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.75-hardened1/linux-hardened-5.10.75-hardened1.patch" + "name": "linux-hardened-5.10.77-hardened1.patch", + "sha256": "1y5rdd7irlljjsw7kdv6v8issbhab3hzywggz5igca72qiy7gcwl", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.77-hardened1/linux-hardened-5.10.77-hardened1.patch" }, - "sha256": "0jrhhk89587caw54nhnwms93kq33qdm75x5f18cp61xrxxgjyaqa", - "version": "5.10.75" + "sha256": "1hwgbcfv9wfx9ka25lsqjrnzskynfgmswcyp5vk14wnxq7glxdnk", + "version": "5.10.77" }, "5.14": { "patch": { From 12159ee2286c228223fc06543fbfca5c39e60b06 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 5 Nov 2021 17:26:10 +0000 Subject: [PATCH 12/13] linux/hardened/patches/5.14: 5.14.14-hardened1 -> 5.14.16-hardened1 (cherry picked from commit ac2958663880515705c7384c71c35a2e1668108a) --- 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 b2fbf69a51b..0572739303f 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -32,12 +32,12 @@ "5.14": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.14.14-hardened1.patch", - "sha256": "1hx5yal8jqnxr9c9ikvc6d0xp99kqjarj67720v9d4wvlmgsfabj", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.14-hardened1/linux-hardened-5.14.14-hardened1.patch" + "name": "linux-hardened-5.14.16-hardened1.patch", + "sha256": "0k9n9k25bmzn3wsqkmjc27md7vc5qwg5a79zmwfw0adwlfwlgi5y", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.16-hardened1/linux-hardened-5.14.16-hardened1.patch" }, - "sha256": "0snh17ah49wmfmazy6x42rhvl484h657y0iq4l09a885sjb4xzsd", - "version": "5.14.14" + "sha256": "005wis2y5dhksb6n0r4p3xjldppmdnd360dhxa04rfc4z2qwn3f3", + "version": "5.14.16" }, "5.4": { "patch": { From be7cfa7be7e62536751037de43b42eb9bfb93393 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 5 Nov 2021 17:26:18 +0000 Subject: [PATCH 13/13] linux/hardened/patches/5.4: 5.4.155-hardened1 -> 5.4.157-hardened1 (cherry picked from commit 5564761e1e12083b88e60d0f034337a5ed0ee719) --- 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 0572739303f..822ab6e0ddd 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.155-hardened1.patch", - "sha256": "0l8h9i6asiypgbxl90370kzfsyyc3f4vwl2r191arvrsgw863bid", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.155-hardened1/linux-hardened-5.4.155-hardened1.patch" + "name": "linux-hardened-5.4.157-hardened1.patch", + "sha256": "0651l6qambsdy7p1jry2ylf806gr66v6zrfz8lk0dndlhsgbb3dq", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.157-hardened1/linux-hardened-5.4.157-hardened1.patch" }, - "sha256": "0f2hfz76rnhmv99zhbh7n1z48316ilxrxrnh4b5m3lj84y80y36c", - "version": "5.4.155" + "sha256": "0jl62j22vs59bc90mvzavv0ii9hvk436pbnrpqf3x9f8nfybngwz", + "version": "5.4.157" } }