mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-03 02:02:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

sudo: upgrade 1.9.11p3 -> 1.9.12

Browse Source 
License-Update: copyright years

(From OE-Core rev: 4ad997fa4df80d543ac5dabe61f292f5819da302)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2022-11-07 15:54:57 +01:00
committed by Richard Purdie
parent 73472f50b9
commit 8f04c0afe0
3 changed files with 40 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
meta/recipes-extended/sudo/files/mips-fix.patch Normal file
View File

@@ -0,0 +1,37 @@
From 7944494196d4a9b33e0ae64a7e20f86e19c336d3 Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <Todd.Miller@sudo.ws>
Date: Wed, 26 Oct 2022 16:35:30 -0600
Subject: [PATCH] Fix compilation error on Linux/mips.
Upstream-Status: Backport [https://github.com/sudo-project/sudo/commit/7944494196d4a9b33e0ae64a7e20f86e19c336d3]
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
src/exec_ptrace.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/exec_ptrace.c b/src/exec_ptrace.c
index 81cd10bc2..208a75f88 100644
--- 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 = &regs->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, &regs->u) == -1)
+ if (ptrace(PTRACE_GETREGS, pid, NULL, iov.iov_base) == -1)
debug_return_bool(false);
# else
- struct iovec iov;
- iov.iov_base = &regs->u;
- iov.iov_len = sizeof(regs->u);
if (ptrace(PTRACE_GETREGSET, pid, (void *)NT_PRSTATUS, &iov) == -1)
debug_return_bool(false);
# endif /* __mips__ */

2
meta/recipes-extended/sudo/sudo.inc
View File

@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.sudo.ws"
BUGTRACKER = "http://www.sudo.ws/bugs/"
SECTION = "admin"
LICENSE = "ISC & BSD-3-Clause & BSD-2-Clause & Zlib"
LIC_FILES_CHKSUM = "file://LICENSE.md;md5=16cf60b466f3a0606427a7b624a3a670 \
LIC_FILES_CHKSUM = "file://LICENSE.md;md5=7aacba499777b719416b293d16f29c8c \
file://plugins/sudoers/redblack.c;beginline=1;endline=46;md5=03e35317699ba00b496251e0dfe9f109 \
file://lib/util/reallocarray.c;beginline=3;endline=15;md5=397dd45c7683e90b9f8bf24638cf03bf \
file://lib/util/fnmatch.c;beginline=3;endline=27;md5=004d7d2866ba1f5b41174906849d2e0f \

3
meta/recipes-extended/sudo/sudo_1.9.11p3.bb → meta/recipes-extended/sudo/sudo_1.9.12.bb
View File

@@ -4,11 +4,12 @@ SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \
${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
file://0001-sudo.conf.in-fix-conflict-with-multilib.patch \
file://0001-lib-util-mksigname.c-correctly-include-header-for-ou.patch \
file://mips-fix.patch \
"
PAM_SRC_URI = "file://sudo.pam"
SRC_URI[sha256sum] = "4687e7d2f56721708f59cca2e1352c056cb23de526c22725615a42bb094f1f70"
SRC_URI[sha256sum] = "de15733888170c56834daafd34bf983db10fb21039742fcfc396bd32168d6362"
DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
RDEPENDS:${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}"