From a3a2df2aaa5d940d66e33d2ace89ca30ee1389b6 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 16 Sep 2021 14:05:32 +0000 Subject: [PATCH 01/13] linux: 5.10.64 -> 5.10.66 (cherry picked from commit 6c829ce0830528f8e0ea78acfedec8a345b1f81b) --- 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 9fd437c8c39..41a58eea9f8 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.64"; + version = "5.10.66"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "02p36mf41nsa4bamw18vhgbca094q2blbqqljdsb9qid9b94pf1y"; + sha256 = "19y8zh6wvjzj55kynfpgm3zbapyhwsqkgilycvmbjr6ipfxhdyjx"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ]; From 2521537c8f0dcb482af344b3d49f97fb3219d492 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 16 Sep 2021 14:05:45 +0000 Subject: [PATCH 02/13] linux: 5.13.16 -> 5.13.18 (cherry picked from commit 4954336e2b81ebcc108ffae0bf3a0a39d301030b) --- pkgs/os-specific/linux/kernel/linux-5.13.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.13.nix b/pkgs/os-specific/linux/kernel/linux-5.13.nix index 8c7d21886cb..347467106f9 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.13.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.13.16"; + version = "5.13.18"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1ljigvcg4q6ckr8kna3q5iyjsy7x5mrf1ycqfy0ibbhn9hbqjna9"; + sha256 = "0iqz34yjbk5zg8wc9majq7afg34nsgi0yxn0j4k3xrn22kyl2dm2"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_13 ]; From 9b42fb070fcf80551331a437e8600ed21fa21c59 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 16 Sep 2021 14:05:51 +0000 Subject: [PATCH 03/13] linux: 5.14.3 -> 5.14.5 (cherry picked from commit 4a05e7297cc766a2e295725bb991a50605cebbea) --- pkgs/os-specific/linux/kernel/linux-5.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.14.nix b/pkgs/os-specific/linux/kernel/linux-5.14.nix index 2a07ac2a0a9..46c34a4b51b 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.14.3"; + version = "5.14.5"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1n5808v3vb2c27pv4f8r4avqzqp20dylclbc83cj2872d6z41hy6"; + sha256 = "1zbcai5q1b5hjc3xhg05pghj5iyb0xsvrqyrazzmhrfbsqf8s5k5"; }; } // (args.argsOverride or { })) From 49d3b04cd93bb0989861055252767b3e2786a921 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 16 Sep 2021 14:05:57 +0000 Subject: [PATCH 04/13] linux: 5.4.145 -> 5.4.147 (cherry picked from commit 100f0569b54abaf1ed49ed8f525678a7eb02ab9a) --- 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 f3a7cb85948..779b1e29231 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.145"; + version = "5.4.147"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1yb8vk5sbnyswylkpqw5i4n9cmnmlrfmbrnmy3nif579q8p7ixsw"; + sha256 = "07242nlxf4s73ffdir3dsi37cjmm6bw9w7kac0j7x1s1j8sh9h7n"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ]; From a1b9329753db3f43c520a6ccd3708e8e9e83f525 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 16 Sep 2021 14:06:33 +0000 Subject: [PATCH 05/13] linux/hardened/patches/5.10: 5.10.63-hardened1 -> 5.10.65-hardened1 (cherry picked from commit 48e902a2efa3bb149d4526125e57c1429af95014) --- 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 70a180e737e..f5a1baab298 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.63-hardened1.patch", - "sha256": "1v1w6ybfkgqisdprny9bb658443hbld86r96cvzqdkmd8wfh4513", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.63-hardened1/linux-hardened-5.10.63-hardened1.patch" + "name": "linux-hardened-5.10.65-hardened1.patch", + "sha256": "0zc9amnjfn4dqdn0vagxqpymgmnpqb0h04i0zyc2zr5q33kgqwy9", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.65-hardened1/linux-hardened-5.10.65-hardened1.patch" }, "5.13": { "extra": "-hardened1", From cc619f3c02e372fe1e908727085b3c2cab0e92fe Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 16 Sep 2021 14:06:34 +0000 Subject: [PATCH 06/13] linux/hardened/patches/5.13: 5.13.15-hardened1 -> 5.13.17-hardened1 (cherry picked from commit a8de1dcd2b5896d141bc89e0fc2cc665cd9581d7) --- 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 f5a1baab298..c8cd302ea46 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.15-hardened1.patch", - "sha256": "1g75jh5j9qbh4wbiy2wnc982i2gld2845ai47rczcj7ciycba8n7", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.13.15-hardened1/linux-hardened-5.13.15-hardened1.patch" + "name": "linux-hardened-5.13.17-hardened1.patch", + "sha256": "18pqc53ny2bpipgcdar8kwnzcm8al1bfa249ydkrmqn7a94nh2p2", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.13.17-hardened1/linux-hardened-5.13.17-hardened1.patch" }, "5.14": { "extra": "-hardened1", From fbc340ce507dd4898c84a394ad4c205308409986 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 16 Sep 2021 14:06:35 +0000 Subject: [PATCH 07/13] linux/hardened/patches/5.14: 5.14.2-hardened1 -> 5.14.4-hardened1 (cherry picked from commit 60b711316445f580345d815cfd04be592b136b8a) --- 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 c8cd302ea46..eeea87d5071 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -25,9 +25,9 @@ }, "5.14": { "extra": "-hardened1", - "name": "linux-hardened-5.14.2-hardened1.patch", - "sha256": "0hcw61bavhyr9v621ajsrl2zgz7kc0z8r7p5kzm37dnlggwl4qh3", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.2-hardened1/linux-hardened-5.14.2-hardened1.patch" + "name": "linux-hardened-5.14.4-hardened1.patch", + "sha256": "05izlhlbh867cjxsag4hr9x18zhqnh9mkj3abx9rpqg6fm6qqis6", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.4-hardened1/linux-hardened-5.14.4-hardened1.patch" }, "5.4": { "extra": "-hardened1", From 6c5790dfb6088f35153e92863303af20476f2fe7 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 16 Sep 2021 14:06:36 +0000 Subject: [PATCH 08/13] linux/hardened/patches/5.4: 5.4.144-hardened1 -> 5.4.146-hardened1 (cherry picked from commit 00c500e9fc975957b4357ce46d5f10e8bf2cd1ba) --- 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 eeea87d5071..f0757fa2b4c 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -31,8 +31,8 @@ }, "5.4": { "extra": "-hardened1", - "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" + "name": "linux-hardened-5.4.146-hardened1.patch", + "sha256": "1bckgkd1cn5qjdq3finz3jfdn9gb18ypvibg3il4aj0a7jay5zra", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.146-hardened1/linux-hardened-5.4.146-hardened1.patch" } } From 0e29479866200636bcbcc95a7d31c79e2177c0b7 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 16 Sep 2021 09:56:12 +0200 Subject: [PATCH 09/13] wireguard-tools: 1.0.20210424 -> 1.0.20210914 ChangeLog: https://lists.zx2c4.com/pipermail/wireguard/2021-September/007049.html This doesn't seem to have any implications for NixOS users, but appears to have a few fixes that seem relevant to Darwin users including: wg-quick: darwin: account for "link#XX" gateways On macOS, under specific configurations, the `netstat -nr -f inet` and `netstat -nr -f inet6` outputs break gateway collection. (cherry picked from commit d37ab4d0ee6aeb3187a0f0042cfca966c3ef2f78) --- pkgs/tools/networking/wireguard-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index 5972d781bd1..f8867fb2c0d 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "wireguard-tools"; - version = "1.0.20210424"; + version = "1.0.20210914"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${version}.tar.xz"; - sha256 = "sha256-0aGaE4EBb4wb5g32Wugakt7w41sb97Hqqkac7qE641M="; + sha256 = "sha256-eGGkTVdPPTWK6iEyowW11F4ywRhd+0IXJTZCqY3OZws="; }; outputs = [ "out" "man" ]; From f35f202e0683d277f37cbbeacba17077ca44d239 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 17 Sep 2021 01:31:35 +0200 Subject: [PATCH 10/13] linux/hardened/patches/5.10: 5.10.65-hardened1 -> 5.10.66-hardened1 (cherry picked from commit 031afe4faa1e390ebdc10eb145aaeab9be978cea) --- 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 f0757fa2b4c..33b65e50543 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.65-hardened1.patch", - "sha256": "0zc9amnjfn4dqdn0vagxqpymgmnpqb0h04i0zyc2zr5q33kgqwy9", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.65-hardened1/linux-hardened-5.10.65-hardened1.patch" + "name": "linux-hardened-5.10.66-hardened1.patch", + "sha256": "0pj5ja28byaxgfvlwsljfha5a3ihg9s0cy4lpzxmagvz00nhbpvf", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.66-hardened1/linux-hardened-5.10.66-hardened1.patch" }, "5.13": { "extra": "-hardened1", From e6b00f2f5f3decb18810081477358748599cb028 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 17 Sep 2021 01:31:36 +0200 Subject: [PATCH 11/13] linux/hardened/patches/5.13: 5.13.17-hardened1 -> 5.13.18-hardened1 (cherry picked from commit 7c04d2e390a7dbb87a428f625839db42071b7b99) --- 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 33b65e50543..c85c491b1ce 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.17-hardened1.patch", - "sha256": "18pqc53ny2bpipgcdar8kwnzcm8al1bfa249ydkrmqn7a94nh2p2", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.13.17-hardened1/linux-hardened-5.13.17-hardened1.patch" + "name": "linux-hardened-5.13.18-hardened1.patch", + "sha256": "1cdr6l5c4j6666lvkxv30bfkhnf9sf5j7kqwc37pjk9kqmwnfbz1", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.13.18-hardened1/linux-hardened-5.13.18-hardened1.patch" }, "5.14": { "extra": "-hardened1", From 939149de74cb75de734a74dcf769ae9b6412f528 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 17 Sep 2021 01:31:37 +0200 Subject: [PATCH 12/13] linux/hardened/patches/5.4: 5.4.146-hardened1 -> 5.4.147-hardened1 (cherry picked from commit 36e21638f5f308d8985035bca9c14595c0a3b65f) --- 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 c85c491b1ce..137b6efcbd2 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -31,8 +31,8 @@ }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.146-hardened1.patch", - "sha256": "1bckgkd1cn5qjdq3finz3jfdn9gb18ypvibg3il4aj0a7jay5zra", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.146-hardened1/linux-hardened-5.4.146-hardened1.patch" + "name": "linux-hardened-5.4.147-hardened1.patch", + "sha256": "1jkvfpckmj9ig4nsxxiigawkay05lk8r9fps16iaq6lz2mf9vqsb", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.147-hardened1/linux-hardened-5.4.147-hardened1.patch" } } From 756786068ff346cae56c97e29d56a3ea721949cc Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 17 Sep 2021 01:31:36 +0200 Subject: [PATCH 13/13] linux/hardened/patches/5.14: 5.14.4-hardened1 -> 5.14.5-hardened1 (cherry picked from commit 9f34448a98ecc21726dd5e87b7a61daf76f954de) --- 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 137b6efcbd2..3f2cd554067 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -25,9 +25,9 @@ }, "5.14": { "extra": "-hardened1", - "name": "linux-hardened-5.14.4-hardened1.patch", - "sha256": "05izlhlbh867cjxsag4hr9x18zhqnh9mkj3abx9rpqg6fm6qqis6", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.4-hardened1/linux-hardened-5.14.4-hardened1.patch" + "name": "linux-hardened-5.14.5-hardened1.patch", + "sha256": "0qx7i9clxla2g59mcncg1wf07kvb5lpqkhdrc66xzpci65rq0qpd", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.5-hardened1/linux-hardened-5.14.5-hardened1.patch" }, "5.4": { "extra": "-hardened1",