diff options
author | Vladimír Čunát <v@cunat.cz> | 2021-08-22 11:44:05 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2021-08-22 11:44:05 +0200 |
commit | 53114d1a9adb8927c296d1e708c006a14d0a6fec (patch) | |
tree | fed84f76fbe686233d0fd2c4397231b8fb1b0f23 | |
parent | 4fdfea5fcc1af256d2057a8eda1a29f494f23bf6 (diff) | |
parent | 565973316564594fe9a572a8a4c48567375c2f19 (diff) | |
download | nixpkgs-53114d1a9adb8927c296d1e708c006a14d0a6fec.tar nixpkgs-53114d1a9adb8927c296d1e708c006a14d0a6fec.tar.gz nixpkgs-53114d1a9adb8927c296d1e708c006a14d0a6fec.tar.bz2 nixpkgs-53114d1a9adb8927c296d1e708c006a14d0a6fec.tar.lz nixpkgs-53114d1a9adb8927c296d1e708c006a14d0a6fec.tar.xz nixpkgs-53114d1a9adb8927c296d1e708c006a14d0a6fec.tar.zst nixpkgs-53114d1a9adb8927c296d1e708c006a14d0a6fec.zip |
Merge #135008: linux_*_hardened: update (fix build)
-rw-r--r-- | pkgs/os-specific/linux/kernel/hardened/patches.json | 24 | ||||
-rwxr-xr-x | pkgs/os-specific/linux/kernel/hardened/update.py | 2 |
2 files changed, 13 insertions, 13 deletions
diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index c3f0aa74257..5625cb6e0eb 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,26 +1,26 @@ { "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", - "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", - "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.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", - "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.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" } } 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 |