From 1324b7ff848593197acbbe23c36e6728c8482edd Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 7 Sep 2021 12:26:22 -0400 Subject: [PATCH 1/7] linux_latest-libre: 18298 -> 18314 --- 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 3642dfe442d02..d9f8912416a5d 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 = "18298"; - sha256 = "027fp6h7295cc9m5g46phqd6hixcnvihpfsyrnzvsxz6pkvjzpw4"; + rev = "18314"; + sha256 = "0fic073zafwdsw7i0j4z57a4aknk8kpgnbrxpbi181n5axdlm99k"; } , ... }: From 60a39233506be7289ea68ebe8cebc6cf371cf394 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 7 Sep 2021 12:26:38 -0400 Subject: [PATCH 2/7] linux/hardened/patches/4.14: 4.14.245-hardened1 -> 4.14.246-hardened1 --- 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 dc379de316123..e4b78f9c45891 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.245-hardened1.patch", - "sha256": "035sq0l15afhyfivkavd08pyaywsrcl6f468gykmbq9j3i2swbb6", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.245-hardened1/linux-hardened-4.14.245-hardened1.patch" + "name": "linux-hardened-4.14.246-hardened1.patch", + "sha256": "1b15687ac2pkz46qliq1blyja7cjwn19q2bkd0c5912kzly76ghd", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.246-hardened1/linux-hardened-4.14.246-hardened1.patch" }, "4.19": { "extra": "-hardened1", From efa515a6614a99ae915e6dbc2090faa99bf2e534 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 7 Sep 2021 12:26:40 -0400 Subject: [PATCH 3/7] linux/hardened/patches/4.19: 4.19.205-hardened1 -> 4.19.206-hardened1 --- 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 e4b78f9c45891..67b33efd04ced 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.205-hardened1.patch", - "sha256": "14v3kwkkhyng0wfz4spca6z7wvsxj4kplj144qv1k3fm9yy2cy3h", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.205-hardened1/linux-hardened-4.19.205-hardened1.patch" + "name": "linux-hardened-4.19.206-hardened1.patch", + "sha256": "12ylhvjvabal29gi00cpjh3s47qj0vav6f2y145z4c9r2z77816k", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.206-hardened1/linux-hardened-4.19.206-hardened1.patch" }, "5.10": { "extra": "-hardened1", From ba9a42ec7d4d028e6f4316c50c287b260d6505e8 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 7 Sep 2021 12:26:41 -0400 Subject: [PATCH 4/7] linux/hardened/patches/5.10: 5.10.61-hardened1 -> 5.10.62-hardened1 --- 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 67b33efd04ced..358a065c1a816 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.61-hardened1.patch", - "sha256": "0hg67w9s6nzfmar8y01cnc46b2m2sa6s1xz85x1z1c46vw9558f0", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.61-hardened1/linux-hardened-5.10.61-hardened1.patch" + "name": "linux-hardened-5.10.62-hardened1.patch", + "sha256": "0xdj9mp0ccilj06pb8my5jqw47xwc2fk7f2ck36g4bzsp669nisj", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.62-hardened1/linux-hardened-5.10.62-hardened1.patch" }, "5.13": { "extra": "-hardened1", From 91e3d2baf2ea6a265a2abac0b2247e2f9ef9bded Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 7 Sep 2021 12:26:42 -0400 Subject: [PATCH 5/7] linux/hardened/patches/5.13: 5.13.13-hardened1 -> 5.13.14-hardened1 --- 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 358a065c1a816..ff6e3f128efbe 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -19,9 +19,9 @@ }, "5.13": { "extra": "-hardened1", - "name": "linux-hardened-5.13.13-hardened1.patch", - "sha256": "1rb4jpz8zbpijybpm7dwxr05f9nmf6b9av2b651ffxg5vziw17l3", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.13.13-hardened1/linux-hardened-5.13.13-hardened1.patch" + "name": "linux-hardened-5.13.14-hardened1.patch", + "sha256": "00lmqq10d66s1852q1j2m8cj90bb0gfpsg617bc7f3pm2v6iyl93", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.13.14-hardened1/linux-hardened-5.13.14-hardened1.patch" }, "5.4": { "extra": "-hardened1", From 4c4cc33bfe8ec56097a1e54c252cc0db16ffd864 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 7 Sep 2021 12:26:43 -0400 Subject: [PATCH 6/7] linux/hardened/patches/5.4: 5.4.143-hardened1 -> 5.4.144-hardened1 --- 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 ff6e3f128efbe..5da3676a1c82f 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.143-hardened1.patch", - "sha256": "0xv29cclypywq52908zppxpjrxllcdb67chw7lcia60y1aqsg83z", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.143-hardened1/linux-hardened-5.4.143-hardened1.patch" + "name": "linux-hardened-5.4.144-hardened1.patch", + "sha256": "1vm19d5cwxw3l2s4h7sbzrhk60m24nhbjdlpqd1bkbm8x8zcp9f3", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.144-hardened1/linux-hardened-5.4.144-hardened1.patch" } } From 5506944f72fa9750a3139c5b2cc415ab034baf7d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 7 Sep 2021 12:27:08 -0400 Subject: [PATCH 7/7] linux_5_13_hardened: Init --- pkgs/top-level/all-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 122658d0848df..d6df5718e95a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21699,6 +21699,9 @@ with pkgs; linuxPackages_5_10_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_5_10 { }); linux_5_10_hardened = linuxPackages_5_10_hardened.kernel; + linuxPackages_5_13_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_5_13 { }); + linux_5_13_hardened = linuxPackages_5_13_hardened.kernel; + # Hardkernel (Odroid) kernels. linuxPackages_hardkernel_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_hardkernel_4_14); linuxPackages_hardkernel_latest = linuxPackages_hardkernel_4_14;