From e938cf38cdc48f99463c0002c75b560cd269ffec Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Mon, 21 Dec 2020 12:44:15 +0000 Subject: [PATCH] security/sudo: Update to 1.9.4p2 PR: 251930 Submitted by: Yasuhiro Kimura Sponsored by: Rubicon Communications, LLC (Netgate) --- security/sudo/Makefile | 3 +- security/sudo/distinfo | 6 +-- .../files/patch-fix_build_without_sendmail | 45 ------------------- 3 files changed, 4 insertions(+), 50 deletions(-) delete mode 100644 security/sudo/files/patch-fix_build_without_sendmail diff --git a/security/sudo/Makefile b/security/sudo/Makefile index 1e06550593c4..54896de94a6b 100644 --- a/security/sudo/Makefile +++ b/security/sudo/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= sudo -PORTVERSION= 1.9.4 -PORTREVISION= 1 +DISTVERSION= 1.9.4p2 CATEGORIES= security MASTER_SITES= SUDO diff --git a/security/sudo/distinfo b/security/sudo/distinfo index 69fa9704775e..48854da9181e 100644 --- a/security/sudo/distinfo +++ b/security/sudo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1607081324 -SHA256 (sudo-1.9.4.tar.gz) = 8b91bd2cc73af18a06a01406e38d154b837107be759f72e89cefeaa94e1103f0 -SIZE (sudo-1.9.4.tar.gz) = 3992062 +TIMESTAMP = 1608551886 +SHA256 (sudo-1.9.4p2.tar.gz) = c34af1fa79d40d0869e4010bdd64005290ea2e1ba35638ef07fcc684c4470f64 +SIZE (sudo-1.9.4p2.tar.gz) = 3994184 diff --git a/security/sudo/files/patch-fix_build_without_sendmail b/security/sudo/files/patch-fix_build_without_sendmail deleted file mode 100644 index 5efe192f5d7b..000000000000 --- a/security/sudo/files/patch-fix_build_without_sendmail +++ /dev/null @@ -1,45 +0,0 @@ - -# HG changeset patch -# User Todd C. Miller -# 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) -