| 1 |
commit: 9ba5fba4c49a57b06edf98a78f72fccf0a84aafa |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 1 10:36:59 2020 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 1 10:37:47 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ba5fba4 |
| 7 |
|
| 8 |
app-admin/sudo: Fixed build with USE="-sendmail" |
| 9 |
|
| 10 |
Reported-by: matoro <matoro <AT> airmail.cc> |
| 11 |
Closes: https://bugs.gentoo.org/757819 |
| 12 |
Package-Manager: Portage-3.0.11, Repoman-3.0.2 |
| 13 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 14 |
|
| 15 |
.../sudo-1.9.4-without-sendmail_build_fix.patch | 45 ++++++++++++++++++++++ |
| 16 |
app-admin/sudo/sudo-1.9.4.ebuild | 4 ++ |
| 17 |
2 files changed, 49 insertions(+) |
| 18 |
|
| 19 |
diff --git a/app-admin/sudo/files/sudo-1.9.4-without-sendmail_build_fix.patch b/app-admin/sudo/files/sudo-1.9.4-without-sendmail_build_fix.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..f40bfe445e0 |
| 22 |
--- /dev/null |
| 23 |
+++ b/app-admin/sudo/files/sudo-1.9.4-without-sendmail_build_fix.patch |
| 24 |
@@ -0,0 +1,45 @@ |
| 25 |
+ |
| 26 |
+# HG changeset patch |
| 27 |
+# User Todd C. Miller <Todd.Miller@××××.ws> |
| 28 |
+# Date 1606767492 25200 |
| 29 |
+# Node ID 41db1aad85bbce444b511bcb28b9628a0a22fcd9 |
| 30 |
+# Parent 96a5cfe3c66b6ee84d7f7b6fb26d932f45a44b76 |
| 31 |
+Fix build when configured using --without-sendmail |
| 32 |
+Bug #947 |
| 33 |
+ |
| 34 |
+diff -r 96a5cfe3c66b -r 41db1aad85bb lib/eventlog/eventlog.c |
| 35 |
+--- a/lib/eventlog/eventlog.c Sun Nov 29 15:11:34 2020 -0700 |
| 36 |
++++ b/lib/eventlog/eventlog.c Mon Nov 30 13:18:12 2020 -0700 |
| 37 |
+@@ -78,7 +78,7 @@ |
| 38 |
+ static FILE *eventlog_stub_open_log(int type, const char *logfile); |
| 39 |
+ static void eventlog_stub_close_log(int type, FILE *fp); |
| 40 |
+ |
| 41 |
+-/* Eventlog config settings */ |
| 42 |
++/* Eventlog config settings (default values). */ |
| 43 |
+ static struct eventlog_config evl_conf = { |
| 44 |
+ EVLOG_NONE, /* type */ |
| 45 |
+ EVLOG_SUDO, /* format */ |
| 46 |
+@@ -91,7 +91,11 @@ |
| 47 |
+ false, /* omit_hostname */ |
| 48 |
+ _PATH_SUDO_LOGFILE, /* logpath */ |
| 49 |
+ "%h %e %T", /* time_fmt */ |
| 50 |
++#ifdef _PATH_SUDO_SENDMAIL |
| 51 |
+ _PATH_SUDO_SENDMAIL, /* mailerpath */ |
| 52 |
++#else |
| 53 |
++ NULL, /* mailerpath (disabled) */ |
| 54 |
++#endif |
| 55 |
+ "-t", /* mailerflags */ |
| 56 |
+ NULL, /* mailfrom */ |
| 57 |
+ MAILTO, /* mailto */ |
| 58 |
+@@ -1436,8 +1440,10 @@ |
| 59 |
+ evl_conf.logpath = _PATH_SUDO_LOGFILE; |
| 60 |
+ if (evl_conf.time_fmt == NULL) |
| 61 |
+ evl_conf.time_fmt = "%h %e %T"; |
| 62 |
++#ifdef _PATH_SUDO_SENDMAIL |
| 63 |
+ if (evl_conf.mailerpath == NULL) |
| 64 |
+ evl_conf.mailerpath = _PATH_SUDO_SENDMAIL; |
| 65 |
++#endif |
| 66 |
+ if (evl_conf.mailerflags == NULL) |
| 67 |
+ evl_conf.mailerflags = "-t"; |
| 68 |
+ if (evl_conf.mailto == NULL) |
| 69 |
+ |
| 70 |
|
| 71 |
diff --git a/app-admin/sudo/sudo-1.9.4.ebuild b/app-admin/sudo/sudo-1.9.4.ebuild |
| 72 |
index 84770ae1b43..74f99d722ac 100644 |
| 73 |
--- a/app-admin/sudo/sudo-1.9.4.ebuild |
| 74 |
+++ b/app-admin/sudo/sudo-1.9.4.ebuild |
| 75 |
@@ -74,6 +74,10 @@ REQUIRED_USE=" |
| 76 |
|
| 77 |
MAKEOPTS+=" SAMPLES=" |
| 78 |
|
| 79 |
+PATCHES=( |
| 80 |
+ "${FILESDIR}/${P}-without-sendmail_build_fix.patch" #757819 |
| 81 |
+) |
| 82 |
+ |
| 83 |
src_prepare() { |
| 84 |
default |
| 85 |
elibtoolize |
Archives