From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 246F4158020 for ; Fri, 28 Oct 2022 20:11:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5C2ADE0894; Fri, 28 Oct 2022 20:11:47 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 40C09E0894 for ; Fri, 28 Oct 2022 20:11:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5CB3C3411A4 for ; Fri, 28 Oct 2022 20:11:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6B0FB644 for ; Fri, 28 Oct 2022 20:11:43 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1666987874.73fc86d879db42a9ce5a4ef9b73f088b02551169.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/sudo/, app-admin/sudo/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/sudo/files/sudo-1.9.12-mips-build.patch app-admin/sudo/sudo-1.9.12.ebuild X-VCS-Directories: app-admin/sudo/ app-admin/sudo/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 73fc86d879db42a9ce5a4ef9b73f088b02551169 X-VCS-Branch: master Date: Fri, 28 Oct 2022 20:11:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 54870024-6780-4465-aa0c-fd98787f0855 X-Archives-Hash: c16c6857a693c0dbb653ec7a1debe929 commit: 73fc86d879db42a9ce5a4ef9b73f088b02551169 Author: Sam James gentoo org> AuthorDate: Fri Oct 28 20:11:14 2022 +0000 Commit: Sam James gentoo org> CommitDate: Fri Oct 28 20:11:14 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73fc86d8 app-admin/sudo: backport MIPS patch Closes: https://bugs.gentoo.org/878401 Signed-off-by: Sam James gentoo.org> app-admin/sudo/files/sudo-1.9.12-mips-build.patch | 33 +++++++++++++++++++++++ app-admin/sudo/sudo-1.9.12.ebuild | 4 +++ 2 files changed, 37 insertions(+) diff --git a/app-admin/sudo/files/sudo-1.9.12-mips-build.patch b/app-admin/sudo/files/sudo-1.9.12-mips-build.patch new file mode 100644 index 000000000000..d45393dba443 --- /dev/null +++ b/app-admin/sudo/files/sudo-1.9.12-mips-build.patch @@ -0,0 +1,33 @@ +https://github.com/sudo-project/sudo/commit/7944494196d4a9b33e0ae64a7e20f86e19c336d3 +https://bugs.gentoo.org/878401 + +From 7944494196d4a9b33e0ae64a7e20f86e19c336d3 Mon Sep 17 00:00:00 2001 +From: "Todd C. Miller" +Date: Wed, 26 Oct 2022 16:35:30 -0600 +Subject: [PATCH] Fix compilation error on Linux/mips. + +--- a/src/exec_ptrace.c ++++ b/src/exec_ptrace.c +@@ -282,16 +282,17 @@ set_sc_arg4(struct sudo_ptrace_regs *regs, unsigned long addr) + static bool + ptrace_getregs(int pid, struct sudo_ptrace_regs *regs, int compat) + { ++ struct iovec iov; + debug_decl(ptrace_getregs, SUDO_DEBUG_EXEC); + ++ iov.iov_base = ®s->u; ++ iov.iov_len = sizeof(regs->u); ++ + # ifdef __mips__ + /* PTRACE_GETREGSET has bugs with the MIPS o32 ABI at least. */ +- if (ptrace(PTRACE_GETREGS, pid, NULL, ®s->u) == -1) ++ if (ptrace(PTRACE_GETREGS, pid, NULL, iov.iov_base) == -1) + debug_return_bool(false); + # else +- struct iovec iov; +- iov.iov_base = ®s->u; +- iov.iov_len = sizeof(regs->u); + if (ptrace(PTRACE_GETREGSET, pid, (void *)NT_PRSTATUS, &iov) == -1) + debug_return_bool(false); + # endif /* __mips__ */ + diff --git a/app-admin/sudo/sudo-1.9.12.ebuild b/app-admin/sudo/sudo-1.9.12.ebuild index 046d001b4139..d3e78ea71235 100644 --- a/app-admin/sudo/sudo-1.9.12.ebuild +++ b/app-admin/sudo/sudo-1.9.12.ebuild @@ -82,6 +82,10 @@ REQUIRED_USE=" MAKEOPTS+=" SAMPLES=" +PATCHES=( + "${FILESDIR}"/${P}-mips-build.patch +) + src_prepare() { default