mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-15 07:56:36 +00:00
Code Issues Releases Activity

- update to 1.8.15

Browse Source 
- update patch to reflect changes in zabbix source
- update CONFLICTS to include zabbix 2.x

PR:		171931
Submitted by:	Frank Wall <fw@moov.de>
Approved by:	maintainer timeout (3 month+)
This commit is contained in:
Ruslan Makhmatkhanov 2013-01-04 11:14:36 +00:00
parent d2c1b13640
commit 9784e0ff8b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=309926
3 changed files with 5 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net-mgmt/zabbix-server/Makefile
View File

@ -1,12 +1,8 @@
# New ports collection makefile for: zabbix-server
# Date created: 2009-12-09
# Whom: Jim Riggs <ports@christianserving.org>
#
# Created by: Jim Riggs <ports@christianserving.org>
# $FreeBSD$
#
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 +16,7 @@ LICENSE= GPLv2
CONFLICTS= ${PKGBASE}-1.[0-6]*
.if ${PKGNAMESUFFIX} != "-agent"
CONFLICTS+= ${PORTNAME}-1.[0-6]*
CONFLICTS+= ${PORTNAME}-[1-2].[0-6]*
.endif
ZABBIX_BUILD= ${PKGNAMESUFFIX:S/^-//}

4
net-mgmt/zabbix-server/distinfo
View File

@ -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

48
net-mgmt/zabbix-server/files/patch-src_libs_zbxsysinfo_freebsd__proc.c
View File

@ -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;