summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2025-07-09 11:38:45 +0530
committerSteve Sakoman <steve@sakoman.com>2025-07-17 13:57:58 -0700
commit1132749fbf944b8a74e4ed04cd7aba2c49629e11 (patch)
tree93be833a0fdc14a1b764d5d0cbf770e2eea43744 /meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch
parent4cf8588afd37f2ef16a18ab0cd5b3e577e66274a (diff)
downloadpoky-1132749fbf944b8a74e4ed04cd7aba2c49629e11.tar.gz
sudo: upgrade 1.9.16p2 -> 1.9.17
License-Update: Copyright updated to 2025 0001-sudo.conf.in-fix-conflict-with-multilib.patch refreshed for 1.9.17 (From OE-Core rev: c21ed3c8f4ca76ff7c65cf71a93759fad8846386) (From OE-Core rev: 1956a330b1c880da1fefe9934d28f12393fd9c71) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 9d41127b241133267449d81c92eb89123e8a6f48) Signed-off-by: Praveen Kumar <praveen.kumar@windriver.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
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.patch6
1 files changed, 3 insertions, 3 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 ec0384e257..1989c5abd7 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,4 @@
1From 61ae82a2ba502492b6a78f248258abb71daeb227 Mon Sep 17 00:00:00 2001 1From 8c69192754ba73dd6e3273728a21aa73988f4bfb Mon Sep 17 00:00:00 2001
2From: Kai Kang <kai.kang@windriver.com> 2From: Kai Kang <kai.kang@windriver.com>
3Date: Tue, 17 Nov 2020 11:13:40 +0800 3Date: Tue, 17 Nov 2020 11:13:40 +0800
4Subject: [PATCH] sudo.conf.in: fix conflict with multilib 4Subject: [PATCH] sudo.conf.in: fix conflict with multilib
@@ -20,7 +20,7 @@ Upstream-Status: Inappropriate [OE configuration specific]
20 1 file changed, 4 insertions(+), 4 deletions(-) 20 1 file changed, 4 insertions(+), 4 deletions(-)
21 21
22diff --git a/examples/sudo.conf.in b/examples/sudo.conf.in 22diff --git a/examples/sudo.conf.in b/examples/sudo.conf.in
23index 2187457..0908d24 100644 23index bdd676c..094341c 100644
24--- a/examples/sudo.conf.in 24--- a/examples/sudo.conf.in
25+++ b/examples/sudo.conf.in 25+++ b/examples/sudo.conf.in
26@@ -4,7 +4,7 @@ 26@@ -4,7 +4,7 @@
@@ -52,7 +52,7 @@ index 2187457..0908d24 100644
52 # Sudo plugin directory: 52 # Sudo plugin directory:
53@@ -74,7 +74,7 @@ 53@@ -74,7 +74,7 @@
54 # The default directory to use when searching for plugins that are 54 # The default directory to use when searching for plugins that are
55 # specified without a fully qualified path name. 55 # specified without a fully-qualified path name.
56 # 56 #
57-#Path plugin_dir @plugindir@ 57-#Path plugin_dir @plugindir@
58+#Path plugin_dir $plugindir 58+#Path plugin_dir $plugindir