Attachment #212770 for bug #245115

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




# $FreeBSD: head/net-mgmt/collectd5/Makefile 523788 2020-01-22 05:53:20Z sunpoet $

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


OPTIONS_DEFINE=		CGI GCRYPT JAVA LOGGING LOGSTASH VIRT
OPTIONS_GROUP=		INPUT OUTPUT
OPTIONS_GROUP_OUTPUT=	INFLUXDB KAFKA MONGODB NOTIFYDESKTOP NOTIFYEMAIL PROMETHEUS \
			RIEMANN RRDTOOL TSDB
OPTIONS_GROUP_INPUT=	CHRONY CURL CURL_JSON CURL_XML DBI IPMI JSON \
			MEMCACHEC MODBUS MQTT MYSQL NUTUPS OLSRD ONEWIRE OPENLDAP \
			PERL PGSQL PINBA PING PYTHON RABBITMQ REDIS SIGROK \
			SLURM SNMP STATSD TOKYOTYRANT VARNISH XML ZOOKEEPER

OPTIONS_DEFAULT=	GCRYPT LOGGING PING


CURL_XML_DESC=		Enable ascent, bind, curl_xml plugins (implies curl and xml)
DBI_DESC=		Enable dbi plugin
GCRYPT_DESC=		Build with libgcrypt
INFLUXDB_DESC=		Enable write_influxdb_udp plugin
IPMI_DESC=		Enable OpenIPMI plugin
JSON_DESC=		Enable JSON plugins
KAFKA_DESC=		Enable write_kafka plugin

RIEMANN_DESC=		Enable write_riemann plugin (via riemann-c-client)
RRDTOOL_DESC=		Enable rrdtool plugin (also rrdcached plugin)
SIGROK_DESC=		Enable sigrok plugin
SLURM_DESC=		Enable slurm plugin
SNMP_DESC=		Enable SNMP plugin
STATSD_DESC=		Enable statsd plugin
TOKYOTYRANT_DESC=	Enable tokyotyrant plugin

GCRYPT_CONFIGURE_WITH=	libgcrypt=${LOCALBASE}
GCRYPT_LIBS=		-lgcrypt

INFLUXDB_CONFIGURE_ENABLE=	write_influxdb_udp

IPMI_LIB_DEPENDS=	libOpenIPMI.so:sysutils/openipmi
IPMI_CONFIGURE_ENABLE=	ipmi


SIGROK_USES=			gettext-runtime
SIGROK_BROKEN=			fails to configure with sigrok option

SLURM_LIB_DEPENDS=		libslurm.so:sysutils/slurm-wlm
SLURM_CONFIGURE_ENABLE=		slurm
SLURM_CONFIGURE_WITH=		libslurm=${LOCALBASE}

SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
SNMP_CONFIGURE_ENABLE=	snmp
SNMP_CONFIGURE_WITH=	libnetsnmp

			--enable-exec \
			--enable-filecount \
			--enable-interface \
			--enable-ipstats \
			--enable-load \
			--enable-logfile \
			--enable-logparser \
			--enable-match_empty_counter \
			--enable-match_hashed \
			--enable-match_regex \

Lines 1-3 Link Here

(-)net-mgmt/collectd5.new/distinfo (-2 / +2 lines)
1	TIMESTAMP = 1575665579	1	TIMESTAMP = 1575665579
2	SHA256 (collectd-5.10.0.tar.bz2) = a03359f563023e744c2dc743008a00a848f4cd506e072621d86b6d8313c0375b	2	SHA256 (collectd-5.11.0.tar.bz2) = 37b10a806e34aa8570c1cafa6006c604796fae13cc2e1b3e630d33dcba9e5db2
3	SIZE (collectd-5.10.0.tar.bz2) = 1856377	3	SIZE (collectd-5.11.0.tar.bz2) = 1851663

Lines 1-6 Link Here

