From 2b23a3bc199ca3156713530d0a108b27bd11977b Mon Sep 17 00:00:00 2001 From: Titouan Christophe Date: Fri, 11 Jul 2025 15:54:48 +0200 Subject: [PATCH] package/sudo: drop patch that has been merged upstream The patch has been integrated upstream as part of sudo 1.9.16p2, and was therefore removed from Buildroot in [1]. However, because that change in Buildroot was not considered as a security bump at that time, it hasn't been cherry-picked to the 2025.02.x LTS branch. Later on, sudo issued a new security version, which has been promptly merged into Buildroot master in [2]. Since this addressed a security issue, the patch has also been backported into the 2025.02.x LTS branch [3]. The backport integrated the 2 versions bumps into one change, but the patch removal was lost in the process. Fixes: https://autobuild.buildroot.net/results/260/260a8e8da6e459b7c723fbeaeb23fb1fcf0db155// [1] 969bdb9d2e1857589292122adbc75073b1b30cd5 [2] ee86844e632d5760355154ea4e928c9228f3dfd1 [3] 9bcbbcc37f99e1526901ec843ca2d9d66f0eddda Signed-off-by: Titouan Christophe Signed-off-by: Thomas Perale (cherry picked from commit 38264adb15226d0e4d5b1799b7fc288d767fa8ad) Signed-off-by: Titouan Christophe --- ...e-fix-build-without-precess_vm_readv.patch | 41 ------------------- 1 file changed, 41 deletions(-) delete mode 100644 package/sudo/0001-src-exec_ptrace-fix-build-without-precess_vm_readv.patch diff --git a/package/sudo/0001-src-exec_ptrace-fix-build-without-precess_vm_readv.patch b/package/sudo/0001-src-exec_ptrace-fix-build-without-precess_vm_readv.patch deleted file mode 100644 index 446f1d1797..0000000000 --- a/package/sudo/0001-src-exec_ptrace-fix-build-without-precess_vm_readv.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 5bbfaa8e68b5ee6f27d4fbfa3c4e789341724f9c Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Sat, 17 Feb 2024 17:52:45 +0100 -Subject: [PATCH] src/exec_ptrace: fix build without precess_vm_readv() - -Commit 32f4b98f6b4a (sudo frontend: silence most -Wconversion warnings.) -broke the build on C libraries that miss process_vm_readv(), like -uClibc-ng. - -Indeed, the ssize_t nwritten is declared guarded by HAVE_PROCESS_VM_READV, -but is then re-assigned and used a few lines below, outside any guard. - -Fix that by always declaring the object, as it is always needed. - -Signed-off-by: Yann E. MORIN -Upstream: https://github.com/sudo-project/sudo/commit/5bbfaa8e68b5ee6f27d4fbfa3c4e789341724f9c ---- - src/exec_ptrace.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/exec_ptrace.c b/src/exec_ptrace.c -index 9dd36c275..3d44b82e2 100644 ---- a/src/exec_ptrace.c -+++ b/src/exec_ptrace.c -@@ -878,11 +878,12 @@ ptrace_write_vec(pid_t pid, struct sudo_ptrace_regs *regs, char **vec, - unsigned long addr, unsigned long strtab) - { - const unsigned long strtab0 = strtab; -+ ssize_t nwritten; - size_t i; - debug_decl(ptrace_write_vec, SUDO_DEBUG_EXEC); - - #ifdef HAVE_PROCESS_VM_READV -- ssize_t nwritten = ptrace_writev_vec(pid, regs, vec, addr, strtab); -+ nwritten = ptrace_writev_vec(pid, regs, vec, addr, strtab); - if (nwritten != -1 || errno != ENOSYS) - debug_return_ssize_t(nwritten); - #endif /* HAVE_PROCESS_VM_READV */ --- -2.43.0 -