1 |
commit: e3dea34c197901b5d40aa0683ee9c0473ab62b9c |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 30 10:18:50 2021 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 30 10:18:50 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3dea34c |
7 |
|
8 |
app-admin/sudo: Revbump to fix NO_ROOT_MAILER issue |
9 |
|
10 |
Removed old. Bumped straight to stable. |
11 |
|
12 |
Bug: https://bugs.gentoo.org/767946 |
13 |
Package-Manager: Portage-3.0.14, Repoman-3.0.2 |
14 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
15 |
|
16 |
.../files/sudo-1.9.5_p2-NO_ROOT_MAILER_fix.patch | 51 ++++++++++++++++++++++ |
17 |
...udo-1.9.5_p2.ebuild => sudo-1.9.5_p2-r1.ebuild} | 4 ++ |
18 |
2 files changed, 55 insertions(+) |
19 |
|
20 |
diff --git a/app-admin/sudo/files/sudo-1.9.5_p2-NO_ROOT_MAILER_fix.patch b/app-admin/sudo/files/sudo-1.9.5_p2-NO_ROOT_MAILER_fix.patch |
21 |
new file mode 100644 |
22 |
index 00000000000..7cae441cbcf |
23 |
--- /dev/null |
24 |
+++ b/app-admin/sudo/files/sudo-1.9.5_p2-NO_ROOT_MAILER_fix.patch |
25 |
@@ -0,0 +1,51 @@ |
26 |
+ |
27 |
+# HG changeset patch |
28 |
+# User Todd C. Miller <Todd.Miller@××××.ws> |
29 |
+# Date 1611924154 25200 |
30 |
+# Node ID e0d4f196ba027604154f79ddd03a0b90f90c9607 |
31 |
+# Parent cd1c7615e861083e9e9b61d0e0070354e227ea5c |
32 |
+Fix NO_ROOT_MAILER, broken by the eventlog refactor in sudo 1.9.4. |
33 |
+init_eventlog_config() is called immediately after initializing the |
34 |
+Defaults settings, which is before struct sudo_user is setup. This |
35 |
+adds a call to eventlog_set_mailuid() if NO_ROOT_MAILER is defined |
36 |
+after the invoking user is determined. Reported by Roman Fiedler. |
37 |
+ |
38 |
+diff -r cd1c7615e861 -r e0d4f196ba02 plugins/sudoers/logging.c |
39 |
+--- a/plugins/sudoers/logging.c Tue Dec 08 12:35:21 2020 -0700 |
40 |
++++ b/plugins/sudoers/logging.c Fri Jan 29 05:42:34 2021 -0700 |
41 |
+@@ -786,11 +786,6 @@ |
42 |
+ init_eventlog_config(void) |
43 |
+ { |
44 |
+ int logtype = 0; |
45 |
+-#ifdef NO_ROOT_MAILER |
46 |
+- uid_t mailuid = user_uid; |
47 |
+-#else |
48 |
+- uid_t mailuid = ROOT_UID; |
49 |
+-#endif |
50 |
+ debug_decl(init_eventlog_config, SUDOERS_DEBUG_LOGGING); |
51 |
+ |
52 |
+ if (def_syslog) |
53 |
+@@ -805,7 +800,7 @@ |
54 |
+ eventlog_set_syslog_alertpri(def_syslog_badpri); |
55 |
+ eventlog_set_syslog_maxlen(def_syslog_maxlen); |
56 |
+ eventlog_set_file_maxlen(def_loglinelen); |
57 |
+- eventlog_set_mailuid(mailuid); |
58 |
++ eventlog_set_mailuid(ROOT_UID); |
59 |
+ eventlog_set_omit_hostname(!def_log_host); |
60 |
+ eventlog_set_logpath(def_logfile); |
61 |
+ eventlog_set_time_fmt(def_log_year ? "%h %e %T %Y" : "%h %e %T"); |
62 |
+diff -r cd1c7615e861 -r e0d4f196ba02 plugins/sudoers/policy.c |
63 |
+--- a/plugins/sudoers/policy.c Tue Dec 08 12:35:21 2020 -0700 |
64 |
++++ b/plugins/sudoers/policy.c Fri Jan 29 05:42:34 2021 -0700 |
65 |
+@@ -518,6 +518,10 @@ |
66 |
+ /* Some systems support fexecve() which we use for digest matches. */ |
67 |
+ cmnd_fd = -1; |
68 |
+ |
69 |
++#ifdef NO_ROOT_MAILER |
70 |
++ eventlog_set_mailuid(user_uid); |
71 |
++#endif |
72 |
++ |
73 |
+ /* Dump settings and user info (XXX - plugin args) */ |
74 |
+ for (cur = info->settings; *cur != NULL; cur++) |
75 |
+ sudo_debug_printf(SUDO_DEBUG_INFO, "settings: %s", *cur); |
76 |
+ |
77 |
|
78 |
diff --git a/app-admin/sudo/sudo-1.9.5_p2.ebuild b/app-admin/sudo/sudo-1.9.5_p2-r1.ebuild |
79 |
similarity index 99% |
80 |
rename from app-admin/sudo/sudo-1.9.5_p2.ebuild |
81 |
rename to app-admin/sudo/sudo-1.9.5_p2-r1.ebuild |
82 |
index 183dd7b6ece..af0d7b0c4bd 100644 |
83 |
--- a/app-admin/sudo/sudo-1.9.5_p2.ebuild |
84 |
+++ b/app-admin/sudo/sudo-1.9.5_p2-r1.ebuild |
85 |
@@ -74,6 +74,10 @@ REQUIRED_USE=" |
86 |
|
87 |
MAKEOPTS+=" SAMPLES=" |
88 |
|
89 |
+PATCHES=( |
90 |
+ "${FILESDIR}/${P}-NO_ROOT_MAILER_fix.patch" #767946 |
91 |
+) |
92 |
+ |
93 |
src_prepare() { |
94 |
default |
95 |
elibtoolize |