cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update to monit-5.5

Browse Source 
maintainer timed-out
This commit is contained in:
jasper 2012-11-12 09:25:38 +00:00
parent 13f8416254
commit 579fdd8a3a
3 changed files with 4 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sysutils/monit/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.22 2012/09/23 19:33:02 jasper Exp $
# $OpenBSD: Makefile,v 1.23 2012/11/12 09:25:38 jasper Exp $
COMMENT= monitoring and managing daemons utility
DISTNAME= monit-5.4
REVISION= 0
DISTNAME= monit-5.5
CATEGORIES= sysutils

7
sysutils/monit/distinfo
View File

@ -1,5 +1,2 @@
MD5 (monit-5.4.tar.gz) = 8fORJB1EBZ0NPl0m9Oxd3w==
RMD160 (monit-5.4.tar.gz) = HwETmdTgSh2FJ37V7SundQouhV4=
SHA1 (monit-5.4.tar.gz) = 1Jf/YdqdMMKG4qIHlTioAuAkNsI=
SHA256 (monit-5.4.tar.gz) = gFxlRd4t1/PZ5uDGgBiyqt1fyYskPIhoF48kemCQYDg=
SIZE (monit-5.4.tar.gz) = 1197209
SHA256 (monit-5.5.tar.gz) = gnawYLPw5kU8l0jUId7ARN2uCdPkxGZuE0cqqylNfFM=
SIZE (monit-5.5.tar.gz) = 1197459

56
sysutils/monit/patches/patch-src_process_sysdep_OPENBSD_c
View File

@ -1,56 +0,0 @@
$OpenBSD: patch-src_process_sysdep_OPENBSD_c,v 1.1 2012/05/29 15:45:56 jasper Exp $
- switch temporary kvm_getproc2 / struct kinfo_proc2 to
kvm_getprocs / struct kinfo_proc now that the old API has
been fully replaced
--- src/process/sysdep_OPENBSD.c.orig Fri May 25 10:33:02 2012
+++ src/process/sysdep_OPENBSD.c Fri May 25 10:35:30 2012
@@ -140,11 +140,11 @@ int initprocesstree_sysdep(ProcessTree_T **reference)
int treesize;
char buf[_POSIX2_LINE_MAX];
size_t size = sizeof(maxslp);
- int mib_proc2[6] = {CTL_KERN, KERN_PROC2, KERN_PROC_KTHREAD, 0, sizeof(struct kinfo_proc2), 0};
+ int mib_proc2[6] = {CTL_KERN, KERN_PROC, KERN_PROC_KTHREAD, 0, sizeof(struct kinfo_proc), 0};
static int mib_maxslp[] = {CTL_VM, VM_MAXSLP};
ProcessTree_T *pt;
kvm_t *kvm_handle;
- static struct kinfo_proc2 *pinfo;
+ static struct kinfo_proc *pinfo;
if (sysctl(mib_maxslp, 2, &maxslp, &size, NULL, 0) < 0) {
LogError("system statistic error -- vm.maxslp failed");
@@ -152,20 +152,20 @@ int initprocesstree_sysdep(ProcessTree_T **reference)
}
if (sysctl(mib_proc2, 6, NULL, &size, NULL, 0) == -1) {
- LogError("system statistic error -- kern.proc2 #1 failed");
+ LogError("system statistic error -- kern.proc #1 failed");
return FALSE;
}
size *= 2; // Add reserve for new processes which were created between calls of sysctl
pinfo = CALLOC(1, size);
- mib_proc2[5] = (int)(size / sizeof(struct kinfo_proc2));
+ mib_proc2[5] = (int)(size / sizeof(struct kinfo_proc));
if (sysctl(mib_proc2, 6, pinfo, &size, NULL, 0) == -1) {
FREE(pinfo);
- LogError("system statistic error -- kern.proc2 #2 failed");
+ LogError("system statistic error -- kern.proc #2 failed");
return FALSE;
}
- treesize = (int)(size / sizeof(struct kinfo_proc2));
+ treesize = (int)(size / sizeof(struct kinfo_proc));
pt = CALLOC(sizeof(ProcessTree_T), treesize);
@@ -185,7 +185,7 @@ int initprocesstree_sysdep(ProcessTree_T **reference)
pt[i].status_flag |= PROCESS_ZOMBIE; //FIXME: save system service flag too (kernel threads)
pt[i].time = get_float_time();
char **args;
- if ((args = kvm_getargv2(kvm_handle, &pinfo[i], 0))) {
+ if ((args = kvm_getargv(kvm_handle, &pinfo[i], 0))) {
StringBuffer_T cmdline = StringBuffer_create(64);;
for (int j = 0; args[j]; j++)
StringBuffer_append(cmdline, args[j + 1] ? "%s " : "%s", args[j]);