(-)net-mgmt/collectd5.new/files/patch-Makefile.am (-3 / +3 lines)
1	--- Makefile.am.orig 2019-06-13 09:13:42 UTC	1	--- Makefile.am.orig 2020-03-08 15:57:09 UTC
2	+++ Makefile.am	2	+++ Makefile.am
3	@@ -187,7 +187,7 @@ AM_CPPFLAGS = \	3	@@ -188,7 +188,7 @@ AM_CPPFLAGS = \
4	-DPREFIX='"${prefix}"' \	4	-DPREFIX='"${prefix}"' \
5	-DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \	5	-DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \
6	-DLOCALSTATEDIR='"${localstatedir}"' \	6	-DLOCALSTATEDIR='"${localstatedir}"' \
Lines 9-15 Link Here
9	-DPLUGINDIR='"${cpkglibdir}"' \	9	-DPLUGINDIR='"${cpkglibdir}"' \
10	-DPKGDATADIR='"${cpkgdatadir}"'	10	-DPKGDATADIR='"${cpkgdatadir}"'
11	if BUILD_WIN32	11	if BUILD_WIN32
12	@@ -2184,15 +2184,10 @@ endif	12	@@ -2377,15 +2377,10 @@ endif
13		13
14	install-exec-hook:	14	install-exec-hook:
15	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run	15	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run

Line 0 Link Here

(-)net-mgmt/collectd5.new/files/patch-configure.ac (+11 lines)
	1	--- configure.ac.orig 2020-03-19 09:52:56.280271200 +0100
	2	+++ configure.ac 2020-03-27 19:05:05.205060000 +0100
	3	@@ -6475,7 +6475,7 @@ AC_ARG_WITH([libslurm],
	4	else if test -d "$with_libslurm/lib"; then
	5	AC_MSG_NOTICE([Not checking for libslurm: Manually configured])
	6	with_libslurm_cflags="-I$withval/include"
	7	- with_libslurm_libs="-L$withval/lib -llibslurm"
	8	+ with_libslurm_libs="-L$withval/lib -lslurm"
	9	with_libslurm="yes"
	10	fi; fi; fi
	11	],

Lines 1-6 Link Here

