diff options
| author | Wang Mingyu <wangmy@fujitsu.com> | 2025-06-30 17:13:14 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-07-03 10:40:16 +0100 |
| commit | 9d41127b241133267449d81c92eb89123e8a6f48 (patch) | |
| tree | ff95a07a9d057e957781d0e1c9deedf9812f8d3b /meta | |
| parent | 4263516a5bcd8870f0d0cfee0b9c29c07ae8863b (diff) | |
| download | poky-9d41127b241133267449d81c92eb89123e8a6f48.tar.gz | |
sudo: upgrade 1.9.16p2 -> 1.9.17
License-Update: Copyright updated to 2025
0001-sudo.conf.in-fix-conflict-with-multilib.patch
refreshed for 1.9.17
(From OE-Core rev: c21ed3c8f4ca76ff7c65cf71a93759fad8846386)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch | 6 | ||||
| -rw-r--r-- | meta/recipes-extended/sudo/sudo.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-extended/sudo/sudo_1.9.17.bb (renamed from meta/recipes-extended/sudo/sudo_1.9.16p2.bb) | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch b/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch index ec0384e257..1989c5abd7 100644 --- a/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch +++ b/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 61ae82a2ba502492b6a78f248258abb71daeb227 Mon Sep 17 00:00:00 2001 | 1 | From 8c69192754ba73dd6e3273728a21aa73988f4bfb Mon Sep 17 00:00:00 2001 |
| 2 | From: Kai Kang <kai.kang@windriver.com> | 2 | From: Kai Kang <kai.kang@windriver.com> |
| 3 | Date: Tue, 17 Nov 2020 11:13:40 +0800 | 3 | Date: Tue, 17 Nov 2020 11:13:40 +0800 |
| 4 | Subject: [PATCH] sudo.conf.in: fix conflict with multilib | 4 | Subject: [PATCH] sudo.conf.in: fix conflict with multilib |
| @@ -20,7 +20,7 @@ Upstream-Status: Inappropriate [OE configuration specific] | |||
| 20 | 1 file changed, 4 insertions(+), 4 deletions(-) | 20 | 1 file changed, 4 insertions(+), 4 deletions(-) |
| 21 | 21 | ||
| 22 | diff --git a/examples/sudo.conf.in b/examples/sudo.conf.in | 22 | diff --git a/examples/sudo.conf.in b/examples/sudo.conf.in |
| 23 | index 2187457..0908d24 100644 | 23 | index bdd676c..094341c 100644 |
| 24 | --- a/examples/sudo.conf.in | 24 | --- a/examples/sudo.conf.in |
| 25 | +++ b/examples/sudo.conf.in | 25 | +++ b/examples/sudo.conf.in |
| 26 | @@ -4,7 +4,7 @@ | 26 | @@ -4,7 +4,7 @@ |
| @@ -52,7 +52,7 @@ index 2187457..0908d24 100644 | |||
| 52 | # Sudo plugin directory: | 52 | # Sudo plugin directory: |
| 53 | @@ -74,7 +74,7 @@ | 53 | @@ -74,7 +74,7 @@ |
| 54 | # The default directory to use when searching for plugins that are | 54 | # The default directory to use when searching for plugins that are |
| 55 | # specified without a fully qualified path name. | 55 | # specified without a fully-qualified path name. |
| 56 | # | 56 | # |
| 57 | -#Path plugin_dir @plugindir@ | 57 | -#Path plugin_dir @plugindir@ |
| 58 | +#Path plugin_dir $plugindir | 58 | +#Path plugin_dir $plugindir |
diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc index 0afbf669f0..a23de1fcf7 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=0a6876cbeb2aa51837935ba3fd82ee87 \ | 7 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=2841c822e587db145364ca95e9be2ffa \ |
| 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.16p2.bb b/meta/recipes-extended/sudo/sudo_1.9.17.bb index fbe507ad32..71d48f448d 100644 --- a/meta/recipes-extended/sudo/sudo_1.9.16p2.bb +++ b/meta/recipes-extended/sudo/sudo_1.9.17.bb | |||
| @@ -7,7 +7,7 @@ SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \ | |||
| 7 | 7 | ||
| 8 | PAM_SRC_URI = "file://sudo.pam" | 8 | PAM_SRC_URI = "file://sudo.pam" |
| 9 | 9 | ||
| 10 | SRC_URI[sha256sum] = "976aa56d3e3b2a75593307864288addb748c9c136e25d95a9cc699aafa77239c" | 10 | SRC_URI[sha256sum] = "3f212c69d534d5822b492d099abb02a593f91ca99f5afde5cb9bd3e1dcdad069" |
| 11 | 11 | ||
| 12 | DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | 12 | DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" |
| 13 | RDEPENDS:${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" | 13 | RDEPENDS:${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" |
