1From 61ae82a2ba502492b6a78f248258abb71daeb227 Mon Sep 17 00:00:00 2001 2From: Kai Kang <kai.kang@windriver.com> 3Date: Tue, 17 Nov 2020 11:13:40 +0800 4Subject: [PATCH] sudo.conf.in: fix conflict with multilib 5 6When pass ${libdir} to --libexecdir of sudo, it fails to install sudo 7and lib32-sudo at same time: 8 9| Error: Transaction test error: 10| file /etc/sudo.conf conflicts between attempted installs of 11 sudo-1.9.3p1-r0.core2_64 and lib32-sudo-1.9.3p1-r0.core2_32 12 13Update the comments in sudo.conf.in to avoid the conflict. 14 15Signed-off-by: Kai Kang <kai.kang@windriver.com> 16 17Upstream-Status: Inappropriate [OE configuration specific] 18--- 19 examples/sudo.conf.in | 8 ++++---- 20 1 file changed, 4 insertions(+), 4 deletions(-) 21 22diff --git a/examples/sudo.conf.in b/examples/sudo.conf.in 23index 2187457..0908d24 100644 24--- a/examples/sudo.conf.in 25+++ b/examples/sudo.conf.in 26@@ -4,7 +4,7 @@ 27 # Sudo plugins: 28 # Plugin plugin_name plugin_path plugin_options ... 29 # 30-# The plugin_path is relative to @plugindir@ unless 31+# The plugin_path is relative to $plugindir such as /usr/lib/sudo unless 32 # fully qualified. 33 # The plugin_name corresponds to a global symbol in the plugin 34 # that contains the plugin interface structure. 35@@ -51,7 +51,7 @@ 36 # The compiled-in value is usually sufficient and should only be changed 37 # if you rename or move the sudo_intercept.so file. 38 # 39-#Path intercept @intercept_file@ 40+#Path intercept $intercept_file 41 42 # 43 # Sudo noexec: 44@@ -65,7 +65,7 @@ 45 # The compiled-in value is usually sufficient and should only be changed 46 # if you rename or move the sudo_noexec.so file. 47 # 48-#Path noexec @noexec_file@ 49+#Path noexec $noexec_file 50 51 # 52 # Sudo plugin directory: 53@@ -74,7 +74,7 @@ 54 # The default directory to use when searching for plugins that are 55 # specified without a fully qualified path name. 56 # 57-#Path plugin_dir @plugindir@ 58+#Path plugin_dir $plugindir 59 60 # 61 # Core dumps: 62