diff options
author | Lee Chee Yang <chee.yang.lee@intel.com> | 2021-02-16 23:01:39 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-03-04 17:39:08 +0000 |
commit | 65b8cbe9e44a4d56785040c43fd493cc8cf8ba6d (patch) | |
tree | 47f17d3c3bffdf86ee7b7b9d8755cb4d2282f8fb /meta/recipes-extended | |
parent | 514e6a9dad7b9c7ed88bc5c2443c8c8887606c18 (diff) | |
download | poky-65b8cbe9e44a4d56785040c43fd493cc8cf8ba6d.tar.gz |
sudo: 1.8.31 -> 1.8.32
release notes:
https://www.sudo.ws/legacy.html#1.8.32
updates include fixes for
CVE-2021-23239
CVE-2021-23240
CVE-2021-3156
Also backport patch to fix build error with musl
(From OE-Core rev: 896e7d02e3626b42cd08b19bb303a0c6189e17de)
Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r-- | meta/recipes-extended/sudo/sudo.inc | 2 | ||||
-rw-r--r-- | meta/recipes-extended/sudo/sudo/0001-Fix-includes-when-building-with-musl.patch | 29 | ||||
-rw-r--r-- | meta/recipes-extended/sudo/sudo_1.8.32.bb (renamed from meta/recipes-extended/sudo/sudo_1.8.31.bb) | 5 |
3 files changed, 33 insertions, 3 deletions
diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc index 5d27d46928..aeedfc1a23 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 & Zlib" | 6 | LICENSE = "ISC & BSD & Zlib" |
7 | LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=4d1b44b1576eea036d78b8cc961aa93d \ | 7 | LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=07966675feaddba70cc812895b248230 \ |
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/0001-Fix-includes-when-building-with-musl.patch b/meta/recipes-extended/sudo/sudo/0001-Fix-includes-when-building-with-musl.patch new file mode 100644 index 0000000000..6ee2d5c11e --- /dev/null +++ b/meta/recipes-extended/sudo/sudo/0001-Fix-includes-when-building-with-musl.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From f4e9e4337f8844d199515ff2b762c914dd254cbd Mon Sep 17 00:00:00 2001 | ||
2 | From: Dan Robertson <dan@dlrobertson.com> | ||
3 | Date: Sat, 16 May 2020 00:12:44 +0000 | ||
4 | Subject: [PATCH] Fix includes when building with musl | ||
5 | |||
6 | Include sys/types.h for mode_t and id_t in sudo_debug.h | ||
7 | |||
8 | Upstream-Status: Backport [https://github.com/sudo-project/sudo/commit/f4e9e4337f8844d199515ff2b762c914dd254cbd] | ||
9 | Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com> | ||
10 | |||
11 | --- | ||
12 | include/sudo_debug.h | 1 + | ||
13 | 1 file changed, 1 insertion(+) | ||
14 | |||
15 | diff --git a/include/sudo_debug.h b/include/sudo_debug.h | ||
16 | index 180f2096f..0124b0b19 100644 | ||
17 | --- a/include/sudo_debug.h | ||
18 | +++ b/include/sudo_debug.h | ||
19 | @@ -25,6 +25,7 @@ | ||
20 | #else | ||
21 | # include "compat/stdbool.h" | ||
22 | #endif | ||
23 | +#include <sys/types.h> | ||
24 | #include "sudo_queue.h" | ||
25 | |||
26 | /* | ||
27 | -- | ||
28 | 2.25.1 | ||
29 | |||
diff --git a/meta/recipes-extended/sudo/sudo_1.8.31.bb b/meta/recipes-extended/sudo/sudo_1.8.32.bb index 39d8817c32..8d16ec2538 100644 --- a/meta/recipes-extended/sudo/sudo_1.8.31.bb +++ b/meta/recipes-extended/sudo/sudo_1.8.32.bb | |||
@@ -3,12 +3,13 @@ require sudo.inc | |||
3 | SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \ | 3 | 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-Include-sys-types.h-for-id_t-definition.patch \ | 5 | file://0001-Include-sys-types.h-for-id_t-definition.patch \ |
6 | file://0001-Fix-includes-when-building-with-musl.patch \ | ||
6 | " | 7 | " |
7 | 8 | ||
8 | PAM_SRC_URI = "file://sudo.pam" | 9 | PAM_SRC_URI = "file://sudo.pam" |
9 | 10 | ||
10 | SRC_URI[md5sum] = "ce17ff6e72a70f8d5dabba8abf3cd2de" | 11 | SRC_URI[md5sum] = "a7318202ba391079a0e32933f0fb8bd6" |
11 | SRC_URI[sha256sum] = "7ea8d97a3cee4c844e0887ea7a1bd80eb54cc98fd77966776cb1a80653ad454f" | 12 | SRC_URI[sha256sum] = "5ce3c18c5efbecd5437a0945f314f1822423eaf9a2d7eb7ecf80857bc32246c5" |
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)}" |