Attachment #251400 for bug #278686

View | Details | Raw Unified | Return to bug 278686 | Differences between
Collapse All | Expand All




PORTNAME=	collectd
PORTVERSION=	5.12.0
PORTREVISION=	13
CATEGORIES=	net-mgmt
MASTER_SITES=	https://storage.googleapis.com/collectd-tarballs/
PKGNAMESUFFIX=	5

STATSD_DESC=		Enable statsd plugin
TOKYOTYRANT_DESC=	Enable tokyotyrant plugin
TSDB_DESC=		Enable write_tsdb plugin
VARNISH_DESC=		Enable varnish 7.x cache statistics
VIRT_DESC=		Enable libvirt plugin (requires XML)
XML_DESC=		Enable XML plugins
ZOOKEEPER_DESC=		Enable zookeeper plugin

SIGROK_USES=			gettext-runtime
SIGROK_BROKEN=			working only with sigrok < 0.4

SLURM_BROKEN=			Does not compile with slurm-wlm >= 21.x
SLURM_LIB_DEPENDS=		libslurm.so:sysutils/slurm-wlm
SLURM_CONFIGURE_ENABLE=		slurm
SLURM_CONFIGURE_WITH=		libslurm=${LOCALBASE}


TSDB_CONFIGURE_ENABLE=	write_tsdb

VARNISH_LIB_DEPENDS=		libvarnishapi.so:www/varnish7
VARNISH_CONFIGURE_ENABLE=	varnish

VIRT_IMPLIES=		XML





    FreeBSD's PF has a new interface so leverage libpfctl to access it so the right interface is used depending on the version

--- src/pf.c.orig	2020-07-20 09:50:14 UTC
index 9681d366..eef9540d 100644
--- src/pf.c
+++ src/pf.c
@@ -35,6 +35,9 @@
 #endif

 
 #ifndef FCNT_NAMES
 #if FCNT_MAX != 3
@@ -76,7 +79,57 @@ static void pf_submit(char const *type, char const *ty
   plugin_dispatch_values(&vl);
 } /* void pf_submit */
 
