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

When pass ${libdir} to --libexecdir of sudo, it fails to install sudo
and lib32-sudo at same time:

| Error: Transaction test error:
|  file /etc/sudo.conf conflicts between attempted installs of
     sudo-1.9.3p1-r0.core2_64 and lib32-sudo-1.9.3p1-r0.core2_32

Update the comments in sudo.conf.in to avoid the conflict.

Signed-off-by: Kai Kang <kai.kang@windriver.com>

Upstream-Status: Inappropriate [OE configuration specific]
---
 examples/sudo.conf.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/sudo.conf.in b/examples/sudo.conf.in
index bdd676c..094341c 100644
--- a/examples/sudo.conf.in
+++ b/examples/sudo.conf.in
@@ -4,7 +4,7 @@
 # Sudo plugins:
 #   Plugin plugin_name plugin_path plugin_options ...
 #
-# The plugin_path is relative to @plugindir@ unless
+# The plugin_path is relative to $plugindir such as /usr/lib/sudo unless
 #   fully qualified.
 # The plugin_name corresponds to a global symbol in the plugin
 #   that contains the plugin interface structure.
@@ -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 @intercept_file@
+#Path intercept $intercept_file
 
 #
 # Sudo noexec:
@@ -65,7 +65,7 @@
 # The compiled-in value is usually sufficient and should only be changed
 # if you rename or move the sudo_noexec.so file.
 #
-#Path noexec @noexec_file@
+#Path noexec $noexec_file
 
 #
 # 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.
 #
-#Path plugin_dir @plugindir@
+#Path plugin_dir $plugindir
 
 #
 # Core dumps:
