From fc490fffe6637d6d928226cf37ac9a34c20790ea Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 26 Apr 2023 19:15:17 +0200 Subject: [PATCH 01/14] linux: 4.14.313 -> 4.14.314 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index f13198ce00df..24fd30006d65 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.313"; + version = "4.14.314"; # 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/v4.x/linux-${version}.tar.xz"; - sha256 = "0k2j856niappvkp9m1wxr87xvbwdzdy03mbcj827kmpjd9gdca76"; + sha256 = "0lwiykv2ci7lrjvvykbiqavzzizdkf8xxqlybixi9l1as7q02v47"; }; } // (args.argsOverride or {})) From 59c26aa791bb0bef9c2ae27b5c652a00e07fd669 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 26 Apr 2023 19:15:27 +0200 Subject: [PATCH 02/14] linux: 4.19.281 -> 4.19.282 --- 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 c6a13a9378f6..defd77d4eef3 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.281"; + version = "4.19.282"; # 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/v4.x/linux-${version}.tar.xz"; - sha256 = "13nwzsh3h634450k37pxdca5j8vr3qswx7k79bs2999xp2js9pf0"; + sha256 = "02z20879xl4ya957by1p35vi1a7myzxwiqd9cnvm541sgnci99a3"; }; } // (args.argsOverride or {})) From 1bb2f9aac306aa96346b19002ae74f888a6d3c58 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 26 Apr 2023 19:15:38 +0200 Subject: [PATCH 03/14] linux: 5.10.178 -> 5.10.179 --- 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 9a82437cecaa..39b5b0ff503b 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.178"; + version = "5.10.179"; # 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 = "1bx8wws9gvksg1c1af29nm03jjz2f5a5sq9hzc00ymjyf7isvkqs"; + sha256 = "0abylcqbzpxxh45kmvd9i2cig64aajz87j5c8vm3w1ab2mf49g8v"; }; } // (args.argsOverride or {})) From 81bc93e6d121faa702dc004eeb50c93be997f07d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 26 Apr 2023 19:15:49 +0200 Subject: [PATCH 04/14] linux: 5.15.108 -> 5.15.109 --- 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 548693211864..61497c74fd00 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.108"; + version = "5.15.109"; # 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 = "1fj38bvsyr9g89qr8pcjrp0kaq44g301x46gyjibq73gljnnkswb"; + sha256 = "06kpqpmbp4gpsx1yqcznmbn41wq82wmza0p3l9l00j1wpsy4nv06"; }; } // (args.argsOverride or { })) From d9487020e9c92ababbe6236ce7dd52304a7ba15f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 26 Apr 2023 19:15:59 +0200 Subject: [PATCH 05/14] linux: 5.4.241 -> 5.4.242 --- 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 6ffd5ae0db26..8dc848104639 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.241"; + version = "5.4.242"; # 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 = "0z7api3qcjrd6w7fva7k6fj4zx17mg5ibn28a6qbgy27dyny1h7z"; + sha256 = "0a7wfi84p74qsnbj1vamz4qxzp94v054jp1csyfl0blz3knrlbql"; }; } // (args.argsOverride or {})) From 3f8dd842b6c5b1aab5c71ad9feb7acb86cd8e15b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 26 Apr 2023 19:16:11 +0200 Subject: [PATCH 06/14] linux: 6.1.25 -> 6.1.26 --- 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 8d598f812215..002d2eadff20 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.25"; + version = "6.1.26"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "149h95r5msvqah868zd36y92ls9h41cr1rb5vzinl20mxdn46wnb"; + sha256 = "0461ckgh9qm1pj9xyi61cvawqpavn2sb44wjx5g4mmkrm11w3p6z"; }; # TODO: possible to remove after any rebuild, e.g. after update. extraConfig = lib.optionalString (buildPackages.stdenv.system == "x86_64-linux") "\n"; From 7a97895091ad5ae3e435291dbadfe76db868c94c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 26 Apr 2023 19:16:23 +0200 Subject: [PATCH 07/14] linux: 6.2.12 -> 6.2.13 --- pkgs/os-specific/linux/kernel/linux-6.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.2.nix b/pkgs/os-specific/linux/kernel/linux-6.2.nix index 3141e37b237f..68aa7e9aecf0 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.2.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.2.12"; + version = "6.2.13"; # 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 = "1j6cn1ifmcqfqvxp9h10y8yfxi918yzl3yjbf96gmb9p4ysldqf7"; + sha256 = "0xz507nzslgidq7pwnfnsawvrn30apv4mmiapcc4p0v8wcafvpf7"; }; } // (args.argsOverride or { })) From 9af09ebb3d80fe0c7e9c289ad9fec05de942c940 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 26 Apr 2023 19:16:49 +0200 Subject: [PATCH 08/14] linux_latest-libre: 19172 -> 19204 --- 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 60838e20b826..1e1382f86a42 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 = "19172"; - sha256 = "18r6p1zg7af7vpij1kna2i2w82xb0c8qrbbr9bfz6bcj8fqv8l2z"; + rev = "19204"; + sha256 = "1cxg2bslskjby11mxqv71w701217i1s9yj73ih3hjzxs6hkv9r0v"; } , ... }: From 857a4a111f4e2b46900298a5fb09c820b09b03e3 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 26 Apr 2023 19:17:40 +0200 Subject: [PATCH 09/14] linux/hardened/patches/4.14: 4.14.312-hardened1 -> 4.14.313-hardened1 --- 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 d821d72dae00..d6ce79ae712a 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.312-hardened1.patch", - "sha256": "1ysbbd43zgh1zbk99kpzwwa42ywprj2j4bwy87l58vlwcd2xf53r", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.312-hardened1/linux-hardened-4.14.312-hardened1.patch" + "name": "linux-hardened-4.14.313-hardened1.patch", + "sha256": "0qpf9chiydj6dcka1lf6qdx462wq0salxac3kkl32l33karax292", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.313-hardened1/linux-hardened-4.14.313-hardened1.patch" }, - "sha256": "03bwrnm7z8jxxn681dd5jffrj76l14ngkcccfgbg1p4a0471q436", - "version": "4.14.312" + "sha256": "0k2j856niappvkp9m1wxr87xvbwdzdy03mbcj827kmpjd9gdca76", + "version": "4.14.313" }, "4.19": { "patch": { From 44167600c6306e660d6664f55fa551753875089c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 26 Apr 2023 19:17:52 +0200 Subject: [PATCH 10/14] linux/hardened/patches/4.19: 4.19.280-hardened1 -> 4.19.281-hardened1 --- 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 d6ce79ae712a..ffc199efa075 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.280-hardened1.patch", - "sha256": "0ayl7hcwf4j763gqzrd79kp7cyq7m5v6ar6znfi57ssqdrwq494l", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.280-hardened1/linux-hardened-4.19.280-hardened1.patch" + "name": "linux-hardened-4.19.281-hardened1.patch", + "sha256": "0qhf0835zwmj0z2654bhyc6zww68g8ng4ghg5ivw2zcfv6yssv17", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.281-hardened1/linux-hardened-4.19.281-hardened1.patch" }, - "sha256": "1xmg9p3ky75n5q894f522s8nwcmbd5c15nmjr0n96m6xzag3kd7w", - "version": "4.19.280" + "sha256": "13nwzsh3h634450k37pxdca5j8vr3qswx7k79bs2999xp2js9pf0", + "version": "4.19.281" }, "5.10": { "patch": { From 7a21026a95b484a75a0c865a56ccd5dfc0259edc Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 26 Apr 2023 19:18:04 +0200 Subject: [PATCH 11/14] linux/hardened/patches/5.10: 5.10.177-hardened1 -> 5.10.178-hardened1 --- 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 ffc199efa075..0f775abee218 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.177-hardened1.patch", - "sha256": "19ic849ph32nca206ngcf11v52k60z4lwyssaqdnhbikv3z1zpfj", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.177-hardened1/linux-hardened-5.10.177-hardened1.patch" + "name": "linux-hardened-5.10.178-hardened1.patch", + "sha256": "142ym9z6c9bcq2hpv2ik6xsjlvyyvw3vx8ggp4a67zwv6apg48v3", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.178-hardened1/linux-hardened-5.10.178-hardened1.patch" }, - "sha256": "0waml6svj07b7f8yb1kzrflqlf61x4kcqbgsr372s484m3z628lz", - "version": "5.10.177" + "sha256": "1bx8wws9gvksg1c1af29nm03jjz2f5a5sq9hzc00ymjyf7isvkqs", + "version": "5.10.178" }, "5.15": { "patch": { From 1c41b1af7c4f67145bcc3c401ee50a1f6da96898 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 26 Apr 2023 19:18:17 +0200 Subject: [PATCH 12/14] linux/hardened/patches/5.15: 5.15.107-hardened1 -> 5.15.108-hardened1 --- 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 0f775abee218..5b28679f4fd1 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.107-hardened1.patch", - "sha256": "1rd0lh9jdr2jm3aa91cax6m2fkmnhx2994gqwcnp1mqsy0bi9yh9", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.107-hardened1/linux-hardened-5.15.107-hardened1.patch" + "name": "linux-hardened-5.15.108-hardened1.patch", + "sha256": "1qfmx640b2s10q3sz0lcn1fsfbhklg8l4bzahrsdq6gkvsy9lyxn", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.108-hardened1/linux-hardened-5.15.108-hardened1.patch" }, - "sha256": "1a5gqpxmzls5mp4a0cw10ldrps4pvbn19nzfri91ys25j1v0wdqr", - "version": "5.15.107" + "sha256": "1fj38bvsyr9g89qr8pcjrp0kaq44g301x46gyjibq73gljnnkswb", + "version": "5.15.108" }, "5.4": { "patch": { From bfdb671cd53fb625b85fc071a36e35d06b0f772d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 26 Apr 2023 19:18:29 +0200 Subject: [PATCH 13/14] linux/hardened/patches/5.4: 5.4.240-hardened1 -> 5.4.241-hardened1 --- 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 5b28679f4fd1..57356b99e6c0 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.240-hardened1.patch", - "sha256": "0z64r2zs1swby2ws88xd1wy7dp83gamkk09asncc7k51zr9awraf", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.240-hardened1/linux-hardened-5.4.240-hardened1.patch" + "name": "linux-hardened-5.4.241-hardened1.patch", + "sha256": "1nksqvc1ql42v92bfp26yyczvzslzl73mhnfc83j6cayqx8dw59z", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.241-hardened1/linux-hardened-5.4.241-hardened1.patch" }, - "sha256": "0ihf0rqhx7dav3k3igk29962sscb1xyniy2gx8chyllprr0z126w", - "version": "5.4.240" + "sha256": "0z7api3qcjrd6w7fva7k6fj4zx17mg5ibn28a6qbgy27dyny1h7z", + "version": "5.4.241" }, "6.1": { "patch": { From 3f02834f9027c8b1a15cb59c81ccfffff810b9c5 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 26 Apr 2023 19:18:43 +0200 Subject: [PATCH 14/14] linux/hardened/patches/6.1: 6.1.24-hardened2 -> 6.1.25-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 57356b99e6c0..ae97f9dd60d1 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -51,12 +51,12 @@ }, "6.1": { "patch": { - "extra": "-hardened2", - "name": "linux-hardened-6.1.24-hardened2.patch", - "sha256": "1bjcjq0gqvhknryq97qj1a6q3fi71pql23knvs0c42k4vknfih9q", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.24-hardened2/linux-hardened-6.1.24-hardened2.patch" + "extra": "-hardened1", + "name": "linux-hardened-6.1.25-hardened1.patch", + "sha256": "1s9fx4nznmabg7b19qm7nwhpgdvin4f2gxd8f27zh7anbv9na4x7", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.25-hardened1/linux-hardened-6.1.25-hardened1.patch" }, - "sha256": "0135aj8asplpxqr48hwdmwynx8n8hzhdgh55yl8r0n1kivisgrma", - "version": "6.1.24" + "sha256": "149h95r5msvqah868zd36y92ls9h41cr1rb5vzinl20mxdn46wnb", + "version": "6.1.25" } }