Hi ports@,

Below is a diff that updates sysutils/monit to 5.25.2. Tested on amd64.
The diff removes a patch as that patch was cherry-picked from upstream
git as that patch is now part of this release.

Thanks,
Caspar Schutijser


Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/monit/Makefile,v
retrieving revision 1.59
diff -u -p -r1.59 Makefile
--- Makefile    1 Jun 2018 15:44:28 -0000       1.59
+++ Makefile    9 Jun 2018 10:32:03 -0000
@@ -2,8 +2,7 @@
 
 COMMENT=       monitoring and managing daemons utility
 
-DISTNAME=      monit-5.25.1
-REVISION=      2
+DISTNAME=      monit-5.25.2
 
 CATEGORIES=    sysutils
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/monit/distinfo,v
retrieving revision 1.39
diff -u -p -r1.39 distinfo
--- distinfo    19 Nov 2017 18:49:26 -0000      1.39
+++ distinfo    9 Jun 2018 10:32:03 -0000
@@ -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
Index: patches/patch-src_process_ProcessTree_c
===================================================================
RCS file: patches/patch-src_process_ProcessTree_c
diff -N patches/patch-src_process_ProcessTree_c
--- patches/patch-src_process_ProcessTree_c     1 May 2018 08:43:28 -0000       
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -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);

Reply via email to