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:16 +0000 |
commit | 8f04c0afe06e934c3db0e608548bf8c1954c3d2a (patch) | |
tree | 70087120d1f92bd784f99d86cec3f9a88ee6bbba /meta | |
parent | 73472f50b9830a3a198cc4cba3da88a9279a8759 (diff) | |
download | poky-8f04c0afe06e934c3db0e608548bf8c1954c3d2a.tar.gz |
sudo: upgrade 1.9.11p3 -> 1.9.12
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>
Diffstat (limited to 'meta')
-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 @@ | |||
1 | From 7944494196d4a9b33e0ae64a7e20f86e19c336d3 Mon Sep 17 00:00:00 2001 | ||
2 | From: "Todd C. Miller" <Todd.Miller@sudo.ws> | ||
3 | Date: Wed, 26 Oct 2022 16:35:30 -0600 | ||
4 | Subject: [PATCH] Fix compilation error on Linux/mips. | ||
5 | |||
6 | Upstream-Status: Backport [https://github.com/sudo-project/sudo/commit/7944494196d4a9b33e0ae64a7e20f86e19c336d3] | ||
7 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
8 | --- | ||
9 | src/exec_ptrace.c | 9 +++++---- | ||
10 | 1 file changed, 5 insertions(+), 4 deletions(-) | ||
11 | |||
12 | diff --git a/src/exec_ptrace.c b/src/exec_ptrace.c | ||
13 | index 81cd10bc2..208a75f88 100644 | ||
14 | --- a/src/exec_ptrace.c | ||
15 | +++ b/src/exec_ptrace.c | ||
16 | @@ -282,16 +282,17 @@ set_sc_arg4(struct sudo_ptrace_regs *regs, unsigned long addr) | ||
17 | static bool | ||
18 | ptrace_getregs(int pid, struct sudo_ptrace_regs *regs, int compat) | ||
19 | { | ||
20 | + struct iovec iov; | ||
21 | debug_decl(ptrace_getregs, SUDO_DEBUG_EXEC); | ||
22 | |||
23 | + iov.iov_base = ®s->u; | ||
24 | + iov.iov_len = sizeof(regs->u); | ||
25 | + | ||
26 | # ifdef __mips__ | ||
27 | /* PTRACE_GETREGSET has bugs with the MIPS o32 ABI at least. */ | ||
28 | - if (ptrace(PTRACE_GETREGS, pid, NULL, ®s->u) == -1) | ||
29 | + if (ptrace(PTRACE_GETREGS, pid, NULL, iov.iov_base) == -1) | ||
30 | debug_return_bool(false); | ||
31 | # else | ||
32 | - struct iovec iov; | ||
33 | - iov.iov_base = ®s->u; | ||
34 | - iov.iov_len = sizeof(regs->u); | ||
35 | if (ptrace(PTRACE_GETREGSET, pid, (void *)NT_PRSTATUS, &iov) == -1) | ||
36 | debug_return_bool(false); | ||
37 | # 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" | |||
4 | BUGTRACKER = "http://www.sudo.ws/bugs/" | 4 | BUGTRACKER = "http://www.sudo.ws/bugs/" |
5 | SECTION = "admin" | 5 | SECTION = "admin" |
6 | LICENSE = "ISC & BSD-3-Clause & BSD-2-Clause & Zlib" | 6 | LICENSE = "ISC & BSD-3-Clause & BSD-2-Clause & Zlib" |
7 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=16cf60b466f3a0606427a7b624a3a670 \ | 7 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=7aacba499777b719416b293d16f29c8c \ |
8 | file://plugins/sudoers/redblack.c;beginline=1;endline=46;md5=03e35317699ba00b496251e0dfe9f109 \ | 8 | file://plugins/sudoers/redblack.c;beginline=1;endline=46;md5=03e35317699ba00b496251e0dfe9f109 \ |
9 | file://lib/util/reallocarray.c;beginline=3;endline=15;md5=397dd45c7683e90b9f8bf24638cf03bf \ | 9 | file://lib/util/reallocarray.c;beginline=3;endline=15;md5=397dd45c7683e90b9f8bf24638cf03bf \ |
10 | file://lib/util/fnmatch.c;beginline=3;endline=27;md5=004d7d2866ba1f5b41174906849d2e0f \ | 10 | 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 \ | |||
4 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ | 4 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ |
5 | file://0001-sudo.conf.in-fix-conflict-with-multilib.patch \ | 5 | file://0001-sudo.conf.in-fix-conflict-with-multilib.patch \ |
6 | file://0001-lib-util-mksigname.c-correctly-include-header-for-ou.patch \ | 6 | file://0001-lib-util-mksigname.c-correctly-include-header-for-ou.patch \ |
7 | file://mips-fix.patch \ | ||
7 | " | 8 | " |
8 | 9 | ||
9 | PAM_SRC_URI = "file://sudo.pam" | 10 | PAM_SRC_URI = "file://sudo.pam" |
10 | 11 | ||
11 | SRC_URI[sha256sum] = "4687e7d2f56721708f59cca2e1352c056cb23de526c22725615a42bb094f1f70" | 12 | SRC_URI[sha256sum] = "de15733888170c56834daafd34bf983db10fb21039742fcfc396bd32168d6362" |
12 | 13 | ||
13 | DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | 14 | DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" |
14 | RDEPENDS:${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" | 15 | RDEPENDS:${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" |