Update to monit 5.25.2, from maintainer Caspar Schutijser

This commit is contained in:
landry 2018-06-10 08:02:58 +00:00
parent 5d610a62a9
commit 57c0bcadc4
3 changed files with 4 additions and 21 deletions

View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.59 2018/06/01 15:44:28 sthen Exp $
# $OpenBSD: Makefile,v 1.60 2018/06/10 08:02:58 landry Exp $
COMMENT= monitoring and managing daemons utility
DISTNAME= monit-5.25.1
REVISION= 2
DISTNAME= monit-5.25.2
CATEGORIES= sysutils

View File

@ -1,2 +1,2 @@
SHA256 (monit-5.25.1.tar.gz) = S1wlzrEIJfHlQE8dinshUHcWuCvCDDWG+GYDaRw7gbw=
SIZE (monit-5.25.1.tar.gz) = 1353855
SHA256 (monit-5.25.2.tar.gz) = qgzmNh0RVeQ+MKhtz/ALIAPUNPIhw2CYHO2DAnWrxko=
SIZE (monit-5.25.2.tar.gz) = 1354704

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-src_process_ProcessTree_c,v 1.1 2018/05/01 08:43:28 landry Exp $
Backport https://bitbucket.org/tildeslash/monit/commits/4a48ff1f9adaa53946492b512347ebdf85fee3ee to avoid trigerring monit: vfprintf %s NULL in "%s" in syslog
Index: src/process/ProcessTree.c
--- src/process/ProcessTree.c.orig
+++ src/process/ProcessTree.c
@@ -304,7 +304,7 @@ boolean_t ProcessTree_updateProcess(Service_T s, pid_t
s->inf.process->threads = ptree[leaf].threads.self;
s->inf.process->children = ptree[leaf].children.total;
s->inf.process->zombie = ptree[leaf].zombie;
- snprintf(s->inf.process->secattr, STRLEN, "%s", ptree[leaf].secattr);
+ snprintf(s->inf.process->secattr, STRLEN, "%s", NVLSTR(ptree[leaf].secattr));
if (ptree[leaf].cpu.usage.self >= 0) {
// compute only if initialized (delta between current and previous snapshot is available)
s->inf.process->cpu_percent = _cpuUsage(ptree[leaf].cpu.usage.self, ptree[leaf].threads.self);