Date: Mon, 7 Dec 2020 12:43:25 +0000 (UTC) From: Renato Botelho <garga@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r557225 - in head/security/sudo: . files Message-ID: <202012071243.0B7ChPix067016@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: garga Date: Mon Dec 7 12:43:25 2020 New Revision: 557225 URL: https://svnweb.freebsd.org/changeset/ports/557225 Log: security/sudo: Fix build without sendmail PR: 251582 Reported by: Alexander Kuznetsov <alex@kuznetcoff.ru> Obtained from: https://www.sudo.ws/repos/sudo/raw-rev/41db1aad85bb Sponsored by: Rubicon Communications, LLC (Netgate) Added: head/security/sudo/files/patch-fix_build_without_sendmail (contents, props changed) Modified: head/security/sudo/Makefile Modified: head/security/sudo/Makefile ============================================================================== --- head/security/sudo/Makefile Mon Dec 7 12:30:20 2020 (r557224) +++ head/security/sudo/Makefile Mon Dec 7 12:43:25 2020 (r557225) @@ -3,6 +3,7 @@ PORTNAME= sudo PORTVERSION= 1.9.4 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= SUDO Added: head/security/sudo/files/patch-fix_build_without_sendmail ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/sudo/files/patch-fix_build_without_sendmail Mon Dec 7 12:43:25 2020 (r557225) @@ -0,0 +1,45 @@ + +# HG changeset patch +# User Todd C. Miller <Todd.Miller@sudo.ws> +# Date 1606767492 25200 +# Node ID 41db1aad85bbce444b511bcb28b9628a0a22fcd9 +# Parent 96a5cfe3c66b6ee84d7f7b6fb26d932f45a44b76 +Fix build when configured using --without-sendmail +Bug #947 + +diff -r 96a5cfe3c66b -r 41db1aad85bb lib/eventlog/eventlog.c +--- lib/eventlog/eventlog.c Sun Nov 29 15:11:34 2020 -0700 ++++ lib/eventlog/eventlog.c Mon Nov 30 13:18:12 2020 -0700 +@@ -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 @@ + 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 @@ + 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) +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012071243.0B7ChPix067016>