Attachment #128044 for bug #171931

View | Details | Raw Unified | Return to bug 171931
Collapse All | Expand All

Lines 6-12 Link Here

(-)net-mgmt/zabbix-server/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= zabbix	8	PORTNAME= zabbix
9	PORTVERSION= 1.8.13	9	PORTVERSION= 1.8.15
10	PORTEPOCH= 2	10	PORTEPOCH= 2
11	CATEGORIES= net-mgmt	11	CATEGORIES= net-mgmt
12	MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}	12	MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
Lines 20-26 Link Here
20	CONFLICTS= ${PKGBASE}-1.[0-6]*	20	CONFLICTS= ${PKGBASE}-1.[0-6]*
21		21
22	.if ${PKGNAMESUFFIX} != "-agent"	22	.if ${PKGNAMESUFFIX} != "-agent"
23	CONFLICTS+= ${PORTNAME}-1.[0-6]*	23	CONFLICTS+= ${PORTNAME}-[1-2].[0-6]*
24	.endif	24	.endif
25		25
26	ZABBIX_BUILD= ${PKGNAMESUFFIX:S/^-//}	26	ZABBIX_BUILD= ${PKGNAMESUFFIX:S/^-//}

Lines 1-2 Link Here

(-)net-mgmt/zabbix-server/distinfo (-2 / +2 lines)
1	SHA256 (zabbix-1.8.13.tar.gz) = ac4497cde031b793e492e874b091d109da7d5410c4ba55f54cad0749ae47e667	1	SHA256 (zabbix-1.8.15.tar.gz) = 6ee4014dec29652ceba472f8973b267047e5d0599a729e24a266b26dbad7a80c
2	SIZE (zabbix-1.8.13.tar.gz) = 4235482	2	SIZE (zabbix-1.8.15.tar.gz) = 4241782




 	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)

 
 			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;

Return to bug 171931

Lines 38-67 Link Here

(-)net-mgmt/zabbix-server/files/patch-src_libs_zbxsysinfo_freebsd__proc.c (-48 lines)
38	mib[0] = CTL_KERN;	38	mib[0] = CTL_KERN;
39	mib[1] = KERN_PROC;	39	mib[1] = KERN_PROC;
40	if (NULL != usrinfo)	40	if (NULL != usrinfo)
41	@@ -164,7 +158,11 @@
42	}
43	else
44	{
45	+#if(__FreeBSD_version > 500000)
46	+ mib[2] = KERN_PROC_PROC;
47	+#else
48	mib[2] = KERN_PROC_ALL;
49	+#endif
50	mib[3] = 0;
51	mibs = 3;
52	}
53	@@ -184,11 +182,6 @@
54
55	for (i = 0; i < count; i++)
56	{
57	-#if(__FreeBSD_version > 500000)
58	- if (proc[i].ki_flag & P_KTHREAD) /* skip a system thread */
59	- continue;
60	-#endif
61	-
62	proc_ok = 0;
63	comm_ok = 0;
64	if (*procname == '\0' \|\| 0 == strcmp(procname, proc[i].ZBX_PROC_COMM))
65	@@ -205,8 +198,7 @@	41	@@ -205,8 +198,7 @@
66		42
67	if (proc_ok && comm_ok)	43	if (proc_ok && comm_ok)
Lines 72-98 Link Here
72		48
73	if (0 == proccount++)	49	if (0 == proccount++)
74	memsize = value;	50	memsize = value;
75	@@ -306,7 +298,11 @@
76	}
77	else
78	{
79	+#if(__FreeBSD_version > 500000)
80	+ mib[2] = KERN_PROC_PROC;
81	+#else
82	mib[2] = KERN_PROC_ALL;
83	+#endif
84	mib[3] = 0;
85	mibs = 3;
86	}
87	@@ -326,11 +322,6 @@
88
89	for (i = 0; i < count; i++)
90	{
91	-#if(__FreeBSD_version > 500000)
92	- if (proc[i].ki_flag & P_KTHREAD) /* skip a system thread */
93	- continue;
94	-#endif
95	-
96	proc_ok = 0;
97	stat_ok = 0;
98	comm_ok = 0;