commit: d026e6e417699653eeb305f0af3257fd66e599d6 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Jun 7 22:18:00 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Jun 7 22:18:00 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d026e6e4
app-admin/sudo: backport arm64 build fix patch Closes: https://bugs.gentoo.org/850454 Signed-off-by: Sam James <sam <AT> gentoo.org> .../sudo/files/sudo-1.9.11-fix-arm64-build.patch | 23 ++++++++++++++++++++++ app-admin/sudo/sudo-1.9.11.ebuild | 4 ++++ 2 files changed, 27 insertions(+) diff --git a/app-admin/sudo/files/sudo-1.9.11-fix-arm64-build.patch b/app-admin/sudo/files/sudo-1.9.11-fix-arm64-build.patch new file mode 100644 index 000000000000..baf960d49530 --- /dev/null +++ b/app-admin/sudo/files/sudo-1.9.11-fix-arm64-build.patch @@ -0,0 +1,23 @@ +https://github.com/sudo-project/sudo/commit/d549adf04bfde7936306203e2e8886ffd93d00ea +https://bugs.gentoo.org/850454 + +From: Pierre Bourdon <[email protected]> +Date: Tue, 7 Jun 2022 17:14:39 +0200 +Subject: [PATCH] exec_ptrace: fix missing sudo_pt_regs on aarch64 + +AArch64 already had an existing "user_pt_regs" struct and didn't need a +struct alias before the renaming to "sudo_pt_regs". Make the code build +again by adding the now missing alias. + +Fixes: 2eb8ff17 +--- a/src/exec_ptrace.h ++++ b/src/exec_ptrace.h +@@ -76,6 +76,7 @@ + # define reg_arg4(x) (x).r10 + #elif defined(__aarch64__) + # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_AARCH64 ++# define sudo_pt_regs struct user_pt_regs + # define reg_syscall(x) (x).regs[8] /* w8 */ + # define reg_retval(x) (x).regs[0] /* x0 */ + # define reg_sp(x) (x).sp /* sp */ + diff --git a/app-admin/sudo/sudo-1.9.11.ebuild b/app-admin/sudo/sudo-1.9.11.ebuild index dda0650bd5fc..7515b25714d3 100644 --- a/app-admin/sudo/sudo-1.9.11.ebuild +++ b/app-admin/sudo/sudo-1.9.11.ebuild @@ -80,6 +80,10 @@ REQUIRED_USE=" MAKEOPTS+=" SAMPLES=" +PATCHES=( + "${FILESDIR}"/${P}-fix-arm64-build.patch +) + src_prepare() { default elibtoolize
