Initial commit
This commit is contained in:
+25
@@ -0,0 +1,25 @@
|
||||
From f993c5c88faacc43971899aae2168ffb3e34dc80 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex@linutronix.de>
|
||||
Date: Fri, 24 Sep 2021 13:36:24 +0200
|
||||
Subject: [PATCH] lib/util/mksigname.c: correctly include header for out of
|
||||
tree builds
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/sudo-project/sudo/pull/123]
|
||||
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
|
||||
---
|
||||
lib/util/mksigname.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/util/mksigname.c b/lib/util/mksigname.c
|
||||
index de8b1ad..0a69e7e 100644
|
||||
--- a/lib/util/mksigname.c
|
||||
+++ b/lib/util/mksigname.c
|
||||
@@ -36,7 +36,7 @@ main(int argc, char *argv[])
|
||||
{
|
||||
unsigned int i;
|
||||
|
||||
-#include "mksigname.h"
|
||||
+#include "lib/util/mksigname.h"
|
||||
|
||||
printf("const char *const sudo_sys_signame[] = {\n");
|
||||
for (i = 0; i < nitems(sudo_sys_signame); i++) {
|
||||
+62
@@ -0,0 +1,62 @@
|
||||
From 6e835350b7413210c410d3578cfab804186b7a4f 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 2187457..0908d24 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:
|
||||
@@ -0,0 +1,6 @@
|
||||
#%PAM-1.0
|
||||
auth include common-auth
|
||||
account include common-account
|
||||
password include common-password
|
||||
session optional pam_keyinit.so revoke
|
||||
session required pam_limits.so
|
||||
Reference in New Issue
Block a user