diff options
Diffstat (limited to 'meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch')
-rw-r--r-- | meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch | 34 |
1 files changed, 22 insertions, 12 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..041c717e00 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 | |||
@@ -1,4 +1,7 @@ | |||
1 | sudo.conf.in: fix conflict with multilib | 1 | From 6e835350b7413210c410d3578cfab804186b7a4f Mon Sep 17 00:00:00 2001 |
2 | From: Kai Kang <kai.kang@windriver.com> | ||
3 | Date: Tue, 17 Nov 2020 11:13:40 +0800 | ||
4 | Subject: [PATCH] sudo.conf.in: fix conflict with multilib | ||
2 | 5 | ||
3 | When pass ${libdir} to --libexecdir of sudo, it fails to install sudo | 6 | When pass ${libdir} to --libexecdir of sudo, it fails to install sudo |
4 | and lib32-sudo at same time: | 7 | and lib32-sudo at same time: |
@@ -12,12 +15,13 @@ Update the comments in sudo.conf.in to avoid the conflict. | |||
12 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | 15 | Signed-off-by: Kai Kang <kai.kang@windriver.com> |
13 | 16 | ||
14 | Upstream-Status: Inappropriate [OE configuration specific] | 17 | Upstream-Status: Inappropriate [OE configuration specific] |
18 | |||
15 | --- | 19 | --- |
16 | examples/sudo.conf.in | 6 +++--- | 20 | examples/sudo.conf.in | 8 ++++---- |
17 | 1 file changed, 3 insertions(+), 3 deletions(-) | 21 | 1 file changed, 4 insertions(+), 4 deletions(-) |
18 | 22 | ||
19 | diff --git a/examples/sudo.conf.in b/examples/sudo.conf.in | 23 | diff --git a/examples/sudo.conf.in b/examples/sudo.conf.in |
20 | index 19e33ff..af78235 100644 | 24 | index 2187457..0908d24 100644 |
21 | --- a/examples/sudo.conf.in | 25 | --- a/examples/sudo.conf.in |
22 | +++ b/examples/sudo.conf.in | 26 | +++ b/examples/sudo.conf.in |
23 | @@ -4,7 +4,7 @@ | 27 | @@ -4,7 +4,7 @@ |
@@ -29,16 +33,25 @@ index 19e33ff..af78235 100644 | |||
29 | # fully qualified. | 33 | # fully qualified. |
30 | # The plugin_name corresponds to a global symbol in the plugin | 34 | # The plugin_name corresponds to a global symbol in the plugin |
31 | # that contains the plugin interface structure. | 35 | # that contains the plugin interface structure. |
32 | @@ -50,7 +50,7 @@ Plugin sudoers_audit sudoers.so | 36 | @@ -51,7 +51,7 @@ |
37 | # The compiled-in value is usually sufficient and should only be changed | ||
38 | # if you rename or move the sudo_intercept.so file. | ||
39 | # | ||
40 | -#Path intercept @intercept_file@ | ||
41 | +#Path intercept $intercept_file | ||
42 | |||
43 | # | ||
44 | # Sudo noexec: | ||
45 | @@ -65,7 +65,7 @@ | ||
33 | # The compiled-in value is usually sufficient and should only be changed | 46 | # The compiled-in value is usually sufficient and should only be changed |
34 | # if you rename or move the sudo_noexec.so file. | 47 | # if you rename or move the sudo_noexec.so file. |
35 | # | 48 | # |
36 | -#Path noexec @plugindir@/sudo_noexec.so | 49 | -#Path noexec @noexec_file@ |
37 | +#Path noexec $plugindir/sudo_noexec.so | 50 | +#Path noexec $noexec_file |
38 | 51 | ||
39 | # | 52 | # |
40 | # Sudo plugin directory: | 53 | # Sudo plugin directory: |
41 | @@ -59,7 +59,7 @@ Plugin sudoers_audit sudoers.so | 54 | @@ -74,7 +74,7 @@ |
42 | # The default directory to use when searching for plugins that are | 55 | # The default directory to use when searching for plugins that are |
43 | # specified without a fully qualified path name. | 56 | # specified without a fully qualified path name. |
44 | # | 57 | # |
@@ -46,7 +59,4 @@ index 19e33ff..af78235 100644 | |||
46 | +#Path plugin_dir $plugindir | 59 | +#Path plugin_dir $plugindir |
47 | 60 | ||
48 | # | 61 | # |
49 | # Sudo developer mode: | 62 | # Core dumps: |
50 | -- | ||
51 | 2.17.1 | ||
52 | |||