From 6c74fc118a43d3a48ac26a074f17a027ac3bcaa7 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sat, 21 Aug 2021 00:06:21 +0200 Subject: [PATCH 1/7] linuxPackages_hardened: fix update.py this is kind of hack, idk how this worked before, tbh (cherry picked from commit e82f9673c5ec76b71409b3ec7e5c99043df63976) --- pkgs/os-specific/linux/kernel/hardened/update.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/update.py b/pkgs/os-specific/linux/kernel/hardened/update.py index e96ac9ca855..8ff65107926 100755 --- a/pkgs/os-specific/linux/kernel/hardened/update.py +++ b/pkgs/os-specific/linux/kernel/hardened/update.py @@ -226,7 +226,7 @@ for release in repo.get_releases(): else: # Fall back to the latest patch for this major kernel version, # skipping patches for kernels newer than the packaged one. - if kernel_version > packaged_kernel_version: + if '.'.join(str(x) for x in kernel_version) > '.'.join(str(x) for x in packaged_kernel_version): continue elif ( kernel_key not in releases or releases[kernel_key].version < version From 0cdce1e22b22a71f2d41a077fca763181e947069 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sat, 21 Aug 2021 00:07:04 +0200 Subject: [PATCH 2/7] linuxPackages_4_14_hardened: 4.14.243 -> 4.14.244 (cherry picked from commit 1120eafa972180641006d425d6e9e9b76aa4ee3f) --- 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 c3f0aa74257..5b68d0da200 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.243-hardened1.patch", - "sha256": "0ngz1ywkxjqyv92wirj9m6l99p4caj6n75h2mv0a6rhk9r4di6p6", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.243-hardened1/linux-hardened-4.14.243-hardened1.patch" + "name": "linux-hardened-4.14.244-hardened1.patch", + "sha256": "0cm5ylwxz2lzjx8c7z90h443sw7mjbr33cbrgfhaczvdzm6wxx0b", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.244-hardened1/linux-hardened-4.14.244-hardened1.patch" }, "4.19": { "extra": "-hardened1", From 676c5aa6bf75d0537667e44b2c532a0c09c68d8b Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sat, 21 Aug 2021 00:07:18 +0200 Subject: [PATCH 3/7] linuxPackages_4_19_hardened: 4.19.202 -> 4.19.204 (cherry picked from commit a438b96c9e52113fef9ec1ac3cd694bb97bb3caf) --- 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 5b68d0da200..2f4a3e52466 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.202-hardened1.patch", - "sha256": "0bylyc7k5azs8335mmzrgsx42cg8l3vm4izzikc8kchs2grb1q5v", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.202-hardened1/linux-hardened-4.19.202-hardened1.patch" + "name": "linux-hardened-4.19.204-hardened1.patch", + "sha256": "08i7985aqiiyi6h42rgf4hc09di3iy5p3i7iajzyfrzxfmgkdgdz", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.204-hardened1/linux-hardened-4.19.204-hardened1.patch" }, "5.10": { "extra": "-hardened1", From 329105e4a92306c03d4fe7f018071cba41f13d4c Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sat, 21 Aug 2021 00:07:35 +0200 Subject: [PATCH 4/7] linuxPackages_5_10_hardened: 5.10.57 -> 5.10.59 (cherry picked from commit 580d4b687ffad6101e23466789a2f97935bc5c40) --- 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 2f4a3e52466..9022628114a 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.57-hardened1.patch", - "sha256": "0zqv77k0i4q5w4qhgiknvrh4fav1jc4a2i9cdracwqlrk8fgmiih", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.57-hardened1/linux-hardened-5.10.57-hardened1.patch" + "name": "linux-hardened-5.10.59-hardened1.patch", + "sha256": "1v1i003arw8vxpdr52pxqmzqca06psrkk6zihyf36hvzpxbkapsk", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.59-hardened1/linux-hardened-5.10.59-hardened1.patch" }, "5.4": { "extra": "-hardened1", From 9bb174c59e79caebac1898d2fe4cf7e9421a46fc Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sat, 21 Aug 2021 00:07:49 +0200 Subject: [PATCH 5/7] linuxPackages_5_4_hardened: 5.4.139 -> 5.4.141 (cherry picked from commit b9b1fc1b383fb583721474498d3360a56f5501d5) --- 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 9022628114a..d4e9d474f7a 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -19,8 +19,8 @@ }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.139-hardened1.patch", - "sha256": "0lznmwy8yqc8rq5pr0akxclpnwz98pgai6ib5a3d77ncfham6fnl", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.139-hardened1/linux-hardened-5.4.139-hardened1.patch" + "name": "linux-hardened-5.4.141-hardened1.patch", + "sha256": "1i6arkayhc7x4jgbnshar7g2n9v2bf39yrsg07ga0sadqw3ky2sv", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.141-hardened1/linux-hardened-5.4.141-hardened1.patch" } } From 9690490f18af6b3c92bedb2bd77d05461a4ccf16 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sat, 21 Aug 2021 13:15:10 +0200 Subject: [PATCH 6/7] linuxPackages_5_10_hardened: 5.10.59 -> 5.10.60 (cherry picked from commit 883db296a2603d42074db9118323667e335e186e) --- 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 d4e9d474f7a..6c9e4eb52d8 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.59-hardened1.patch", - "sha256": "1v1i003arw8vxpdr52pxqmzqca06psrkk6zihyf36hvzpxbkapsk", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.59-hardened1/linux-hardened-5.10.59-hardened1.patch" + "name": "linux-hardened-5.10.60-hardened1.patch", + "sha256": "0hnc12ypggwln4b5i1zqd9mmhdkcky24xj4jxqp23dwzp03pwfh8", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.60-hardened1/linux-hardened-5.10.60-hardened1.patch" }, "5.4": { "extra": "-hardened1", From 7e07a7e299de715b5c7c6f737ea03d1cad5b61c1 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sat, 21 Aug 2021 13:15:24 +0200 Subject: [PATCH 7/7] linuxPackages_5_4_hardened: 5.4.141 -> 5.4.142 (cherry picked from commit 565973316564594fe9a572a8a4c48567375c2f19) --- 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 6c9e4eb52d8..5625cb6e0eb 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -19,8 +19,8 @@ }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.141-hardened1.patch", - "sha256": "1i6arkayhc7x4jgbnshar7g2n9v2bf39yrsg07ga0sadqw3ky2sv", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.141-hardened1/linux-hardened-5.4.141-hardened1.patch" + "name": "linux-hardened-5.4.142-hardened1.patch", + "sha256": "05195sxrs99gfwbb8icg8rzvqljhf1gpyhxr8da3qg6b4rvvnf0p", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.142-hardened1/linux-hardened-5.4.142-hardened1.patch" } }