From 01e820a5d72ae8adbdc03489a281ee4705163ccd Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 5 Oct 2022 18:32:04 +0200 Subject: [PATCH 01/11] linux: 4.19.260 -> 4.19.261 (cherry picked from commit d7920e2dedc0a58d3f7c280d6ec6faf081ecd811) --- 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 666841b0ca7e..cd07e1a91446 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.260"; + version = "4.19.261"; # 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 = "1vlhaapbkvvk2acw1i5f6v6gd8v0x37n1y3i066cddl90my6yl24"; + sha256 = "1cicb3zydpka9yjx875hbh305bsdvni2kp674pkvaw04pnc35hxy"; }; } // (args.argsOverride or {})) From 904adb408a4216dc03399739bb16daba68abe9ef Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 5 Oct 2022 18:32:52 +0200 Subject: [PATCH 02/11] linux: 5.10.146 -> 5.10.147 (cherry picked from commit 6ea285206d64344f3c6eb4e8e0c9c6da5d916896) --- 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 802ac6a11134..febd66649568 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.146"; + version = "5.10.147"; # 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 = "1hbdxvlibp9w0q8bk1zlx77ayq2wcld8rjm134ybgbcf4zrrggbv"; + sha256 = "16pdpjmvrdml7am7s2kydrif1l7f4aq0wh4ak0xh3dby16zkl9c5"; }; } // (args.argsOverride or {})) From b09a3bb9f54832d64549d85f57a73fe503c1a5df Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 5 Oct 2022 18:33:41 +0200 Subject: [PATCH 03/11] linux: 5.15.71 -> 5.15.72 (cherry picked from commit addb39984d1e3c2f197fe18517027c810f1aece9) --- 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 f6d557c9be9c..6696c2bd5712 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.71"; + version = "5.15.72"; # 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; @@ -15,6 +15,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0lqy3nmhij6sb4963kb5dhvfdx46mg79hp81kq10wv01iq9hhm2z"; + sha256 = "1aq75z2spa1jvxv9m89gsaxza29n25k8j1f0pg9yj6j7bcxk5430"; }; } // (args.argsOverride or { })) From c4eb8460b334c4dabb805c717ac418148ceae454 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 5 Oct 2022 18:35:14 +0200 Subject: [PATCH 04/11] linux: 5.4.215 -> 5.4.216 (cherry picked from commit a8ad1882c15512d4f789ca964d3d1a472495649d) --- 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 4166d767bab3..41e925a9d254 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.215"; + version = "5.4.216"; # 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 = "1gafnf9gbsfzvp9jq6y8qhpvas5cv9y0m9bad2sg55sjlb1zfard"; + sha256 = "19vyxa0yzdf4w48jamjfz6kpiaaa7mjjz5gs2awckzilfc0n4pyf"; }; } // (args.argsOverride or {})) From 5991c7669ef8f2720be27dcf73954cbbba6e3d5c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 5 Oct 2022 18:35:33 +0200 Subject: [PATCH 05/11] linux_latest-libre: 18916 -> 18950 (cherry picked from commit 1db3d28892ebbb8f2043b473ee4cff434cae75c0) --- 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 18f91ae78d01..1814d4cee069 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 = "18916"; - sha256 = "0axjbr1zbj7izkvvz2nv4ij1xjjnbxpch43cpl169cr8rqdl6n6i"; + rev = "18950"; + sha256 = "1k84mqvi71bmd7x0km980z1y7cm71fc6jvnf2rzhxss9pjscrh2j"; } , ... }: From bd0e7d597da35f188017af07a334927191ec7bb9 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 5 Oct 2022 18:36:30 +0200 Subject: [PATCH 06/11] linux/hardened/patches/4.14: 4.14.294-hardened1 -> 4.14.295-hardened1 (cherry picked from commit 6a9fb21418dcbd12b4f5e3dd754f7f6a706ed3dc) --- 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 51dad759fb8c..bda4bab70ada 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.294-hardened1.patch", - "sha256": "0x7qnfih7hvn94f8w5g6qqdvsswr71ml9wd9fy1p14dd8k068hcj", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.294-hardened1/linux-hardened-4.14.294-hardened1.patch" + "name": "linux-hardened-4.14.295-hardened1.patch", + "sha256": "0jync3d52qif0pxnmbx7js7zgxnrhrjxiiyp0n57cmdxi9jcjc8j", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.295-hardened1/linux-hardened-4.14.295-hardened1.patch" }, - "sha256": "069i11hv4fhwc9dirqbag1g1k3fn21wzpfggah4f1a41whf98apy", - "version": "4.14.294" + "sha256": "0svalywqmrhav63vw0ns06c25sgyvzwfngljpham3nm7jjxbkk32", + "version": "4.14.295" }, "4.19": { "patch": { From a9c1d06e9405a7ac3f26c0100e74d63c354d9885 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 5 Oct 2022 18:37:12 +0200 Subject: [PATCH 07/11] linux/hardened/patches/4.19: 4.19.259-hardened1 -> 4.19.260-hardened1 (cherry picked from commit 9ba817f60b3a6843e18b06351e944905bb353d99) --- 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 bda4bab70ada..c80ace14cf83 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.259-hardened1.patch", - "sha256": "05hnliiszj0ri0dkfm1ppaqss1x5nd0jbyr5l7736s5bi707lmsp", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.259-hardened1/linux-hardened-4.19.259-hardened1.patch" + "name": "linux-hardened-4.19.260-hardened1.patch", + "sha256": "08b3kk5m12yqq12ik1d9zxaga2pzw2znzcwh9ymk6i9b8y5f3bsm", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.260-hardened1/linux-hardened-4.19.260-hardened1.patch" }, - "sha256": "1ska6v95zjjj44h53gi34rnbsrm4507jwxi3kklnky6d0aykiy1z", - "version": "4.19.259" + "sha256": "1vlhaapbkvvk2acw1i5f6v6gd8v0x37n1y3i066cddl90my6yl24", + "version": "4.19.260" }, "5.10": { "patch": { From 9d52788d26a75128e019492f7c4ed57e89851fdf Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 5 Oct 2022 18:37:59 +0200 Subject: [PATCH 08/11] linux/hardened/patches/5.10: 5.10.145-hardened1 -> 5.10.146-hardened1 (cherry picked from commit e10301dd2ac9382556f301f5912627799b86ca68) --- 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 c80ace14cf83..b45e4a432138 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.145-hardened1.patch", - "sha256": "08rq52prxnvzg0j2d8gs010hh44qlhga00h2mvcxlfj10ifg4rgb", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.145-hardened1/linux-hardened-5.10.145-hardened1.patch" + "name": "linux-hardened-5.10.146-hardened1.patch", + "sha256": "1ah8p0iy4cqjhmjd1zxqvspihx0wkj515ggca65rjrpmfr05f2ll", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.146-hardened1/linux-hardened-5.10.146-hardened1.patch" }, - "sha256": "0qdcqmwvc70hfgj8hb8ccwmnvwl41dvdffqrmyg3cyblwprr0ngw", - "version": "5.10.145" + "sha256": "1hbdxvlibp9w0q8bk1zlx77ayq2wcld8rjm134ybgbcf4zrrggbv", + "version": "5.10.146" }, "5.15": { "patch": { From 867fc5e1444bbee8d8809548439c59ad2edd4850 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 5 Oct 2022 18:38:47 +0200 Subject: [PATCH 09/11] linux/hardened/patches/5.15: 5.15.70-hardened1 -> 5.15.71-hardened1 (cherry picked from commit 650325d3453a2fffcf49270a37a1e7e27978d7a7) --- 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 b45e4a432138..77acc4adcf61 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.70-hardened1.patch", - "sha256": "0m3r9i5zyv12y4y6jn7yqv6n080ikar0hdn2bfzs85mnzc9vsmqr", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.70-hardened1/linux-hardened-5.15.70-hardened1.patch" + "name": "linux-hardened-5.15.71-hardened1.patch", + "sha256": "0yfvwivjj8swc4l0ngq4x1104jpfmzj9cb4pvxsagkkf8dwfvqc6", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.71-hardened1/linux-hardened-5.15.71-hardened1.patch" }, - "sha256": "0xhdjz7aqq13pkh1yr7ax3msqdb2xvrcpj464wibn1rl4pq2cz0s", - "version": "5.15.70" + "sha256": "0lqy3nmhij6sb4963kb5dhvfdx46mg79hp81kq10wv01iq9hhm2z", + "version": "5.15.71" }, "5.19": { "patch": { From a6ff9a26c28558a43ce89f717ad9850d0dabf954 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 5 Oct 2022 18:39:39 +0200 Subject: [PATCH 10/11] linux/hardened/patches/5.19: 5.19.11-hardened1 -> 5.19.12-hardened1 (cherry picked from commit 5ececd27afd9493f2dbcb3704c8e3970bd07ed0b) --- 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 77acc4adcf61..e8f559a7a28a 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -42,12 +42,12 @@ "5.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.19.11-hardened1.patch", - "sha256": "0n0w9qmbhhg9svnjkvmhx24i8d0mhrx2k4xfb3rmnsjg79rcl0qd", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.19.11-hardened1/linux-hardened-5.19.11-hardened1.patch" + "name": "linux-hardened-5.19.12-hardened1.patch", + "sha256": "157m9mkdqpm01rzwsgdcv88z51642fp3v0h5q0mafg4ph4afd7pg", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.19.12-hardened1/linux-hardened-5.19.12-hardened1.patch" }, - "sha256": "0wyrwdqm4dypx2jbb7d8c3b7fl7q5j434d6g9x2v6sw01gwx4m2m", - "version": "5.19.11" + "sha256": "1fmhwbgqpr6q3z3ygys153szivlmv3mcnwilbbyfcb1iqx4aadn4", + "version": "5.19.12" }, "5.4": { "patch": { From cb5fd3fd36d2650f6c3e7a1913d8b9e1b16e7595 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 5 Oct 2022 18:40:22 +0200 Subject: [PATCH 11/11] linux/hardened/patches/5.4: 5.4.214-hardened1 -> 5.4.215-hardened1 (cherry picked from commit 287084ca5b2b209f357d4cd7eab894c78e4d288f) --- 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 e8f559a7a28a..c9e600657bf0 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.214-hardened1.patch", - "sha256": "0j96knplhwvk1w1af4fs818ninvrs38ykg76mb80pjjvi3fdl402", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.214-hardened1/linux-hardened-5.4.214-hardened1.patch" + "name": "linux-hardened-5.4.215-hardened1.patch", + "sha256": "1xfyvppf16y7bjmjkhpps9vp4zw2dcrk18kajj1lkzhh441y1g94", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.215-hardened1/linux-hardened-5.4.215-hardened1.patch" }, - "sha256": "1ny57g5agk8sq6cbp2crjiay5bfkwqy32i4a5yw7x0lch2s7kg4s", - "version": "5.4.214" + "sha256": "1gafnf9gbsfzvp9jq6y8qhpvas5cv9y0m9bad2sg55sjlb1zfard", + "version": "5.4.215" } }