diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2022-11-07 15:54:57 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-11-08 22:47:11 +0000 |
| commit | 4ad997fa4df80d543ac5dabe61f292f5819da302 (patch) | |
| tree | 525fa235789b7964c41a072dbfed3ec6fc2f55be /meta/recipes-extended | |
| parent | 4203b5a31ae067d54980189570beb480dd33e94e (diff) | |
| download | openembedded-core-contrib-4ad997fa4df80d543ac5dabe61f292f5819da302.tar.gz | |
sudo: upgrade 1.9.11p3 -> 1.9.12
License-Update: copyright years
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Diffstat (limited to 'meta/recipes-extended')
| -rw-r--r-- | meta/recipes-extended/sudo/files/mips-fix.patch | 37 | ||||
| -rw-r--r-- | meta/recipes-extended/sudo/sudo.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-extended/sudo/sudo_1.9.12.bb (renamed from meta/recipes-extended/sudo/sudo_1.9.11p3.bb) | 3 |
3 files changed, 40 insertions, 2 deletions
diff --git a/meta/recipes-extended/sudo/files/mips-fix.patch b/meta/recipes-extended/sudo/files/mips-fix.patch new file mode 100644 index 0000000000..fe9c652509 --- /dev/null +++ b/meta/recipes-extended/sudo/files/mips-fix.patch @@ -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 = ®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/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc index 8947c46129..fd5bbf103d 100644 --- a/meta/recipes-extended/sudo/sudo.inc +++ b/meta/recipes-extended/sudo/sudo.inc @@ -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 \ diff --git a/meta/recipes-extended/sudo/sudo_1.9.11p3.bb b/meta/recipes-extended/sudo/sudo_1.9.12.bb index ba610ee2e7..15c6728f08 100644 --- a/meta/recipes-extended/sudo/sudo_1.9.11p3.bb +++ b/meta/recipes-extended/sudo/sudo_1.9.12.bb @@ -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)}" |