FreeBSD Bugzilla – Attachment 124284 Details for
Bug 167802
[MAINTAINER] net-mgmt/zabbix-server: update to 1.8.13,2
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
zabbix-server-1.8.13,2.patch
zabbix-server-1.8.13,2.patch (text/plain), 3.66 KB, created by
Jim Riggs
on 2012-05-11 17:00:30 UTC
(
hide
)
Description:
zabbix-server-1.8.13,2.patch
Filename:
MIME Type:
Creator:
Jim Riggs
Created:
2012-05-11 17:00:30 UTC
Size:
3.66 KB
patch
obsolete
>diff -ruN --exclude=CVS /usr/ports/net-mgmt/zabbix-server/Makefile ./Makefile >--- /usr/ports/net-mgmt/zabbix-server/Makefile 2012-02-06 06:25:49.000000000 -0600 >+++ ./Makefile 2012-05-11 10:39:42.401533886 -0500 >@@ -6,8 +6,7 @@ > # > > PORTNAME= zabbix >-PORTVERSION= 1.8.10 >-PORTREVISION= 1 >+PORTVERSION= 1.8.13 > PORTEPOCH= 2 > CATEGORIES= net-mgmt > MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION} >diff -ruN --exclude=CVS /usr/ports/net-mgmt/zabbix-server/distinfo ./distinfo >--- /usr/ports/net-mgmt/zabbix-server/distinfo 2011-12-30 13:33:10.000000000 -0600 >+++ ./distinfo 2012-05-11 10:40:14.133533861 -0500 >@@ -1,2 +1,2 @@ >-SHA256 (zabbix-1.8.10.tar.gz) = d965d23f2ce8c7ddee7a1532863a208fae28958e3fc0871e0229ffa06f88a54b >-SIZE (zabbix-1.8.10.tar.gz) = 4217417 >+SHA256 (zabbix-1.8.13.tar.gz) = ac4497cde031b793e492e874b091d109da7d5410c4ba55f54cad0749ae47e667 >+SIZE (zabbix-1.8.13.tar.gz) = 4235482 >diff -ruN --exclude=CVS /usr/ports/net-mgmt/zabbix-server/files/patch-src:libs:zbxsysinfo:freebsd:proc.c ./files/patch-src:libs:zbxsysinfo:freebsd:proc.c >--- /usr/ports/net-mgmt/zabbix-server/files/patch-src:libs:zbxsysinfo:freebsd:proc.c 1969-12-31 18:00:00.000000000 -0600 >+++ ./files/patch-src:libs:zbxsysinfo:freebsd:proc.c 2012-05-08 07:36:11.000000000 -0500 >@@ -0,0 +1,98 @@ >+--- src/libs/zbxsysinfo/freebsd/proc.c.orig 2011-12-28 03:27:42.000000000 -0600 >++++ src/libs/zbxsysinfo/freebsd/proc.c 2012-04-25 21:54:13.877489156 -0500 >+@@ -36,17 +36,13 @@ >+ # define ZBX_PROC_PID ki_pid >+ # define ZBX_PROC_COMM ki_comm >+ # define ZBX_PROC_STAT ki_stat >+-# define ZBX_PROC_TSIZE ki_tsize >+-# define ZBX_PROC_DSIZE ki_dsize >+-# define ZBX_PROC_SSIZE ki_ssize >++# define ZBX_PROC_VSIZE ki_size >+ #else >+ # define ZBX_COMMLEN MAXCOMLEN >+ # define ZBX_PROC_PID kp_proc.p_pid >+ # define ZBX_PROC_COMM kp_proc.p_comm >+ # define ZBX_PROC_STAT kp_proc.p_stat >+-# define ZBX_PROC_TSIZE kp_eproc.e_vm.vm_tsize >+-# define ZBX_PROC_DSIZE kp_eproc.e_vm.vm_dsize >+-# define ZBX_PROC_SSIZE kp_eproc.e_vm.vm_ssize >++# define ZBX_PROC_VSIZE kp_eproc.e_vm.vm_map.size >+ #endif >+ >+ static char *get_commandline(struct kinfo_proc *proc) >+@@ -97,7 +93,7 @@ >+ char procname[MAX_STRING_LEN], >+ buffer[MAX_STRING_LEN], >+ proccomm[MAX_STRING_LEN], *args; >+- int do_task, pagesize, count, i, >++ int do_task, count, i, >+ proc_ok, comm_ok, >+ mib[4], mibs; >+ >+@@ -152,8 +148,6 @@ >+ if (0 != get_param(param, 4, proccomm, sizeof(proccomm))) >+ *proccomm = '\0'; >+ >+- pagesize = getpagesize(); >+- >+ mib[0] = CTL_KERN; >+ mib[1] = KERN_PROC; >+ if (NULL != usrinfo) >+@@ -164,7 +158,11 @@ >+ } >+ else >+ { >++#if(__FreeBSD_version > 500000) >++ mib[2] = KERN_PROC_PROC; >++#else >+ mib[2] = KERN_PROC_ALL; >++#endif >+ mib[3] = 0; >+ mibs = 3; >+ } >+@@ -184,11 +182,6 @@ >+ >+ for (i = 0; i < count; i++) >+ { >+-#if(__FreeBSD_version > 500000) >+- if (proc[i].ki_flag & P_KTHREAD) /* skip a system thread */ >+- continue; >+-#endif >+- >+ proc_ok = 0; >+ comm_ok = 0; >+ if (*procname == '\0' || 0 == strcmp(procname, proc[i].ZBX_PROC_COMM)) >+@@ -205,8 +198,7 @@ >+ >+ if (proc_ok && comm_ok) >+ { >+- value = proc[i].ZBX_PROC_TSIZE + proc[i].ZBX_PROC_DSIZE + proc[i].ZBX_PROC_SSIZE; >+- value *= pagesize; >++ value = proc[i].ZBX_PROC_VSIZE; /* vsize is bytes not pages */ >+ >+ if (0 == proccount++) >+ memsize = value; >+@@ -306,7 +298,11 @@ >+ } >+ else >+ { >++#if(__FreeBSD_version > 500000) >++ mib[2] = KERN_PROC_PROC; >++#else >+ mib[2] = KERN_PROC_ALL; >++#endif >+ mib[3] = 0; >+ mibs = 3; >+ } >+@@ -326,11 +322,6 @@ >+ >+ for (i = 0; i < count; i++) >+ { >+-#if(__FreeBSD_version > 500000) >+- if (proc[i].ki_flag & P_KTHREAD) /* skip a system thread */ >+- continue; >+-#endif >+- >+ proc_ok = 0; >+ stat_ok = 0; >+ comm_ok = 0;
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 167802
: 124284