diff options
-rw-r--r-- | meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch b/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch index f7ccfdd623..f4fc376bb8 100644 --- a/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch +++ b/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch | |||
@@ -13,11 +13,11 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com> | |||
13 | 13 | ||
14 | Upstream-Status: Inappropriate [OE configuration specific] | 14 | Upstream-Status: Inappropriate [OE configuration specific] |
15 | --- | 15 | --- |
16 | examples/sudo.conf.in | 6 +++--- | 16 | examples/sudo.conf.in | 8 ++++---- |
17 | 1 file changed, 3 insertions(+), 3 deletions(-) | 17 | 1 file changed, 4 insertions(+), 4 deletions(-) |
18 | 18 | ||
19 | diff --git a/examples/sudo.conf.in b/examples/sudo.conf.in | 19 | diff --git a/examples/sudo.conf.in b/examples/sudo.conf.in |
20 | index 19e33ff..af78235 100644 | 20 | index 6535d3a..50afc8f 100644 |
21 | --- a/examples/sudo.conf.in | 21 | --- a/examples/sudo.conf.in |
22 | +++ b/examples/sudo.conf.in | 22 | +++ b/examples/sudo.conf.in |
23 | @@ -4,7 +4,7 @@ | 23 | @@ -4,7 +4,7 @@ |
@@ -29,7 +29,16 @@ index 19e33ff..af78235 100644 | |||
29 | # fully qualified. | 29 | # fully qualified. |
30 | # The plugin_name corresponds to a global symbol in the plugin | 30 | # The plugin_name corresponds to a global symbol in the plugin |
31 | # that contains the plugin interface structure. | 31 | # that contains the plugin interface structure. |
32 | @@ -50,7 +50,7 @@ Plugin sudoers_audit sudoers.so | 32 | @@ -51,7 +51,7 @@ |
33 | # The compiled-in value is usually sufficient and should only be changed | ||
34 | # if you rename or move the sudo_intercept.so file. | ||
35 | # | ||
36 | -#Path intercept @plugindir@/sudo_intercept.so | ||
37 | +#Path intercept $plugindir/sudo_intercept.so | ||
38 | |||
39 | # | ||
40 | # Sudo noexec: | ||
41 | @@ -65,7 +65,7 @@ | ||
33 | # The compiled-in value is usually sufficient and should only be changed | 42 | # The compiled-in value is usually sufficient and should only be changed |
34 | # if you rename or move the sudo_noexec.so file. | 43 | # if you rename or move the sudo_noexec.so file. |
35 | # | 44 | # |
@@ -38,7 +47,7 @@ index 19e33ff..af78235 100644 | |||
38 | 47 | ||
39 | # | 48 | # |
40 | # Sudo plugin directory: | 49 | # Sudo plugin directory: |
41 | @@ -59,7 +59,7 @@ Plugin sudoers_audit sudoers.so | 50 | @@ -74,7 +74,7 @@ |
42 | # The default directory to use when searching for plugins that are | 51 | # The default directory to use when searching for plugins that are |
43 | # specified without a fully qualified path name. | 52 | # specified without a fully qualified path name. |
44 | # | 53 | # |