From b48f65909c90c939f609e90de64c2bb26d6a3d90 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 26 May 2022 17:17:42 +0200 Subject: [PATCH 01/13] linux: 4.14.280 -> 4.14.281 (cherry picked from commit f2e1f34e4c258e6a41768113252fea6a35d8d30f) --- 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 4c4d7c932450..bfed578429ef 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.280"; + version = "4.14.281"; # 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 = "01jr0f7mq919s7xxvv8sc1mg6isc1ggij33l2s0n6jvykm23ghrr"; + sha256 = "0pivb1m2cwqnlm8bhd4ccnlq9pwp2r5lmn77gp91k6vbjv3gkqis"; }; } // (args.argsOverride or {})) From 0c0b3a37a16a9352671c0950fc0450532264da3d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 26 May 2022 17:17:51 +0200 Subject: [PATCH 02/13] linux: 4.19.244 -> 4.19.245 (cherry picked from commit b5c4a60bbec652e964afff309686a38097a21b1d) --- 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 ea79db67ed75..606fe18413fe 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.244"; + version = "4.19.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,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1g9562v6ny196rw2n3kj43nrz65qa7imwnmfasvj6x8fm8bdhz79"; + sha256 = "1s58qci6xhmss12glzkqk41kp60pqmzh4d84kyz4m4nf4xhdvzcr"; }; } // (args.argsOverride or {})) From a802e8ecc8d739a72bf33dcb7fbc0fa8fbf31c9d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 26 May 2022 17:18:01 +0200 Subject: [PATCH 03/13] linux: 4.9.315 -> 4.9.316 (cherry picked from commit 110b58f77ef304c23a3cbaf2a06cb92dcd79ca0c) --- 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 9f82f1805e90..93570b9b5c0e 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.315"; + version = "4.9.316"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1171p90s00jxg1clyz8kp81ilmdzygg131mxysr6lpkaisahkjg6"; + sha256 = "05yd7djm6dcxv3vaylhmj3p0yml421azv8qabmhv4ric1f99idjp"; }; } // (args.argsOverride or {})) From 83a2b02b9e4eba0211fa70d6d0cffd2581be75d0 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 26 May 2022 17:18:12 +0200 Subject: [PATCH 04/13] linux: 5.10.117 -> 5.10.118 (cherry picked from commit ec5629f3f2910c4475b7af27c87112a96d32ec00) --- 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 daeabc538370..aa4a489692d9 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.117"; + version = "5.10.118"; # 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 = "1iyw3nmsga2binmrhfnzsf1pvn2bs21a8jw6vm89k26z5h8zfgkh"; + sha256 = "0jqbzvgbvaldwwarvg27mcv2kfcgmfw72zpy4h4sp5d1hzqj1q65"; }; } // (args.argsOverride or {})) From 52fba79ed4c3ed0eab1ce948a1bfe57b726f79fe Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 26 May 2022 17:18:23 +0200 Subject: [PATCH 05/13] linux: 5.15.41 -> 5.15.43 (cherry picked from commit bc0db57d5398c6b66c39e15465a51b299e1174ac) --- 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 215073eea422..49f448acc5d8 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.41"; + version = "5.15.43"; # 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 = "07jrsr54rvhry3g401h58r1773zinq49dbrkb9v1p6q27gyb2z1w"; + sha256 = "04hwaykdjdqhcdk1pr6p4kkyw6h3z6ig4qpsra2klxsqklx92jq6"; }; } // (args.argsOverride or { })) From ad9b5022d14bd65452fe34b2b684737dc7fa773e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 26 May 2022 17:18:35 +0200 Subject: [PATCH 06/13] linux: 5.17.9 -> 5.17.11 (cherry picked from commit c57d757e1bec95bf22a4b6d5a47ed53f6a8fcc0d) --- pkgs/os-specific/linux/kernel/linux-5.17.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.17.nix b/pkgs/os-specific/linux/kernel/linux-5.17.nix index 46384061684d..19e521432fde 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.17.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.17.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.17.9"; + version = "5.17.11"; # 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 = "0y2rmn86z3cvgv71b6sjjyafnlbanlib1kjpjjqzjbgg86y2890p"; + sha256 = "0c8vz02lbfm0zkgsr1gvdp8bzxz255dk863pnakw6d77z9bfc22p"; }; } // (args.argsOverride or { })) From 9a99008b3e620a3ac2823e35918d827d73d0a150 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 26 May 2022 17:18:45 +0200 Subject: [PATCH 07/13] linux: 5.4.195 -> 5.4.196 (cherry picked from commit d505557a2916803206da007b8d925299eb672d62) --- 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 1d5bbc07832f..b2d9a81d0f8b 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.195"; + version = "5.4.196"; # 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 = "078380qhds2jwfmrchna6p27wpfb74pvnj4xiyc5k38gysfmnbzj"; + sha256 = "1x5irgki792f21hm5146xary0260cl9r475kvw8vm9w32vyx18ig"; }; } // (args.argsOverride or {})) From 0ba8ca04eedaee02dbc110dc069cd40ad85cec53 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 26 May 2022 17:19:52 +0200 Subject: [PATCH 08/13] linux/hardened/patches/4.14: 4.14.280-hardened1 -> 4.14.281-hardened1 (cherry picked from commit 08daee172eb0143f01656f69d093330fc42ac9a3) --- 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 e66a432836da..d5bf8be71179 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.280-hardened1.patch", - "sha256": "0hkn7rbgvnv9v7pzrg5g6ygmdzlrjl3yama9kp9aw0xw2akghmb4", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.280-hardened1/linux-hardened-4.14.280-hardened1.patch" + "name": "linux-hardened-4.14.281-hardened1.patch", + "sha256": "1i70qrv9dfpp0szl2m6icrnzpgw1r21nr4b6bbpdf1gmq22y9gf1", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.281-hardened1/linux-hardened-4.14.281-hardened1.patch" }, - "sha256": "01jr0f7mq919s7xxvv8sc1mg6isc1ggij33l2s0n6jvykm23ghrr", - "version": "4.14.280" + "sha256": "0pivb1m2cwqnlm8bhd4ccnlq9pwp2r5lmn77gp91k6vbjv3gkqis", + "version": "4.14.281" }, "4.19": { "patch": { From 7686ff5d713c73ff4f692acd1b77fc5535f4e9f2 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 26 May 2022 17:20:03 +0200 Subject: [PATCH 09/13] linux/hardened/patches/4.19: 4.19.244-hardened1 -> 4.19.245-hardened1 (cherry picked from commit 63192641bb82315f5484ace66b6e1c336c73bda2) --- 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 d5bf8be71179..15456a73d6e4 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.244-hardened1.patch", - "sha256": "063q4vd0spk602s4if751341jaansh0764qq7fhy764j31678n0j", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.244-hardened1/linux-hardened-4.19.244-hardened1.patch" + "name": "linux-hardened-4.19.245-hardened1.patch", + "sha256": "181bsz4zzw1hmk3l0cxrgfxlf1z5gy86bxrnwxh08n3j35biywf2", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.245-hardened1/linux-hardened-4.19.245-hardened1.patch" }, - "sha256": "1g9562v6ny196rw2n3kj43nrz65qa7imwnmfasvj6x8fm8bdhz79", - "version": "4.19.244" + "sha256": "1s58qci6xhmss12glzkqk41kp60pqmzh4d84kyz4m4nf4xhdvzcr", + "version": "4.19.245" }, "5.10": { "patch": { From bba3672fa36126dc32f62c28b60d119ed3ec9741 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 26 May 2022 17:20:14 +0200 Subject: [PATCH 10/13] linux/hardened/patches/5.10: 5.10.117-hardened1 -> 5.10.118-hardened1 (cherry picked from commit d8d0dd929e55bbbaeb8044fdb7ebe365b1faea68) --- 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 15456a73d6e4..971382b2eef3 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.117-hardened1.patch", - "sha256": "1l53sjknm8q76r1jljm321cmh6ic36pc9w5rmi68lbds19ndfpx3", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.117-hardened1/linux-hardened-5.10.117-hardened1.patch" + "name": "linux-hardened-5.10.118-hardened1.patch", + "sha256": "0kn33lzb92p80rvy3jzkhnv5izr8h082x400s6ihxp1sqdal0fb7", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.118-hardened1/linux-hardened-5.10.118-hardened1.patch" }, - "sha256": "1iyw3nmsga2binmrhfnzsf1pvn2bs21a8jw6vm89k26z5h8zfgkh", - "version": "5.10.117" + "sha256": "0jqbzvgbvaldwwarvg27mcv2kfcgmfw72zpy4h4sp5d1hzqj1q65", + "version": "5.10.118" }, "5.15": { "patch": { From 1b658389217ecdd72e64f1e842f50be60394f7c6 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 26 May 2022 17:20:27 +0200 Subject: [PATCH 11/13] linux/hardened/patches/5.15: 5.15.41-hardened1 -> 5.15.43-hardened1 (cherry picked from commit e97b03a780de6ae4f877d6c0092258555d713001) --- 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 971382b2eef3..1ca6c9c69864 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.41-hardened1.patch", - "sha256": "1y98rvn4qyx8w8bjchfzsd7g9gkhfm20cwaj3p88sgq7q81kyz8s", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.41-hardened1/linux-hardened-5.15.41-hardened1.patch" + "name": "linux-hardened-5.15.43-hardened1.patch", + "sha256": "03ilpzhr01567aaadwwk3qdnh9hlm427ihyrr59dwlwsfcqy2fd9", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.43-hardened1/linux-hardened-5.15.43-hardened1.patch" }, - "sha256": "07jrsr54rvhry3g401h58r1773zinq49dbrkb9v1p6q27gyb2z1w", - "version": "5.15.41" + "sha256": "04hwaykdjdqhcdk1pr6p4kkyw6h3z6ig4qpsra2klxsqklx92jq6", + "version": "5.15.43" }, "5.17": { "patch": { From 14d7392dd3220bf17b2abd114609592e661175fa Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 26 May 2022 17:20:39 +0200 Subject: [PATCH 12/13] linux/hardened/patches/5.17: 5.17.9-hardened1 -> 5.17.11-hardened1 (cherry picked from commit ec4b2a871ddc77c26d309bb116786bddcd9975dc) --- 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 1ca6c9c69864..395b4c5c03d7 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -42,12 +42,12 @@ "5.17": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.17.9-hardened1.patch", - "sha256": "0n7zz04vnajpsfn662fxx75jinnr0kpqwzyypgwn99v4lmsxvza1", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.17.9-hardened1/linux-hardened-5.17.9-hardened1.patch" + "name": "linux-hardened-5.17.11-hardened1.patch", + "sha256": "01l4k1j23ckkifjxwaq9lcfp7ynpasyn5f7nqsff6xx2wcg0qyxf", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.17.11-hardened1/linux-hardened-5.17.11-hardened1.patch" }, - "sha256": "0y2rmn86z3cvgv71b6sjjyafnlbanlib1kjpjjqzjbgg86y2890p", - "version": "5.17.9" + "sha256": "0c8vz02lbfm0zkgsr1gvdp8bzxz255dk863pnakw6d77z9bfc22p", + "version": "5.17.11" }, "5.4": { "patch": { From d439c00b0f7f6c907d59c55cc1362f36f1e9ee55 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 26 May 2022 17:20:50 +0200 Subject: [PATCH 13/13] linux/hardened/patches/5.4: 5.4.195-hardened1 -> 5.4.196-hardened1 (cherry picked from commit 75f4c627752abc98bc2e25f9e754856ff864e021) --- 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 395b4c5c03d7..b6485a32851c 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -52,11 +52,11 @@ "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.195-hardened1.patch", - "sha256": "1q7a211jw22nl1yz3k3cv6g4h7csir0wwyypzij54xbg3k7by0p9", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.195-hardened1/linux-hardened-5.4.195-hardened1.patch" + "name": "linux-hardened-5.4.196-hardened1.patch", + "sha256": "11q9sadncbz84yhsai7xdbrgmcbghj0hc1lqc45767v1f3snmpyi", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.196-hardened1/linux-hardened-5.4.196-hardened1.patch" }, - "sha256": "078380qhds2jwfmrchna6p27wpfb74pvnj4xiyc5k38gysfmnbzj", - "version": "5.4.195" + "sha256": "1x5irgki792f21hm5146xary0260cl9r475kvw8vm9w32vyx18ig", + "version": "5.4.196" } }