mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 00:39:46 +00:00
Code Issues Projects Releases Wiki Activity

sudo: update multilib patch for sudo.conf

Browse Source 
Update multilib patch for sudo.conf that there is one more replacement
of @plugindir@ to avoid installation conflict.

(From OE-Core rev: e1afed1569bc076a1823e997137884172acc7123)

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Kai Kang
2021-10-22 11:38:21 +08:00
committed by Richard Purdie
parent 7d6f264fab
commit 0e0b545014
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch
+14 -5
View File
@@ -13,11 +13,11 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
Upstream-Status: Inappropriate [OE configuration specific] Upstream-Status: Inappropriate [OE configuration specific]
--- ---
examples/sudo.conf.in | 6 +++--- examples/sudo.conf.in | 8 ++++----
1 file changed, 3 insertions(+), 3 deletions(-) 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/examples/sudo.conf.in b/examples/sudo.conf.in diff --git a/examples/sudo.conf.in b/examples/sudo.conf.in
index 19e33ff..af78235 100644 index 6535d3a..50afc8f 100644
--- a/examples/sudo.conf.in --- a/examples/sudo.conf.in
+++ b/examples/sudo.conf.in +++ b/examples/sudo.conf.in
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
@@ -29,7 +29,16 @@ index 19e33ff..af78235 100644
# fully qualified. # fully qualified.
# The plugin_name corresponds to a global symbol in the plugin # The plugin_name corresponds to a global symbol in the plugin
# that contains the plugin interface structure. # that contains the plugin interface structure.
@@ -50,7 +50,7 @@ Plugin sudoers_audit sudoers.so @@ -51,7 +51,7 @@
# The compiled-in value is usually sufficient and should only be changed
# if you rename or move the sudo_intercept.so file.
#
-#Path intercept @plugindir@/sudo_intercept.so
+#Path intercept $plugindir/sudo_intercept.so
#
# Sudo noexec:
@@ -65,7 +65,7 @@
# The compiled-in value is usually sufficient and should only be changed # The compiled-in value is usually sufficient and should only be changed
# if you rename or move the sudo_noexec.so file. # if you rename or move the sudo_noexec.so file.
# #
@@ -38,7 +47,7 @@ index 19e33ff..af78235 100644
# #
# Sudo plugin directory: # Sudo plugin directory:
@@ -59,7 +59,7 @@ Plugin sudoers_audit sudoers.so @@ -74,7 +74,7 @@
# The default directory to use when searching for plugins that are # 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.
# #