From 13bce990871addf57667d74dbe38db56c03bb81b Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 18 Jul 2021 15:46:00 +0000 Subject: [PATCH 01/11] linux: 4.14.238 -> 4.14.239 (cherry picked from commit e3eace9baa10d524173e34cad3d2a31c2413f8cc) --- 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 f418afc280b..5b94b7ea9b6 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.238"; + version = "4.14.239"; # 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 = "1phjgm1fhyfpm2h9b2bngcbh91v2qrxcm7vma86q7pdqrcbh1fih"; + sha256 = "167zwm3giizv42m0xjz71xnb2swlwiaw0xw0dg8j8mb74hz1drx0"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ]; From 32e57d3b3a17785747a63c64f006bbaea49f31b6 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 18 Jul 2021 15:46:06 +0000 Subject: [PATCH 02/11] linux: 4.19.196 -> 4.19.197 (cherry picked from commit cb978946c1a99c8e6a204d0e45cc7078f331673c) --- 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 460982b6d2f..3785c6b5536 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.196"; + version = "4.19.197"; # 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 = "0liapgaczv6lq7223wnq2cbwfb6w93iw14dv1xidcb3bnakm4h5f"; + sha256 = "10kj442qaky6rpl65k5rrvd3p6mdgz4p321zvf4s312ixfdja0g6"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ]; From 0f9b1b3bec77436f2685b96e8c3974966f66c030 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 18 Jul 2021 15:46:13 +0000 Subject: [PATCH 03/11] linux: 5.10.48 -> 5.10.50 (cherry picked from commit a2259ae9a6a48adc580906a9dcfe653f08aa3a94) --- 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 fd29ff465f8..988de97e03b 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.48"; + version = "5.10.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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0pn24bkz9mkphv9f634117zam0ak6q3pbpfwv0l5kf71h0s1klfv"; + sha256 = "0dmlpy9k7am99495bxcm46i4y6g34d1fzdkzz3wgzb4mgmx35nlb"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ]; From f507e4793be9f736c4f7b472222aae6e0821a754 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 18 Jul 2021 15:46:18 +0000 Subject: [PATCH 04/11] linux: 5.12.15 -> 5.12.17 (cherry picked from commit 677dcff2aa039ede045ad751da0a0877238ed2cc) --- 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 3a482d92a44..82218dc1cef 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.15"; + version = "5.12.17"; # 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 = "1nlgwcxfhxzf5wak8c0gamn4k8vpdllzqlpqqn5fa08cdjcymz27"; + sha256 = "1ghyqxfxslxzr7273vj2yn14pkdnkja3wk50xxhavpvf87i8c40j"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ]; From 72df626b31687f653c0d1999eb10f0d2fc190991 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 18 Jul 2021 15:46:23 +0000 Subject: [PATCH 05/11] linux: 5.4.130 -> 5.4.132 (cherry picked from commit 5d99998e07ec4f60da6bd0c822356bfecbbbc947) --- 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 0c8355d101e..003f1e96e4f 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.130"; + version = "5.4.132"; # 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 = "0ywwy6g0fd05fxgwsrycz2l6khjljxa3qbi6hywp3rjgmgxp2ak6"; + sha256 = "1vq0dmrn7gl2vprm08l8by5ja3xjgggrcd38vqg7b7jpnfzssrl4"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ]; From 0bacfc6d6a2ef39ae5b8208f88d9fb41139636a3 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 18 Jul 2021 15:46:57 +0000 Subject: [PATCH 06/11] linux-rt_5_10: 5.10.47-rt45 -> 5.10.47-rt46 (cherry picked from commit 9e7fd90e153006f1ec5cdd612eb70305c19019db) --- pkgs/os-specific/linux/kernel/linux-rt-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 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 6add438d0ac..8ee5d88b3ad 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.47-rt45"; # updated by ./update-rt.sh + version = "5.10.47-rt46"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -25,7 +25,7 @@ in buildLinux (args // { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0s3y636ymrhm8rg6n47wdk1pvvmpsnynmyhyy5681f2pw5z2c1ay"; + sha256 = "12jnnwnh3bgz2ygc173r45sbqm74rz3f2nlp7m2fb8dlxdby460q"; }; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; From c060b9e2441297da7d6c24f7b202b1ed2ebfec07 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 18 Jul 2021 15:47:29 +0000 Subject: [PATCH 07/11] linux/hardened/patches/4.14: 4.14.238-hardened1 -> 4.14.239-hardened1 (cherry picked from commit 73667e11f3b8da2237b4e43816d59151b2f7af50) --- 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 e97d9151dbd..cf49bd2b6ac 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.238-hardened1.patch", - "sha256": "13wld3dm9ymwcsk5f06l64z9q49ff7rh7dqfqxxhkngdx2i1h566", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.238-hardened1/linux-hardened-4.14.238-hardened1.patch" + "name": "linux-hardened-4.14.239-hardened1.patch", + "sha256": "1yfg6c75y1dp627qn8c4795sc9vwywc5dl95ngg8zk15n5d7j9in", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.239-hardened1/linux-hardened-4.14.239-hardened1.patch" }, "4.19": { "extra": "-hardened1", From 5a3ca4155f02d720077e9fed5084d94ab76f845c Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 18 Jul 2021 15:47:30 +0000 Subject: [PATCH 08/11] linux/hardened/patches/4.19: 4.19.196-hardened1 -> 4.19.197-hardened1 (cherry picked from commit 888c46fe62dd87556537da8b04684a63be5cb54e) --- 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 cf49bd2b6ac..961682c9c12 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.196-hardened1.patch", - "sha256": "1wna5j1g1703gl4xw4x5z8dmc8gjqg879zq4xnmlyc0vryqjrxyq", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.196-hardened1/linux-hardened-4.19.196-hardened1.patch" + "name": "linux-hardened-4.19.197-hardened1.patch", + "sha256": "1cbcas5kl6k8hn60p08pvw073mrv8lkrav3pc9sxvdcscdbwkkpr", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.197-hardened1/linux-hardened-4.19.197-hardened1.patch" }, "5.10": { "extra": "-hardened1", From 1989fef2a9c0016902dc5923d3ad9cf5a77a4025 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 18 Jul 2021 15:47:31 +0000 Subject: [PATCH 09/11] linux/hardened/patches/5.10: 5.10.48-hardened1 -> 5.10.50-hardened1 (cherry picked from commit b724837096d16e1b64f18228e6ab01ca1dc491ce) --- 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 961682c9c12..01e945eb494 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.48-hardened1.patch", - "sha256": "1drfh4ljiih4y5fn2bvg15wrmz10s50q5qyhn89r63b5qkb1lp21", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.48-hardened1/linux-hardened-5.10.48-hardened1.patch" + "name": "linux-hardened-5.10.50-hardened1.patch", + "sha256": "0z57cdvyaarl5p0b6sj93pag34wvf128s30ymkc4m50a60kp7cr8", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.50-hardened1/linux-hardened-5.10.50-hardened1.patch" }, "5.12": { "extra": "-hardened1", From e662fb27af762db414b6660973aed32c7cb02630 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 18 Jul 2021 15:47:32 +0000 Subject: [PATCH 10/11] linux/hardened/patches/5.12: 5.12.15-hardened1 -> 5.12.17-hardened1 (cherry picked from commit e6ed15ffc466e5bfe32c14a207c8e70abee50dd2) --- 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 01e945eb494..45828bd141f 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.15-hardened1.patch", - "sha256": "1d81z67y9659icgmkchj0y2jlcs4nh4grlzf7ppbq6vmrr92xq8x", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.15-hardened1/linux-hardened-5.12.15-hardened1.patch" + "name": "linux-hardened-5.12.17-hardened1.patch", + "sha256": "09vh04a1sa80shm0z5if31j5r8s4syrqv4i22q5pnnfnlzhbqk59", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.17-hardened1/linux-hardened-5.12.17-hardened1.patch" }, "5.4": { "extra": "-hardened1", From 49809d08b535b402aa3b9774f2ec6ad5e99e7570 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 18 Jul 2021 15:47:33 +0000 Subject: [PATCH 11/11] linux/hardened/patches/5.4: 5.4.130-hardened1 -> 5.4.132-hardened1 (cherry picked from commit f011a85f289507bef66b10759de524d0467821eb) --- 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 45828bd141f..eac71ee36aa 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.130-hardened1.patch", - "sha256": "0d7q6pkl74hkx65p25jxjjky08zdprsfbcyik9cdlsfrbiidwn53", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.130-hardened1/linux-hardened-5.4.130-hardened1.patch" + "name": "linux-hardened-5.4.132-hardened1.patch", + "sha256": "0a4n8ss16qqbrbxajlad4j7nc10ipdnl70yz6ppryyw94i5lf5pb", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.132-hardened1/linux-hardened-5.4.132-hardened1.patch" } }