Date: Wed, 28 Mar 2012 16:40:09 GMT From: Jim Riggs <ports@christianserving.org> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/166313: please, update net-mgmt/zabbix-server to 1.8.11 Message-ID: <201203281640.q2SGe9Ii065158@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/166313; it has been noted by GNATS.
From: Jim Riggs <ports@christianserving.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Re: ports/166313: please, update net-mgmt/zabbix-server to 1.8.11
Date: Wed, 28 Mar 2012 11:37:39 -0500 (CDT)
>Submitter-Id: current-users
>Originator: Jim Riggs
>Organization:
>Confidential: no
>Synopsis: Re: ports/166313: please, update net-mgmt/zabbix-server to 1.8.11
>Severity: non-critical
>Priority: low
>Category: ports
>Class: maintainer-update
>Release: FreeBSD 8.2-RELEASE amd64
>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.11,2
- Add patch to proc.c to address ZBX-3897 and ZBX-4704 until applied upstream
Added file(s):
- files/patch-src:libs:zbxsysinfo:freebsd:proc.c
Generated with FreeBSD Port Tools 0.99_4 (mode: update, diff: ports)
>How-To-Repeat:
>Fix:
--- zabbix-server-1.8.11,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-03-28 11:20:48.000000000 -0500
@@ -6,8 +6,7 @@
#
PORTNAME= zabbix
-PORTVERSION= 1.8.10
-PORTREVISION= 1
+PORTVERSION= 1.8.11
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-03-28 11:20:57.000000000 -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.11.tar.gz) = c45819b97082799bb253e4c6a3937affd07a2cd2744d860d657107aa4a3e772b
+SIZE (zabbix-1.8.11.tar.gz) = 4224738
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-03-28 11:29:07.506965945 -0500
@@ -0,0 +1,50 @@
+--- src/libs/zbxsysinfo/freebsd/proc.c.orig 2012-03-28 11:01:08.733424241 -0500
++++ src/libs/zbxsysinfo/freebsd/proc.c 2012-03-28 11:02:59.391709010 -0500
+@@ -164,7 +164,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 +188,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))
+@@ -306,7 +305,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 +329,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.11,2.patch ends here ---
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203281640.q2SGe9Ii065158>