sudo: update to 1.9.4.

Closes: #27109 [via git-merge-pr]
This commit is contained in:
Anthony Iliopoulos 2020-12-12 13:54:58 +01:00 committed by Andrew J. Hesford
parent 13547b6d7b
commit 8650d67aca
2 changed files with 50 additions and 2 deletions

View file

@ -0,0 +1,48 @@
From e22817e3abfee6fee779ab0b2d312d48323abb56 Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <Todd.Miller@sudo.ws>
Date: Mon, 30 Nov 2020 13:18:12 -0700
Subject: [PATCH] Fix build when configured using --without-sendmail Bug #947
---
lib/eventlog/eventlog.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git lib/eventlog/eventlog.c lib/eventlog/eventlog.c
index 8b190b7ce..ae97fdea9 100644
--- lib/eventlog/eventlog.c
+++ lib/eventlog/eventlog.c
@@ -78,7 +78,7 @@
static FILE *eventlog_stub_open_log(int type, const char *logfile);
static void eventlog_stub_close_log(int type, FILE *fp);
-/* Eventlog config settings */
+/* Eventlog config settings (default values). */
static struct eventlog_config evl_conf = {
EVLOG_NONE, /* type */
EVLOG_SUDO, /* format */
@@ -91,7 +91,11 @@ static struct eventlog_config evl_conf = {
false, /* omit_hostname */
_PATH_SUDO_LOGFILE, /* logpath */
"%h %e %T", /* time_fmt */
+#ifdef _PATH_SUDO_SENDMAIL
_PATH_SUDO_SENDMAIL, /* mailerpath */
+#else
+ NULL, /* mailerpath (disabled) */
+#endif
"-t", /* mailerflags */
NULL, /* mailfrom */
MAILTO, /* mailto */
@@ -1436,8 +1440,10 @@ eventlog_setconf(struct eventlog_config *conf)
evl_conf.logpath = _PATH_SUDO_LOGFILE;
if (evl_conf.time_fmt == NULL)
evl_conf.time_fmt = "%h %e %T";
+#ifdef _PATH_SUDO_SENDMAIL
if (evl_conf.mailerpath == NULL)
evl_conf.mailerpath = _PATH_SUDO_SENDMAIL;
+#endif
if (evl_conf.mailerflags == NULL)
evl_conf.mailerflags = "-t";
if (evl_conf.mailto == NULL)
--
2.29.2

View file

@ -1,6 +1,6 @@
# Template file for 'sudo'
pkgname=sudo
version=1.9.3p1
version=1.9.4
revision=1
build_style=gnu-configure
configure_args="--with-ignore-dot --with-insults=disabled --with-all-insults --with-env-editor
@ -15,7 +15,7 @@ license="ISC"
homepage="https://www.sudo.ws/"
changelog="https://www.sudo.ws/repos/sudo/raw-file/tip/NEWS"
distfiles="https://www.sudo.ws/dist/sudo-${version}.tar.gz"
checksum=dcb9de53e45e1c39042074b847f5e0d8ae1890725dd6a9d9101a81569e6eb49e
checksum=8b91bd2cc73af18a06a01406e38d154b837107be759f72e89cefeaa94e1103f0
conf_files="/etc/pam.d/sudo /etc/sudoers"
lib32disabled=yes