From 5af25c5392c34a6010d461da7c8961c970145215 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 8 Sep 2023 10:44:26 +0200 Subject: [PATCH 01/12] linux: 5.15.130 -> 5.15.131 (cherry picked from commit ac54c20330416a2a0e51e20ab0cb5ad0a8269a9b) --- 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 905ce00cfc43e..e189e72010884 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.130"; + version = "5.15.131"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0qix62jsn3z9yccakac7fvqnip19zi05qn0w5wkgb7rj0x0lwimb"; + sha256 = "0sacnbw48lblnqaj56nybh588sq4k84gwf0r5zinzyrryj8k6z4r"; }; } // (args.argsOverride or { })) From c55d20e4f30d28936bcecf27a6a70e63a61492a6 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 8 Sep 2023 10:44:35 +0200 Subject: [PATCH 02/12] linux: 6.1.51 -> 6.1.52 (cherry picked from commit 1451d3d9e6a1f93dce18e560ace56f00dad530ea) --- pkgs/os-specific/linux/kernel/linux-6.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.1.nix b/pkgs/os-specific/linux/kernel/linux-6.1.nix index 75e3abd118e6d..9e14c7a6117e0 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.1.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.1.51"; + version = "6.1.52"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "0fqhmb6v28rssd44z7jw57mwvvskpl4kabjylck0pg54irnl9c2q"; + sha256 = "0lis73mxnl7hxz8lyja6sfgmbym944l3k1h7dab6b4mw1nckfxsn"; }; } // (args.argsOverride or { })) From 5d53a4cf3e94f4e79627d122898c464a098b4d8f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 8 Sep 2023 10:44:41 +0200 Subject: [PATCH 03/12] linux: 6.4.14 -> 6.4.15 (cherry picked from commit fa652714fa858f0d82780dc5d627139be6f3c079) --- pkgs/os-specific/linux/kernel/linux-6.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.4.nix b/pkgs/os-specific/linux/kernel/linux-6.4.nix index 1cf9f26ba8aeb..b5d9d64513240 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.4.14"; + version = "6.4.15"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "1rjh0jrn5qvxwzmyg478n08vckkld8r52nkc102ppqvsfhiy7skm"; + sha256 = "1phlx375ln5pslw5vjqm029cdv6pzf4ang10xlrf90x5sb4fgy93"; }; } // (args.argsOverride or { })) From a98547a2c703f44f8af9d600defb720518881c15 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 8 Sep 2023 10:44:47 +0200 Subject: [PATCH 04/12] linux: 6.5.1 -> 6.5.2 (cherry picked from commit a3c4740523b50934c20b28d6a67f0f5fa2f29075) --- pkgs/os-specific/linux/kernel/linux-6.5.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.5.nix b/pkgs/os-specific/linux/kernel/linux-6.5.nix index 3c2badfc62726..672c1c5596a36 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.5.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.5.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.5.1"; + version = "6.5.2"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; From c0bb42b43bf03c59b955ce6b56addd8e7f256b3b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 8 Sep 2023 10:45:59 +0200 Subject: [PATCH 05/12] linux/hardened/patches/4.14: 4.14.323-hardened1 -> 4.14.325-hardened1 (cherry picked from commit 6ac6990b8feac23039a881a891f5214cff13449f) --- 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 f3ffbde6f1d9e..83c9d2c824c0d 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.323-hardened1.patch", - "sha256": "0id59byd331mz8ga02gbs3g1q0y4n2wz6mi9s0dmp1yjagjd9m70", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.323-hardened1/linux-hardened-4.14.323-hardened1.patch" + "name": "linux-hardened-4.14.325-hardened1.patch", + "sha256": "1mc1pyjjksg2f4189wyas55ax8czzhai2i3jc6n7l9jmfwj7xr9q", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.325-hardened1/linux-hardened-4.14.325-hardened1.patch" }, - "sha256": "1g2fh0mn1sv0kq2hh3pynmx2fjai7hdwhf4fnaspl7j5n88902kg", - "version": "4.14.323" + "sha256": "117p1mdha57f6d3kdwac9jrbmib7g77q4xhir8ghl6fmrs1f2sav", + "version": "4.14.325" }, "4.19": { "patch": { From d672b8cc7ce8ba476f10382ed9e3855bd213552f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 8 Sep 2023 10:46:08 +0200 Subject: [PATCH 06/12] linux/hardened/patches/4.19: 4.19.292-hardened1 -> 4.19.294-hardened1 (cherry picked from commit bb82e63cbd172ca802c26a942a88573c2560f8ff) --- 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 83c9d2c824c0d..8b5eb7c53a2e2 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.292-hardened1.patch", - "sha256": "1na729sricp347jqp3y2j4yxxg84haa62mwmj9zq0pa1k6f037ph", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.292-hardened1/linux-hardened-4.19.292-hardened1.patch" + "name": "linux-hardened-4.19.294-hardened1.patch", + "sha256": "1s70vz8rai1z440rmwzipwpq7wa7p2bvri43zmkbisrfggm1lz2r", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.294-hardened1/linux-hardened-4.19.294-hardened1.patch" }, - "sha256": "0dr12v4jqmzxcqdghqqjny5zp3g4dx9lxqrl9d4fxz23s79ji5rl", - "version": "4.19.292" + "sha256": "03x0xsb8a369zdr81hg6xdl5n5v48k6iwnhj6r29725777lvvbfc", + "version": "4.19.294" }, "5.10": { "patch": { From 260959c7378f79c723955f851ce8bb0da73afc62 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 8 Sep 2023 10:46:18 +0200 Subject: [PATCH 07/12] linux/hardened/patches/5.10: 5.10.191-hardened1 -> 5.10.194-hardened1 (cherry picked from commit d475f8ff5eec2714cc6beac59ad9c04f364e2161) --- 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 8b5eb7c53a2e2..46c0d607baf7d 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.191-hardened1.patch", - "sha256": "02949v0qrr4b76g9rl1z8lkdfv3mc1pfb4h14z9bd0dqg5shlz0j", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.191-hardened1/linux-hardened-5.10.191-hardened1.patch" + "name": "linux-hardened-5.10.194-hardened1.patch", + "sha256": "1ba8ridhjz9y8ap1wgp7z41jmwzx8j0bxkyp1zjfls1z7mqq4vpf", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.194-hardened1/linux-hardened-5.10.194-hardened1.patch" }, - "sha256": "1hk2x5dgvfq9v6161v25wz5qpzgyvqbx34xbm7ww8z4ish76cm6b", - "version": "5.10.191" + "sha256": "15fr7krhpmqz0xqjg78m2xvfllbni3xh8xyhxh9ni31ppd3mw394", + "version": "5.10.194" }, "5.15": { "patch": { From aaa371a899e867ff090297b04f85412c3cf92ce7 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 8 Sep 2023 10:46:32 +0200 Subject: [PATCH 08/12] linux/hardened/patches/5.15: 5.15.127-hardened1 -> 5.15.130-hardened1 (cherry picked from commit 0d7c44bfa8993d18f9408ac8c72cc16ba04884ab) --- 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 46c0d607baf7d..03845c9324bcd 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.127-hardened1.patch", - "sha256": "13z0x45jig81f3vhb5w3lvb554b78888grp7w60sqgglx7bckspb", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.127-hardened1/linux-hardened-5.15.127-hardened1.patch" + "name": "linux-hardened-5.15.130-hardened1.patch", + "sha256": "12wm6kyg63rg1lk1w9208vpcm71cjy236rjp9gf8mfx7iraqssl7", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.130-hardened1/linux-hardened-5.15.130-hardened1.patch" }, - "sha256": "09lgj9hs1cjxg84hb7avras4rlsx18igr69mx433l9hv6issbl5d", - "version": "5.15.127" + "sha256": "0qix62jsn3z9yccakac7fvqnip19zi05qn0w5wkgb7rj0x0lwimb", + "version": "5.15.130" }, "5.4": { "patch": { From 39770841f2eaa4c723914273b2a6e7411fc5e01c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 8 Sep 2023 10:46:42 +0200 Subject: [PATCH 09/12] linux/hardened/patches/5.4: 5.4.254-hardened1 -> 5.4.256-hardened1 (cherry picked from commit 14a7fc876f45439b23b1754cd3152473e444a88d) --- 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 03845c9324bcd..7adb0ace23c3e 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -42,12 +42,12 @@ "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.254-hardened1.patch", - "sha256": "0yh5kb23lp89qnk90lz73j101bg20npr7clx0y8zmg6dihls764z", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.254-hardened1/linux-hardened-5.4.254-hardened1.patch" + "name": "linux-hardened-5.4.256-hardened1.patch", + "sha256": "1rsp30g5xry5y95mz0i6walkcxj6abyrsaq3fwhz0ka6nq6g7w82", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.256-hardened1/linux-hardened-5.4.256-hardened1.patch" }, - "sha256": "1iyrm2xql15ifhy2b939ywrrc44yd41b79sjjim4vqxmc6lqsq2i", - "version": "5.4.254" + "sha256": "0fim5q9xakwnjfg48bpsic9r2r8dvrjlalqqkm9vh1rml9mhi967", + "version": "5.4.256" }, "6.1": { "patch": { From b1909021043a92b54646c8aa2475ce92ef88ec19 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 8 Sep 2023 10:46:52 +0200 Subject: [PATCH 10/12] linux/hardened/patches/6.1: 6.1.47-hardened1 -> 6.1.51-hardened1 (cherry picked from commit 93ee933c2e63e42ec5002715acc1b75c9442d40e) --- 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 7adb0ace23c3e..bb18e1a2c2202 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -52,12 +52,12 @@ "6.1": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.1.47-hardened1.patch", - "sha256": "0wgsjb05m9f0fgv4vj0m0ll9bx22z894qlpwb45b33mq66fvbgwn", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.47-hardened1/linux-hardened-6.1.47-hardened1.patch" + "name": "linux-hardened-6.1.51-hardened1.patch", + "sha256": "0nbf7j3hwlsvh8f4mmc9w2gqdcj8lyx1hxrz91y2hwlqlqjx7w4p", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.51-hardened1/linux-hardened-6.1.51-hardened1.patch" }, - "sha256": "1azwvlzyp1s2adm17ic0jfmv3ph70wqzycb8s96z9987y1m8pmck", - "version": "6.1.47" + "sha256": "0fqhmb6v28rssd44z7jw57mwvvskpl4kabjylck0pg54irnl9c2q", + "version": "6.1.51" }, "6.4": { "patch": { From e67252116fbfbe322e8ef06181204860e5167b85 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 8 Sep 2023 10:47:05 +0200 Subject: [PATCH 11/12] linux/hardened/patches/6.4: 6.4.12-hardened1 -> 6.4.14-hardened1 (cherry picked from commit 632d72f463ae38bfe618016f1780717a95ffc77f) --- 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 bb18e1a2c2202..ab62028af7bc3 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -62,11 +62,11 @@ "6.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.4.12-hardened1.patch", - "sha256": "0xkcvyy2ii5wfdw8h21svcsz3s3q0qk4yx7dxzbrisap10d79l51", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.4.12-hardened1/linux-hardened-6.4.12-hardened1.patch" + "name": "linux-hardened-6.4.14-hardened1.patch", + "sha256": "1cw0zyjxbfprb2m2kjrpz8s56axbzhnwj8hg9b0486nsqz5s66bs", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.4.14-hardened1/linux-hardened-6.4.14-hardened1.patch" }, - "sha256": "0x56b4hslm730ghvggz41fjkbzlnxp6k8857dn7iy27yavlipafc", - "version": "6.4.12" + "sha256": "1rjh0jrn5qvxwzmyg478n08vckkld8r52nkc102ppqvsfhiy7skm", + "version": "6.4.14" } } From 89b41b3408ea308e9a896e9094e4be65b8e1c005 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 10 Sep 2023 16:40:24 +0300 Subject: [PATCH 12/12] linux: fix hash for 6.5.2 TODO: investigate why the update script broke (cherry picked from commit 8e4b53be9d76c2fce89afea250efa4e204193ddd) --- pkgs/os-specific/linux/kernel/linux-6.5.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.5.nix b/pkgs/os-specific/linux/kernel/linux-6.5.nix index 672c1c5596a36..341cc84be74df 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.5.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.5.nix @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - hash = "sha256-I3Zd1EQlRizZKtvuUmcGCP1/P9GDqDslunp7SIPQRRs="; + hash = "sha256-ICfhQFfVaK093BANrfTIhTpJsDEnBHimHYj2ARVyZQ8="; }; } // (args.argsOverride or { }))