Attachment 212770 Details for Bug 245115 – update collectd to 5.11.0

[patch] update collectd to 5.11.0

_collectd5.11.patch (text/plain), 8.07 KB, created by Krzysztof on 2020-03-27 22:17:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Krzysztof

Created: 2020-03-27 22:17:33 UTC

Size: 8.07 KB

patch

obsolete

>diff -ruN net-mgmt/collectd5/Makefile net-mgmt/collectd5.new/Makefile
>--- net-mgmt/collectd5/Makefile	2020-01-22 06:53:20.000000000 +0100
>+++ net-mgmt/collectd5.new/Makefile	2020-03-27 22:57:07.721840000 +0100
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/net-mgmt/collectd5/Makefile 523788 2020-01-22 05:53:20Z sunpoet $
> 
> PORTNAME=	collectd
>-PORTVERSION=	5.10.0
>-PORTREVISION=	1
>+PORTVERSION=	5.11.0
> CATEGORIES=	net-mgmt
> MASTER_SITES=	https://storage.googleapis.com/collectd-tarballs/
> PKGNAMESUFFIX=	5
>@@ -20,12 +19,12 @@
> 
> OPTIONS_DEFINE=		CGI GCRYPT JAVA LOGGING LOGSTASH VIRT
> OPTIONS_GROUP=		INPUT OUTPUT
>-OPTIONS_GROUP_OUTPUT=	KAFKA MONGODB NOTIFYDESKTOP NOTIFYEMAIL PROMETHEUS \
>+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 \
>-			SNMP STATSD TOKYOTYRANT VARNISH XML ZOOKEEPER
>+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
> 
>@@ -36,6 +35,7 @@
> 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
>@@ -63,6 +63,7 @@
> 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
>@@ -134,6 +135,8 @@
> 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
> 
>@@ -243,6 +246,10 @@
> 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
>@@ -286,8 +293,10 @@
> 			--enable-exec \
> 			--enable-filecount \
> 			--enable-interface \
>+			--enable-ipstats \
> 			--enable-load \
> 			--enable-logfile \
>+			--enable-logparser \
> 			--enable-match_empty_counter \
> 			--enable-match_hashed \
> 			--enable-match_regex \
>diff -ruN net-mgmt/collectd5/distinfo net-mgmt/collectd5.new/distinfo
>--- net-mgmt/collectd5/distinfo	2019-12-08 11:05:44.000000000 +0100
>+++ net-mgmt/collectd5.new/distinfo	2020-03-23 22:14:52.123806000 +0100
>@@ -1,3 +1,3 @@
> TIMESTAMP = 1575665579
>-SHA256 (collectd-5.10.0.tar.bz2) = a03359f563023e744c2dc743008a00a848f4cd506e072621d86b6d8313c0375b
>-SIZE (collectd-5.10.0.tar.bz2) = 1856377
>+SHA256 (collectd-5.11.0.tar.bz2) = 37b10a806e34aa8570c1cafa6006c604796fae13cc2e1b3e630d33dcba9e5db2
>+SIZE (collectd-5.11.0.tar.bz2) = 1851663
>diff -ruN net-mgmt/collectd5/files/patch-Makefile.am net-mgmt/collectd5.new/files/patch-Makefile.am
>--- net-mgmt/collectd5/files/patch-Makefile.am	2019-06-30 22:55:53.000000000 +0200
>+++ net-mgmt/collectd5.new/files/patch-Makefile.am	2020-03-23 23:54:12.026580000 +0100
>@@ -1,6 +1,6 @@
>---- Makefile.am.orig	2019-06-13 09:13:42 UTC
>+--- Makefile.am.orig	2020-03-08 15:57:09 UTC
> +++ Makefile.am
>-@@ -187,7 +187,7 @@ AM_CPPFLAGS = \
>+@@ -188,7 +188,7 @@ AM_CPPFLAGS = \
>  	-DPREFIX='"${prefix}"' \
>  	-DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \
>  	-DLOCALSTATEDIR='"${localstatedir}"' \
>@@ -9,7 +9,7 @@
>  	-DPLUGINDIR='"${cpkglibdir}"' \
>  	-DPKGDATADIR='"${cpkgdatadir}"'
>  if BUILD_WIN32
>-@@ -2184,15 +2184,10 @@ endif
>+@@ -2377,15 +2377,10 @@ endif
>  
>  install-exec-hook:
>  	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run
>diff -ruN net-mgmt/collectd5/files/patch-configure.ac net-mgmt/collectd5.new/files/patch-configure.ac
>--- net-mgmt/collectd5/files/patch-configure.ac	1970-01-01 01:00:00.000000000 +0100
>+++ net-mgmt/collectd5.new/files/patch-configure.ac	2020-03-27 19:05:56.049454000 +0100
>@@ -0,0 +1,11 @@
>+--- configure.ac.orig	2020-03-19 09:52:56.280271200 +0100
>++++ configure.ac	2020-03-27 19:05:05.205060000 +0100
>+@@ -6475,7 +6475,7 @@ AC_ARG_WITH([libslurm],
>+     else if test -d "$with_libslurm/lib"; then
>+       AC_MSG_NOTICE([Not checking for libslurm: Manually configured])
>+       with_libslurm_cflags="-I$withval/include"
>+-      with_libslurm_libs="-L$withval/lib -llibslurm"
>++      with_libslurm_libs="-L$withval/lib -lslurm"
>+       with_libslurm="yes"
>+     fi; fi; fi
>+   ],
>diff -ruN net-mgmt/collectd5/files/patch-src_network.c net-mgmt/collectd5.new/files/patch-src_network.c
>--- net-mgmt/collectd5/files/patch-src_network.c	2019-06-30 22:55:53.000000000 +0200
>+++ net-mgmt/collectd5.new/files/patch-src_network.c	2020-03-23 23:54:12.031904000 +0100
>@@ -1,6 +1,6 @@
>---- src/network.c.orig	2019-06-13 09:13:42 UTC
>+--- src/network.c.orig	2020-03-08 15:57:09 UTC
> +++ src/network.c
>-@@ -2013,6 +2013,13 @@ static int sockent_client_connect(socken
>+@@ -2045,6 +2045,13 @@ static int sockent_client_connect(sockent_t *se) /* {{
>        continue;
>      }
>  
>diff -ruN net-mgmt/collectd5/files/patch-src_zfs__arc.c net-mgmt/collectd5.new/files/patch-src_zfs__arc.c
>--- net-mgmt/collectd5/files/patch-src_zfs__arc.c	2019-06-30 22:55:53.000000000 +0200
>+++ net-mgmt/collectd5.new/files/patch-src_zfs__arc.c	2020-03-23 23:54:12.033653000 +0100
>@@ -1,6 +1,6 @@
>---- src/zfs_arc.c.orig	2019-06-13 09:13:42 UTC
>+--- src/zfs_arc.c.orig	2020-03-08 15:57:09 UTC
> +++ src/zfs_arc.c
>-@@ -322,8 +322,6 @@ static int za_read(void) {
>+@@ -312,8 +312,6 @@ static int za_read(void) {
>    za_read_derive(ksp, "prefetch_metadata_hits", "cache_result",
>                   "prefetch_metadata-hit");
>    za_read_derive(ksp, "demand_data_misses", "cache_result", "demand_data-miss");
>diff -ruN net-mgmt/collectd5/files/patch-version-gen.sh net-mgmt/collectd5.new/files/patch-version-gen.sh
>--- net-mgmt/collectd5/files/patch-version-gen.sh	2019-06-30 22:55:53.000000000 +0200
>+++ net-mgmt/collectd5.new/files/patch-version-gen.sh	2020-03-27 19:16:22.043541000 +0100
>@@ -1,11 +1,11 @@
>---- version-gen.sh.orig	2019-06-13 09:32:35 UTC
>-+++ version-gen.sh
>+--- version-gen.sh.orig	2020-03-19 09:52:56.313967100 +0100
>++++ version-gen.sh	2020-03-27 19:15:53.407855000 +0100
> @@ -2,10 +2,6 @@
>  
>- DEFAULT_VERSION="5.9.0.git"
>+ DEFAULT_VERSION="5.11.0.git"
>  
> -if [ -d .git ]; then
>--	VERSION="`git describe --dirty=+ --abbrev=7 2> /dev/null | grep collectd | sed -e 's/^collectd-//' -e 's/-/./g'`"
>+-	VERSION="`git describe --dirty=+ --abbrev=7 2> /dev/null | sed -e '/^collectd-/!d' -e 's///' -e 'y/-/./'`"
> -fi
> -
>  if test -z "$VERSION"; then
>diff -ruN net-mgmt/collectd5/pkg-plist net-mgmt/collectd5.new/pkg-plist
>--- net-mgmt/collectd5/pkg-plist	2019-10-16 15:45:49.000000000 +0200
>+++ net-mgmt/collectd5.new/pkg-plist	2020-03-27 23:02:38.340993000 +0100
>@@ -36,11 +36,13 @@
> 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
>@@ -75,6 +77,7 @@
> %%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
>@@ -101,6 +104,7 @@
> 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

Actions: View | Diff

Attachments on bug 245115: 212770 | 212771