package/sudo: drop uClibc-exec_ptrace fix applied upstream
PATCH 1/1 package/sudo: drop uClibc-exec_ptrace fix applied upstream
This commit drops a uClibc patch that was included in sudo's 1.9.16p2 release. This was applied on the primary development branch [1]; however, when porting fixes on 2025.05.x, a jump was made from 1.9.15p5 to 1.9.17p1 [2] which did not remove the patch.
[1]: 969bdb9d2e1857589292122adbc75073b1b30cd5
[2]: 07cde1ad1efe24d826ca99166534b3f0212cb5f7
---
This patch is for 2025.05.x.
--- ...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
package/sudo/0001-src-exec_ptrace-fix-build-without-precess_vm_readv.patch deleted +0 -41
@@ -1,41 +0,0 @@ -From 5bbfaa8e68b5ee6f27d4fbfa3c4e789341724f9c Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" <[email protected]> -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 <[email protected]> -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 -
Signature · 6 lines
2.49.0.windows.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Hello James, Thomas, and all,
Thank you for submitting this patch, although we already committed a similar one on the .pre branch (ie. what is going to become 2025.05.x as soon as Arnout officially pushes to the main Buildroot repository); see https://gitlab.com/essensium-mind/buildroot/-/commit/2b23a3bc199ca3156713530d0a108b27bd11977b
Have a nice day,
Titouan
Quoted 53 lines · James Knight
This commit drops a uClibc patch that was included in sudo's 1.9.16p2 release. This was applied on the primary development branch [1]; however, when porting fixes on 2025.05.x, a jump was made from 1.9.15p5 to 1.9.17p1 [2] which did not remove the patch.
[1]:
969bdb9d2e1857589292122adbc75073b1b30cd5
[2]:07cde1ad1efe24d826ca99166534b3f0212cb5f7Signed-off-by James Knight <[email protected]>---
This patch is for 2025.05.x.--- ...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.patchpackage/sudo/0001-src-exec_ptrace-fix-build-without-precess_vm_readv.patch deleted +0
-31@@ -1,41 +0,0 @@ -From 5bbfaa8e68b5ee6f27d4fbfa3c4e789341724f9c Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" <[email protected]> -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 <[email protected]> -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);
package/sudo/0001-src-exec_ptrace-fix-build-without-precess_vm_readv.patch line 41
Quoted 10 lines
package/sudo/0001-src-exec_ptrace-fix-build-without-precess_vm_readv.patch deleted +0
-10- - #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 -
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot