From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Sep 24 22:50:10 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4D5B5106564A for ; Mon, 24 Sep 2012 22:50:10 +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 25A2F8FC0C for ; Mon, 24 Sep 2012 22:50:10 +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 q8OMoALm033729 for ; Mon, 24 Sep 2012 22:50:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q8OMo9d1033728; Mon, 24 Sep 2012 22:50:09 GMT (envelope-from gnats) Resent-Date: Mon, 24 Sep 2012 22:50:09 GMT Resent-Message-Id: <201209242250.q8OMo9d1033728@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, Frank Wall Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 310CC1065670 for ; Mon, 24 Sep 2012 22:49:24 +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 AE7C68FC14 for ; Mon, 24 Sep 2012 22:49:23 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id q8OMnN9U029456 for ; Mon, 24 Sep 2012 22:49:23 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id q8OMnNdW029455; Mon, 24 Sep 2012 22:49:23 GMT (envelope-from nobody) Message-Id: <201209242249.q8OMnNdW029455@red.freebsd.org> Date: Mon, 24 Sep 2012 22:49:23 GMT From: Frank Wall To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/171931: [PATCH] net-mgmt/zabbix-server: update to 1.8.15 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: Mon, 24 Sep 2012 22:50:10 -0000 >Number: 171931 >Category: ports >Synopsis: [PATCH] net-mgmt/zabbix-server: update to 1.8.15 >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: Mon Sep 24 22:50:09 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Frank Wall >Release: 8.3-RELEASE-p3 >Organization: >Environment: FreeBSD XXX 8.3-RELEASE-p3 FreeBSD 8.3-RELEASE-p3 #0: Tue Jun 12 00:39:29 UTC 2012 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64 >Description: - update to Zabbix 1.8.15 - update patch to reflect changes in zabbix source - update CONFLICHTS to include Zabbix 2.x >How-To-Repeat: >Fix: apply the patch Patch attached with submission follows: --- net-mgmt/zabbix-server/Makefile.orig 2012-05-12 15:55:28.000000000 +0200 +++ net-mgmt/zabbix-server/Makefile 2012-09-24 20:48:43.000000000 +0200 @@ -6,7 +6,7 @@ # PORTNAME= zabbix -PORTVERSION= 1.8.13 +PORTVERSION= 1.8.15 PORTEPOCH= 2 CATEGORIES= net-mgmt MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION} @@ -20,7 +20,7 @@ CONFLICTS= ${PKGBASE}-1.[0-6]* .if ${PKGNAMESUFFIX} != "-agent" -CONFLICTS+= ${PORTNAME}-1.[0-6]* +CONFLICTS+= ${PORTNAME}-[1-2].[0-6]* .endif ZABBIX_BUILD= ${PKGNAMESUFFIX:S/^-//} --- net-mgmt/zabbix-server/distinfo.orig 2012-05-12 15:55:28.000000000 +0200 +++ net-mgmt/zabbix-server/distinfo 2012-09-24 20:49:01.000000000 +0200 @@ -1,2 +1,2 @@ -SHA256 (zabbix-1.8.13.tar.gz) = ac4497cde031b793e492e874b091d109da7d5410c4ba55f54cad0749ae47e667 -SIZE (zabbix-1.8.13.tar.gz) = 4235482 +SHA256 (zabbix-1.8.15.tar.gz) = 6ee4014dec29652ceba472f8973b267047e5d0599a729e24a266b26dbad7a80c +SIZE (zabbix-1.8.15.tar.gz) = 4241782 --- net-mgmt/zabbix-server/files/patch-src_libs_zbxsysinfo_freebsd__proc.c.orig 2012-05-12 15:55:28.000000000 +0200 +++ net-mgmt/zabbix-server/files/patch-src_libs_zbxsysinfo_freebsd__proc.c 2012-09-25 00:37:04.000000000 +0200 @@ -38,30 +38,6 @@ 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) @@ -72,27 +48,3 @@ 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: