From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Aug 17 11:00:29 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F2AD2106566B for ; Fri, 17 Aug 2012 11:00:29 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 90DBC8FC0C for ; Fri, 17 Aug 2012 11:00:29 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q7HB0Tk9025384 for ; Fri, 17 Aug 2012 11:00:29 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q7HB0SWF025383; Fri, 17 Aug 2012 11:00:28 GMT (envelope-from gnats) Resent-Date: Fri, 17 Aug 2012 11:00:28 GMT Resent-Message-Id: <201208171100.q7HB0SWF025383@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Pakhom Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0FAE0106566C for ; Fri, 17 Aug 2012 10:53:05 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id EE9498FC14 for ; Fri, 17 Aug 2012 10:53:04 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q7HAr4E4055545 for ; Fri, 17 Aug 2012 10:53:04 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id q7HAr4N6055544; Fri, 17 Aug 2012 10:53:04 GMT (envelope-from nobody) Message-Id: <201208171053.q7HAr4N6055544@red.freebsd.org> Date: Fri, 17 Aug 2012 10:53:04 GMT From: Pakhom To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/170700: net-mgmt/zabbix2-server: update to 2.0.2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Aug 2012 11:00:30 -0000 >Number: 170700 >Category: ports >Synopsis: net-mgmt/zabbix2-server: update to 2.0.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Aug 17 11:00:25 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Pakhom >Release: 9.0-RELEASE >Organization: Golynga >Environment: >Description: - Update to 2.0.2 - Remove patch to proc.c (ZBX-3897 fixed) >How-To-Repeat: >Fix: Patch attached with submission follows: diff --exclude=CVS -urN zabbix2-server.orig/Makefile zabbix2-server/Makefile --- zabbix2-server.orig/Makefile 2012-08-16 16:53:27.000000000 +0400 +++ zabbix2-server/Makefile 2012-08-16 17:31:40.320758853 +0400 @@ -6,7 +6,7 @@ # PORTNAME= zabbix2 -PORTVERSION= 2.0.0 +PORTVERSION= 2.0.2 CATEGORIES= net-mgmt MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION} PKGNAMESUFFIX?= -server diff --exclude=CVS -urN zabbix2-server.orig/distinfo zabbix2-server/distinfo --- zabbix2-server.orig/distinfo 2012-08-16 16:53:27.000000000 +0400 +++ zabbix2-server/distinfo 2012-08-16 17:36:32.352753562 +0400 @@ -1,2 +1,2 @@ -SHA256 (zabbix-2.0.0.tar.gz) = 52cc4b8a8624d53ff4591ebf86a92c19230964d46d39e5cccf7b8648fb2ecf4d -SIZE (zabbix-2.0.0.tar.gz) = 12091622 +SHA256 (zabbix-2.0.2.tar.gz) = 2db56e4fc291f5469584844703f6815fe739c3b33b4c2d5854285a780650cfbb +SIZE (zabbix-2.0.2.tar.gz) = 12070505 diff --exclude=CVS -urN zabbix2-server.orig/files/patch-src_libs_zbxsysinfo_freebsd__proc.c zabbix2-server/files/patch-src_libs_zbxsysinfo_freebsd__proc.c --- zabbix2-server.orig/files/patch-src_libs_zbxsysinfo_freebsd__proc.c 2012-05-12 17:55:28.000000000 +0400 +++ zabbix2-server/files/patch-src_libs_zbxsysinfo_freebsd__proc.c 1970-01-01 03:00:00.000000000 +0300 @@ -1,98 +0,0 @@ ---- 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; \ No newline at end of file >Release-Note: >Audit-Trail: >Unformatted: