From 8b71a7f5bcb84528ec0a6d3cd9e0d5920406a777 Mon Sep 17 00:00:00 2001 From: Raphael Robatsch Date: Fri, 18 Oct 2024 20:46:15 +0200 Subject: [PATCH 01/10] mbedtls: 3.6.1 -> 3.6.2 Release notes: https://github.com/Mbed-TLS/mbedtls/releases/tag/mbedtls-3.6.2 Fixes CVE-2024-49195 (cherry picked from commit bd4bd87293adbd04bbd89a7a09086e03388000b1) --- pkgs/development/libraries/mbedtls/3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mbedtls/3.nix b/pkgs/development/libraries/mbedtls/3.nix index f8f53522db13..9655393615b9 100644 --- a/pkgs/development/libraries/mbedtls/3.nix +++ b/pkgs/development/libraries/mbedtls/3.nix @@ -1,6 +1,6 @@ { callPackage }: callPackage ./generic.nix { - version = "3.6.1"; - hash = "sha256-SVWz2uOvGIplnBr4g6nwfxKMWVpzdZjusseAhw6GOJ8="; + version = "3.6.2"; + hash = "sha256-tSWhF8i0Tx9QSFmyDEHdd2xveZvpyd+HXR+8xYj2Syo="; } From aebdf8128c27d8ac464697990bec90a93bbdd5bf Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 22 Oct 2024 17:48:13 +0300 Subject: [PATCH 02/10] linux_testing: 6.12-rc3 -> 6.12-rc4 (cherry picked from commit a498c2132129b4d9f35b7a167da4462a8189afc0) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 9a5f1c634dd7..189551403bae 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,7 +1,7 @@ { "testing": { - "version": "6.12-rc3", - "hash": "sha256:11jspf9h3zmqnnyjardyk1g9k09fivwbl267iddb2ildfhgrlvqw" + "version": "6.12-rc4", + "hash": "sha256:0qr5sbpm512rlkylqmqhy644s4lmfr1igvmx8ds0mrb54h3qhkwk" }, "6.1": { "version": "6.1.113", From f7a665a960d56fc94a0004cc4b53d0c42b2d48d8 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 22 Oct 2024 17:48:21 +0300 Subject: [PATCH 03/10] linux_6_11: 6.11.4 -> 6.11.5 (cherry picked from commit 3dffc1ef91996cfd308f87d78888a99e60428b2d) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 189551403bae..002c63f6f2d4 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -40,7 +40,7 @@ "hash": "sha256:0gj2z9ax1qv59n2mld0pg2svwi28lbq92ql98vy7crynd2ybrram" }, "6.11": { - "version": "6.11.4", - "hash": "sha256:0mcg1rrw9b0lwj88jkaw6ic2mks8xh8i92v90sbr2x35ljhb0m5x" + "version": "6.11.5", + "hash": "sha256:01rafnqal2v96dzkabz0irymq4sc9ja00ggyv1xn7yzjnyrqa527" } } From 63f0f02bc4a229354764969ebe8a91a3d6f08516 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 22 Oct 2024 17:48:29 +0300 Subject: [PATCH 04/10] linux_6_6: 6.6.57 -> 6.6.58 (cherry picked from commit c0b43de177e6cc1ac03f6b6bab64b8f4aecce996) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 002c63f6f2d4..36d761254c7a 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -24,8 +24,8 @@ "hash": "sha256:0qj106lj554y1kdqj8kwyf7pk9bvrrpgz6s8zyh7d61mk7wws9sf" }, "6.6": { - "version": "6.6.57", - "hash": "sha256:1cxpmgbp8hhwa045gappf2wzh3kk1iw2xivsxzhvi6bgz5p45kk6" + "version": "6.6.58", + "hash": "sha256:1nwrd017l5m4w12yrcf31y3g0l9xqm5b0fzcqdgan3ypi3jq3pz7" }, "6.8": { "version": "6.8.12", From 77900c3ba3cd0faf3f42b4b549c072d5232cb460 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 22 Oct 2024 17:48:39 +0300 Subject: [PATCH 05/10] linux_6_1: 6.1.113 -> 6.1.114 (cherry picked from commit 8b91f4ab38ab483b2c50624664b7a363e8b47e79) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 36d761254c7a..26655f3c47a4 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -4,8 +4,8 @@ "hash": "sha256:0qr5sbpm512rlkylqmqhy644s4lmfr1igvmx8ds0mrb54h3qhkwk" }, "6.1": { - "version": "6.1.113", - "hash": "sha256:0c4y8j65b3im0bf4ji4n7nfqaqa7c7ym2515li855k1g363i1bsl" + "version": "6.1.114", + "hash": "sha256:0mm2392qk01p9685bv9pilmvm5591br7kxyv4d8fdyx25shf91i2" }, "5.15": { "version": "5.15.168", From 4fbffcb2c75e00077f36717a3ff2581ab645dc62 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 22 Oct 2024 17:48:47 +0300 Subject: [PATCH 06/10] linux_5_15: 5.15.168 -> 5.15.169 (cherry picked from commit b86393146e0d751f86dc1b93c4d42d7070295290) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 26655f3c47a4..bc3e869c12ca 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -8,8 +8,8 @@ "hash": "sha256:0mm2392qk01p9685bv9pilmvm5591br7kxyv4d8fdyx25shf91i2" }, "5.15": { - "version": "5.15.168", - "hash": "sha256:0yp1705rjadv2v7hw2yq9n3bxgqzmlyam2bnp49p10jnfkavpgng" + "version": "5.15.169", + "hash": "sha256:0w2k4yrfrdnywbg3lqppig41yydy9c48v3jhfyach6zx8pccc676" }, "5.10": { "version": "5.10.227", From 572e8c7b6ea8a6f51a8018c947f90ba9b0e05ab8 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 22 Oct 2024 17:48:56 +0300 Subject: [PATCH 07/10] linux_5_10: 5.10.227 -> 5.10.228 (cherry picked from commit 57e480426a5a8ac14d9e8784f99c40b8e38baf05) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index bc3e869c12ca..3c4f37d789f4 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -12,8 +12,8 @@ "hash": "sha256:0w2k4yrfrdnywbg3lqppig41yydy9c48v3jhfyach6zx8pccc676" }, "5.10": { - "version": "5.10.227", - "hash": "sha256:1hknbfxq59731zmxgig7b69lfdmgh5jdg391hapvmlrh07hrvq2j" + "version": "5.10.228", + "hash": "sha256:0wkvn49sdy9ykyz6cqdqd9yplqfhc6b255w6wc17ky182mzqvk3n" }, "5.4": { "version": "5.4.284", From 67e69239226f37168d1adb8d29bd61150756a03e Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 22 Oct 2024 18:03:11 +0300 Subject: [PATCH 08/10] linux: cherry-pick netfilter fix (cherry picked from commit 7f3092416aeb3a50c7a5301dce051ea3198716c5) --- pkgs/os-specific/linux/kernel/patches.nix | 10 ++++++++++ pkgs/top-level/linux-kernels.nix | 8 ++++++++ 2 files changed, 18 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 5d4ebc214dc7..70b822870ec6 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -65,4 +65,14 @@ name = "export-rt-sched-migrate"; patch = ./export-rt-sched-migrate.patch; }; + + # Backport upstream fix for very annoying Tailscale issue + # FIXME: remove when merged upstream + netfilter-typo-fix = { + name = "netfilter-typo-fix"; + patch = fetchpatch { + url = "https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/patch/?id=306ed1728e8438caed30332e1ab46b28c25fe3d8"; + hash = "sha256-ZGc1xAIjf+MlV02jhIWZ4jHC742+z/WpN7RenqpU7e4="; + }; + }; } diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index d64a3a3240c4..bc71f74066e6 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -146,6 +146,7 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.netfilter-typo-fix ]; }; @@ -154,6 +155,7 @@ in { kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.export-rt-sched-migrate + kernelPatches.netfilter-typo-fix ]; }; @@ -162,6 +164,7 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.netfilter-typo-fix ]; }; @@ -170,6 +173,7 @@ in { kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.export-rt-sched-migrate + kernelPatches.netfilter-typo-fix ]; }; @@ -178,6 +182,7 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.netfilter-typo-fix ]; }; @@ -186,6 +191,7 @@ in { kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.export-rt-sched-migrate + kernelPatches.netfilter-typo-fix ]; }; @@ -202,6 +208,7 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.netfilter-typo-fix ]; }; @@ -213,6 +220,7 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.netfilter-typo-fix ]; }; latest = packageAliases.linux_latest.kernel; From 5de08b5ab1c68d49948577cfb696953383a4bb4a Mon Sep 17 00:00:00 2001 From: Michael Evans Date: Sun, 20 Oct 2024 10:16:31 +0200 Subject: [PATCH 09/10] paper-clip: 5.5 -> 5.5.1 (cherry picked from commit ae7f1f629256543e082d99aa610f0d65d27b7445) --- pkgs/by-name/pa/paper-clip/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pa/paper-clip/package.nix b/pkgs/by-name/pa/paper-clip/package.nix index 032bb9b5dbc4..d7376dde2226 100644 --- a/pkgs/by-name/pa/paper-clip/package.nix +++ b/pkgs/by-name/pa/paper-clip/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "paper-clip"; - version = "5.5"; + version = "5.5.1"; src = fetchFromGitHub { owner = "Diego-Ivan"; repo = "Paper-Clip"; rev = "v${finalAttrs.version}"; - hash = "sha256-WCnWWVYaKq4U2RG3S4Xfja0NvreJIqU2VUJzpX7KI/E="; + hash = "sha256-Jdsx5ZhujP0SgEtr4NMbXsTkMYrkQj7Vs+SSYziWpiw="; }; nativeBuildInputs = [ From 1724ad09ca321e83fbeaa8866f50206f874ece18 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Oct 2024 05:59:28 +0000 Subject: [PATCH 10/10] openvi: 7.5.29 -> 7.6.30 (cherry picked from commit 4356e47709d2b027347d96d60d2bb008f39af4b0) --- pkgs/applications/editors/openvi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/openvi/default.nix b/pkgs/applications/editors/openvi/default.nix index 3a522e8ff575..e361e8b4628c 100644 --- a/pkgs/applications/editors/openvi/default.nix +++ b/pkgs/applications/editors/openvi/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "openvi"; - version = "7.5.29"; + version = "7.6.30"; src = fetchFromGitHub { owner = "johnsonjh"; repo = "OpenVi"; rev = version; - hash = "sha256-ukNgTtVrYkL7Bf7O7ERyQ9TOR8ss/EHCTMbzHi3tkG4="; + hash = "sha256-P4w/PM9UmHmTzS9+WDK3x3MyZ7OoY2yO/Rx0vRMJuLI="; }; buildInputs = [ ncurses perl ];