diff options
Diffstat (limited to 'recipes-extended/sudo/files')
| -rw-r--r-- | recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch | 52 | ||||
| -rw-r--r-- | recipes-extended/sudo/files/privacy | 1 | ||||
| -rw-r--r-- | recipes-extended/sudo/files/sudoers.patch | 21 |
3 files changed, 74 insertions, 0 deletions
diff --git a/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch b/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch new file mode 100644 index 0000000..f7ccfdd --- /dev/null +++ b/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch @@ -0,0 +1,52 @@ +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 | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/examples/sudo.conf.in b/examples/sudo.conf.in +index 19e33ff..af78235 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. +@@ -50,7 +50,7 @@ Plugin sudoers_audit sudoers.so + # The compiled-in value is usually sufficient and should only be changed + # if you rename or move the sudo_noexec.so file. + # +-#Path noexec @plugindir@/sudo_noexec.so ++#Path noexec $plugindir/sudo_noexec.so + + # + # Sudo plugin directory: +@@ -59,7 +59,7 @@ Plugin sudoers_audit sudoers.so + # 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 + + # + # Sudo developer mode: +-- +2.17.1 + diff --git a/recipes-extended/sudo/files/privacy b/recipes-extended/sudo/files/privacy new file mode 100644 index 0000000..7c03615 --- /dev/null +++ b/recipes-extended/sudo/files/privacy @@ -0,0 +1 @@ +Defaults lecture = never diff --git a/recipes-extended/sudo/files/sudoers.patch b/recipes-extended/sudo/files/sudoers.patch new file mode 100644 index 0000000..aed0f10 --- /dev/null +++ b/recipes-extended/sudo/files/sudoers.patch @@ -0,0 +1,21 @@ +diff -uprN old/plugins/sudoers/sudoers.in new/plugins/sudoers/sudoers.in +--- old/plugins/sudoers/sudoers.in 2015-10-31 18:34:59.000000000 -0500 ++++ new/plugins/sudoers/sudoers.in 2017-04-20 10:32:19.530931283 -0500 +@@ -57,7 +57,7 @@ + # Defaults env_keep += "XMODIFIERS GTK_IM_MODULE QT_IM_MODULE QT_IM_SWITCHER" + ## + ## Uncomment to use a hard-coded PATH instead of the user's to find commands +-# Defaults secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" ++Defaults secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" + ## + ## Uncomment to send mail if the user does not enter the correct password. + # Defaults mail_badpass +@@ -85,7 +85,7 @@ root ALL=(ALL) ALL + # %wheel ALL=(ALL) NOPASSWD: ALL + + ## Uncomment to allow members of group sudo to execute any command +-# %sudo ALL=(ALL) ALL ++%sudo ALL=(ALL) ALL + + ## Uncomment to allow any user to run sudo if they know the password + ## of the user they are running the command as (root by default). |