(-)net-mgmt/collectd5.new/files/patch-src_network.c (-2 / +2 lines)
1	--- src/network.c.orig 2019-06-13 09:13:42 UTC	1	--- src/network.c.orig 2020-03-08 15:57:09 UTC
2	+++ src/network.c	2	+++ src/network.c
3	@@ -2013,6 +2013,13 @@ static int sockent_client_connect(socken	3	@@ -2045,6 +2045,13 @@ static int sockent_client_connect(sockent_t se) / {{
4	continue;	4	continue;
5	}	5	}
6		6

Lines 1-6 Link Here

(-)net-mgmt/collectd5.new/files/patch-src_zfs__arc.c (-2 / +2 lines)
1	--- src/zfs_arc.c.orig 2019-06-13 09:13:42 UTC	1	--- src/zfs_arc.c.orig 2020-03-08 15:57:09 UTC
2	+++ src/zfs_arc.c	2	+++ src/zfs_arc.c
3	@@ -322,8 +322,6 @@ static int za_read(void) {	3	@@ -312,8 +312,6 @@ static int za_read(void) {
4	za_read_derive(ksp, "prefetch_metadata_hits", "cache_result",	4	za_read_derive(ksp, "prefetch_metadata_hits", "cache_result",
5	"prefetch_metadata-hit");	5	"prefetch_metadata-hit");
6	za_read_derive(ksp, "demand_data_misses", "cache_result", "demand_data-miss");	6	za_read_derive(ksp, "demand_data_misses", "cache_result", "demand_data-miss");

Lines 1-11 Link Here

(-)net-mgmt/collectd5.new/files/patch-version-gen.sh (-4 / +4 lines)
1	--- version-gen.sh.orig 2019-06-13 09:32:35 UTC	1	--- version-gen.sh.orig 2020-03-19 09:52:56.313967100 +0100
2	+++ version-gen.sh	2	+++ version-gen.sh 2020-03-27 19:15:53.407855000 +0100
3	@@ -2,10 +2,6 @@	3	@@ -2,10 +2,6 @@
4		4
5	DEFAULT_VERSION="5.9.0.git"	5	DEFAULT_VERSION="5.11.0.git"
6		6
7	-if [ -d .git ]; then	7	-if [ -d .git ]; then
8	- VERSION="`git describe --dirty=+ --abbrev=7 2> /dev/null \| grep collectd \| sed -e 's/^collectd-//' -e 's/-/./g'`"	8	- VERSION="`git describe --dirty=+ --abbrev=7 2> /dev/null \| sed -e '/^collectd-/!d' -e 's///' -e 'y/-/./'`"
9	-fi	9	-fi
10	-	10	-
11	if test -z "$VERSION"; then	11	if test -z "$VERSION"; then




lib/collectd/exec.so
lib/collectd/filecount.so
lib/collectd/interface.so
lib/collectd/ipstats.so
%%IPMI%%lib/collectd/ipmi.so
%%JAVA%%lib/collectd/java.so
lib/collectd/load.so
%%LOGSTASH%%lib/collectd/log_logstash.so
lib/collectd/logfile.so
lib/collectd/logparser.so
lib/collectd/match_empty_counter.so
lib/collectd/match_hashed.so
lib/collectd/match_regex.so

%%RRDTOOL%%lib/collectd/rrdcached.so
%%RRDTOOL%%lib/collectd/rrdtool.so
%%SIGROK%%lib/collectd/sigrok.so
%%SLURM%%lib/collectd/slurm.so
%%SNMP%%lib/collectd/snmp.so
%%STATSD%%lib/collectd/statsd.so
lib/collectd/swap.so

lib/collectd/write_graphite.so
%%CURL%%lib/collectd/write_http.so
lib/collectd/write_log.so
%%INFLUXDB%%lib/collectd/write_influxdb_udp.so
%%KAFKA%%lib/collectd/write_kafka.so
%%MONGODB%%lib/collectd/write_mongodb.so
%%PROMETHEUS%%lib/collectd/write_prometheus.so

Return to bug 245115

Lines 2-9 Link Here

(-)net-mgmt/collectd5.new/Makefile (-7 / +16 lines)
2	# $FreeBSD: head/net-mgmt/collectd5/Makefile 523788 2020-01-22 05:53:20Z sunpoet $	2	# $FreeBSD: head/net-mgmt/collectd5/Makefile 523788 2020-01-22 05:53:20Z sunpoet $
3		3
4	PORTNAME= collectd	4	PORTNAME= collectd
5	PORTVERSION= 5.10.0	5	PORTVERSION= 5.11.0
6	PORTREVISION= 1
7	CATEGORIES= net-mgmt	6	CATEGORIES= net-mgmt
8	MASTER_SITES= https://storage.googleapis.com/collectd-tarballs/	7	MASTER_SITES= https://storage.googleapis.com/collectd-tarballs/
9	PKGNAMESUFFIX= 5	8	PKGNAMESUFFIX= 5
Lines 20-31 Link Here
20		19
21	OPTIONS_DEFINE= CGI GCRYPT JAVA LOGGING LOGSTASH VIRT	20	OPTIONS_DEFINE= CGI GCRYPT JAVA LOGGING LOGSTASH VIRT
22	OPTIONS_GROUP= INPUT OUTPUT	21	OPTIONS_GROUP= INPUT OUTPUT
23	OPTIONS_GROUP_OUTPUT= KAFKA MONGODB NOTIFYDESKTOP NOTIFYEMAIL PROMETHEUS \	22	OPTIONS_GROUP_OUTPUT= INFLUXDB KAFKA MONGODB NOTIFYDESKTOP NOTIFYEMAIL PROMETHEUS \
24	RIEMANN RRDTOOL TSDB	23	RIEMANN RRDTOOL TSDB
25	OPTIONS_GROUP_INPUT= CHRONY CURL CURL_JSON CURL_XML DBI IPMI JSON MEMCACHEC \	24	OPTIONS_GROUP_INPUT= CHRONY CURL CURL_JSON CURL_XML DBI IPMI JSON \
26	MODBUS MQTT MYSQL NUTUPS OLSRD ONEWIRE OPENLDAP PERL \	25	MEMCACHEC MODBUS MQTT MYSQL NUTUPS OLSRD ONEWIRE OPENLDAP \
27	PGSQL PINBA PING PYTHON RABBITMQ REDIS SIGROK \	26	PERL PGSQL PINBA PING PYTHON RABBITMQ REDIS SIGROK \
28	SNMP STATSD TOKYOTYRANT VARNISH XML ZOOKEEPER	27	SLURM SNMP STATSD TOKYOTYRANT VARNISH XML ZOOKEEPER
29		28
30	OPTIONS_DEFAULT= GCRYPT LOGGING PING	29	OPTIONS_DEFAULT= GCRYPT LOGGING PING
31		30
Lines 36-41 Link Here
36	CURL_XML_DESC= Enable ascent, bind, curl_xml plugins (implies curl and xml)	35	CURL_XML_DESC= Enable ascent, bind, curl_xml plugins (implies curl and xml)
37	DBI_DESC= Enable dbi plugin	36	DBI_DESC= Enable dbi plugin
38	GCRYPT_DESC= Build with libgcrypt	37	GCRYPT_DESC= Build with libgcrypt
		38	INFLUXDB_DESC= Enable write_influxdb_udp plugin
39	IPMI_DESC= Enable OpenIPMI plugin	39	IPMI_DESC= Enable OpenIPMI plugin
40	JSON_DESC= Enable JSON plugins	40	JSON_DESC= Enable JSON plugins
41	KAFKA_DESC= Enable write_kafka plugin	41	KAFKA_DESC= Enable write_kafka plugin
Lines 63-68 Link Here
63	RIEMANN_DESC= Enable write_riemann plugin (via riemann-c-client)	63	RIEMANN_DESC= Enable write_riemann plugin (via riemann-c-client)
64	RRDTOOL_DESC= Enable rrdtool plugin (also rrdcached plugin)	64	RRDTOOL_DESC= Enable rrdtool plugin (also rrdcached plugin)
65	SIGROK_DESC= Enable sigrok plugin	65	SIGROK_DESC= Enable sigrok plugin
		66	SLURM_DESC= Enable slurm plugin
66	SNMP_DESC= Enable SNMP plugin	67	SNMP_DESC= Enable SNMP plugin
67	STATSD_DESC= Enable statsd plugin	68	STATSD_DESC= Enable statsd plugin
68	TOKYOTYRANT_DESC= Enable tokyotyrant plugin	69	TOKYOTYRANT_DESC= Enable tokyotyrant plugin
Lines 134-139 Link Here
134	GCRYPT_CONFIGURE_WITH= libgcrypt=${LOCALBASE}	135	GCRYPT_CONFIGURE_WITH= libgcrypt=${LOCALBASE}
135	GCRYPT_LIBS= -lgcrypt	136	GCRYPT_LIBS= -lgcrypt
136		137
		138	INFLUXDB_CONFIGURE_ENABLE= write_influxdb_udp
		139
137	IPMI_LIB_DEPENDS= libOpenIPMI.so:sysutils/openipmi	140	IPMI_LIB_DEPENDS= libOpenIPMI.so:sysutils/openipmi
138	IPMI_CONFIGURE_ENABLE= ipmi	141	IPMI_CONFIGURE_ENABLE= ipmi
139		142
Lines 243-248 Link Here
243	SIGROK_USES= gettext-runtime	246	SIGROK_USES= gettext-runtime
244	SIGROK_BROKEN= fails to configure with sigrok option	247	SIGROK_BROKEN= fails to configure with sigrok option
245		248
		249	SLURM_LIB_DEPENDS= libslurm.so:sysutils/slurm-wlm
		250	SLURM_CONFIGURE_ENABLE= slurm
		251	SLURM_CONFIGURE_WITH= libslurm=${LOCALBASE}
		252
246	SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp	253	SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp
247	SNMP_CONFIGURE_ENABLE= snmp	254	SNMP_CONFIGURE_ENABLE= snmp
248	SNMP_CONFIGURE_WITH= libnetsnmp	255	SNMP_CONFIGURE_WITH= libnetsnmp
Lines 286-293 Link Here
286	--enable-exec \	293	--enable-exec \
287	--enable-filecount \	294	--enable-filecount \
288	--enable-interface \	295	--enable-interface \
		296	--enable-ipstats \
289	--enable-load \	297	--enable-load \
290	--enable-logfile \	298	--enable-logfile \
		299	--enable-logparser \
291	--enable-match_empty_counter \	300	--enable-match_empty_counter \
292	--enable-match_hashed \	301	--enable-match_hashed \
293	--enable-match_regex \	302	--enable-match_regex \

Lines 36-46 Link Here

(-)net-mgmt/collectd5.new/pkg-plist (+4 lines)
36	lib/collectd/exec.so	36	lib/collectd/exec.so
37	lib/collectd/filecount.so	37	lib/collectd/filecount.so
38	lib/collectd/interface.so	38	lib/collectd/interface.so
		39	lib/collectd/ipstats.so
39	%%IPMI%%lib/collectd/ipmi.so	40	%%IPMI%%lib/collectd/ipmi.so
40	%%JAVA%%lib/collectd/java.so	41	%%JAVA%%lib/collectd/java.so
41	lib/collectd/load.so	42	lib/collectd/load.so
42	%%LOGSTASH%%lib/collectd/log_logstash.so	43	%%LOGSTASH%%lib/collectd/log_logstash.so
43	lib/collectd/logfile.so	44	lib/collectd/logfile.so
		45	lib/collectd/logparser.so
44	lib/collectd/match_empty_counter.so	46	lib/collectd/match_empty_counter.so
45	lib/collectd/match_hashed.so	47	lib/collectd/match_hashed.so
46	lib/collectd/match_regex.so	48	lib/collectd/match_regex.so
Lines 75-80 Link Here
75	%%RRDTOOL%%lib/collectd/rrdcached.so	77	%%RRDTOOL%%lib/collectd/rrdcached.so
76	%%RRDTOOL%%lib/collectd/rrdtool.so	78	%%RRDTOOL%%lib/collectd/rrdtool.so
77	%%SIGROK%%lib/collectd/sigrok.so	79	%%SIGROK%%lib/collectd/sigrok.so
		80	%%SLURM%%lib/collectd/slurm.so
78	%%SNMP%%lib/collectd/snmp.so	81	%%SNMP%%lib/collectd/snmp.so
79	%%STATSD%%lib/collectd/statsd.so	82	%%STATSD%%lib/collectd/statsd.so
80	lib/collectd/swap.so	83	lib/collectd/swap.so
Lines 101-106 Link Here
101	lib/collectd/write_graphite.so	104	lib/collectd/write_graphite.so
102	%%CURL%%lib/collectd/write_http.so	105	%%CURL%%lib/collectd/write_http.so
103	lib/collectd/write_log.so	106	lib/collectd/write_log.so
		107	%%INFLUXDB%%lib/collectd/write_influxdb_udp.so
104	%%KAFKA%%lib/collectd/write_kafka.so	108	%%KAFKA%%lib/collectd/write_kafka.so
105	%%MONGODB%%lib/collectd/write_mongodb.so	109	%%MONGODB%%lib/collectd/write_mongodb.so
106	%%PROMETHEUS%%lib/collectd/write_prometheus.so	110	%%PROMETHEUS%%lib/collectd/write_prometheus.so