mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-05 05:04:44 +02:00
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>
This commit is contained in:
parent
4263516a5b
commit
9d41127b24
|
@ -1,4 +1,4 @@
|
|||
From 61ae82a2ba502492b6a78f248258abb71daeb227 Mon Sep 17 00:00:00 2001
|
||||
From 8c69192754ba73dd6e3273728a21aa73988f4bfb Mon Sep 17 00:00:00 2001
|
||||
From: Kai Kang <kai.kang@windriver.com>
|
||||
Date: Tue, 17 Nov 2020 11:13:40 +0800
|
||||
Subject: [PATCH] sudo.conf.in: fix conflict with multilib
|
||||
|
@ -20,7 +20,7 @@ Upstream-Status: Inappropriate [OE configuration specific]
|
|||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/examples/sudo.conf.in b/examples/sudo.conf.in
|
||||
index 2187457..0908d24 100644
|
||||
index bdd676c..094341c 100644
|
||||
--- a/examples/sudo.conf.in
|
||||
+++ b/examples/sudo.conf.in
|
||||
@@ -4,7 +4,7 @@
|
||||
|
@ -52,7 +52,7 @@ index 2187457..0908d24 100644
|
|||
# Sudo plugin directory:
|
||||
@@ -74,7 +74,7 @@
|
||||
# The default directory to use when searching for plugins that are
|
||||
# specified without a fully qualified path name.
|
||||
# specified without a fully-qualified path name.
|
||||
#
|
||||
-#Path plugin_dir @plugindir@
|
||||
+#Path plugin_dir $plugindir
|
||||
|
|
|
@ -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=0a6876cbeb2aa51837935ba3fd82ee87 \
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.md;md5=2841c822e587db145364ca95e9be2ffa \
|
||||
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 \
|
||||
|
|
|
@ -7,7 +7,7 @@ SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \
|
|||
|
||||
PAM_SRC_URI = "file://sudo.pam"
|
||||
|
||||
SRC_URI[sha256sum] = "976aa56d3e3b2a75593307864288addb748c9c136e25d95a9cc699aafa77239c"
|
||||
SRC_URI[sha256sum] = "3f212c69d534d5822b492d099abb02a593f91ca99f5afde5cb9bd3e1dcdad069"
|
||||
|
||||
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)}"
|
Loading…
Reference in New Issue
Block a user