Date: Tue, 8 May 2012 07:47:37 -0500 (CDT) From: Jim Riggs <ports@christianserving.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/167711: [MAINTAINER] net-mgmt/zabbix-server: update to 1.8.12, 2 Message-ID: <20120508124737.4EABE27D20B@zion.christianserving.org> Resent-Message-ID: <201205081300.q48D0NBB079723@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 167711
>Category: ports
>Synopsis: [MAINTAINER] net-mgmt/zabbix-server: update to 1.8.12,2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue May 08 13:00:22 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Jim Riggs
>Release: FreeBSD 8.2-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD packagebuild.peace.daveramsey.com 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Thu Feb 17 02:41:51 UTC 2011
>Description:
- Update to 1.8.12,2
- Add patch to proc.c to address ZBX-3897 and ZBX-4704 until applied upstream
- Supersedes ports/166313
Added file(s):
- files/patch-src:libs:zbxsysinfo:freebsd:proc.c
Generated with FreeBSD Port Tools 0.99_6 (mode: update, diff: ports)
>How-To-Repeat:
>Fix:
--- zabbix-server-1.8.12,2.patch begins here ---
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-08 07:34:49.888598942 -0500
@@ -6,8 +6,7 @@
#
PORTNAME= zabbix
-PORTVERSION= 1.8.10
-PORTREVISION= 1
+PORTVERSION= 1.8.12
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-08 07:37:05.689134159 -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.12.tar.gz) = 8ea52df75c5f5d31ede3c1807a679808bc257b587ddec1759b22dcc9da722fe7
+SIZE (zabbix-1.8.12.tar.gz) = 4229589
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;
--- zabbix-server-1.8.12,2.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120508124737.4EABE27D20B>