+#ifdef __FreeBSD__
 static int pf_read(void) {
+  struct pfctl_status *state;
+  int fd;
+

+  return 0;
+} /* int pf_read */
+#else
+static int pf_read(void) {
   struct pf_status state;
   int fd;
   int status;
@@ -119,5 +172,6 @@ static int pf_read(void) {
 
   return 0;

Return to bug 278686

Lines 1-6 Link Here

(-)b/net-mgmt/collectd5/Makefile (-3 / +4 lines)
1	PORTNAME= collectd	1	PORTNAME= collectd
2	PORTVERSION= 5.12.0	2	PORTVERSION= 5.12.0
3	PORTREVISION= 12	3	PORTREVISION= 13
4	CATEGORIES= net-mgmt	4	CATEGORIES= net-mgmt
5	MASTER_SITES= https://storage.googleapis.com/collectd-tarballs/	5	MASTER_SITES= https://storage.googleapis.com/collectd-tarballs/
6	PKGNAMESUFFIX= 5	6	PKGNAMESUFFIX= 5
Lines 71-77 SNMP_DESC= Enable SNMP plugin Link Here
71	STATSD_DESC= Enable statsd plugin	71	STATSD_DESC= Enable statsd plugin
72	TOKYOTYRANT_DESC= Enable tokyotyrant plugin	72	TOKYOTYRANT_DESC= Enable tokyotyrant plugin
73	TSDB_DESC= Enable write_tsdb plugin	73	TSDB_DESC= Enable write_tsdb plugin
74	VARNISH_DESC= Enable varnish 6.x cache statistics	74	VARNISH_DESC= Enable varnish 7.x cache statistics
75	VIRT_DESC= Enable libvirt plugin (requires XML)	75	VIRT_DESC= Enable libvirt plugin (requires XML)
76	XML_DESC= Enable XML plugins	76	XML_DESC= Enable XML plugins
77	ZOOKEEPER_DESC= Enable zookeeper plugin	77	ZOOKEEPER_DESC= Enable zookeeper plugin
Lines 242-247 SIGROK_CONFIGURE_ENABLE= sigrok Link Here
242	SIGROK_USES= gettext-runtime	242	SIGROK_USES= gettext-runtime
243	SIGROK_BROKEN= working only with sigrok < 0.4	243	SIGROK_BROKEN= working only with sigrok < 0.4
244		244
		245	SLURM_BROKEN= Does not compile with slurm-wlm >= 21.x
245	SLURM_LIB_DEPENDS= libslurm.so:sysutils/slurm-wlm	246	SLURM_LIB_DEPENDS= libslurm.so:sysutils/slurm-wlm
246	SLURM_CONFIGURE_ENABLE= slurm	247	SLURM_CONFIGURE_ENABLE= slurm
247	SLURM_CONFIGURE_WITH= libslurm=${LOCALBASE}	248	SLURM_CONFIGURE_WITH= libslurm=${LOCALBASE}
Lines 259-265 TOKYOTYRANT_CONFIGURE_WITH= libtokyotyrant=${LOCALBASE} Link Here
259		260
260	TSDB_CONFIGURE_ENABLE= write_tsdb	261	TSDB_CONFIGURE_ENABLE= write_tsdb
261		262
262	VARNISH_LIB_DEPENDS= libvarnishapi.so:www/varnish6	263	VARNISH_LIB_DEPENDS= libvarnishapi.so:www/varnish7
263	VARNISH_CONFIGURE_ENABLE= varnish	264	VARNISH_CONFIGURE_ENABLE= varnish
264		265
265	VIRT_IMPLIES= XML	266	VIRT_IMPLIES= XML

Lines 4-12 Date: Tue Nov 7 03:35:47 2023 -0700 Link Here

(-)b/net-mgmt/collectd5/files/patch-src__pf.c (-6 / +5 lines)
4		4
5	FreeBSD's PF has a new interface so leverage libpfctl to access it so the right interface is used depending on the version	5	FreeBSD's PF has a new interface so leverage libpfctl to access it so the right interface is used depending on the version
6		6
7	diff --git src/pf.c src/pf.c	7	--- src/pf.c.orig 2020-07-20 09:50:14 UTC
8	index 9681d366..eef9540d 100644
9	--- src/pf.c
10	+++ src/pf.c	8	+++ src/pf.c
11	@@ -35,6 +35,9 @@	9	@@ -35,6 +35,9 @@
12	#endif	10	#endif
Lines 18-29 index 9681d366..eef9540d 100644 Link Here
18		16
19	#ifndef FCNT_NAMES	17	#ifndef FCNT_NAMES
20	#if FCNT_MAX != 3	18	#if FCNT_MAX != 3
21	@@ -76,6 +79,56 @@ static void pf_submit(char const type, char const type_instance, uint64_t val,	19	@@ -76,7 +79,57 @@ static void pf_submit(char const type, char const ty
22	plugin_dispatch_values(&vl);	20	plugin_dispatch_values(&vl);
23	} /* void pf_submit */	21	} /* void pf_submit */
24		22
25	+#ifdef __FreeBSD__	23	+#ifdef __FreeBSD__
26	+static int pf_read(void) {	24	static int pf_read(void) {
27	+ struct pfctl_status *state;	25	+ struct pfctl_status *state;
28	+ int fd;	26	+ int fd;
29	+	27	+
Lines 72-80 index 9681d366..eef9540d 100644 Link Here
72	+ return 0;	70	+ return 0;
73	+} /* int pf_read */	71	+} /* int pf_read */
74	+#else	72	+#else
75	static int pf_read(void) {	73	+static int pf_read(void) {
76	struct pf_status state;	74	struct pf_status state;
77	int fd;	75	int fd;
		76	int status;
78	@@ -119,5 +172,6 @@ static int pf_read(void) {	77	@@ -119,5 +172,6 @@ static int pf_read(void) {
79		78
80	return 0;	79	return 0;