Date: Tue, 12 May 2020 00:09:32 +0000 (UTC) From: Hiroki Tagato <tagattie@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r534967 - in head/net-mgmt/collectd5: . files Message-ID: <202005120009.04C09Wue042914@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tagattie Date: Tue May 12 00:09:32 2020 New Revision: 534967 URL: https://svnweb.freebsd.org/changeset/ports/534967 Log: Update to 5.11.0 PR: 245115 Submitted by: Krzysztof <ports@bsdserwis.com> (maintainer) Approved by: ehaupt (mentor) Changelog: https://github.com/collectd/collectd/releases/tag/collectd-5.11.0 Added: head/net-mgmt/collectd5/files/patch-configure.ac (contents, props changed) Modified: head/net-mgmt/collectd5/Makefile head/net-mgmt/collectd5/distinfo head/net-mgmt/collectd5/files/patch-Makefile.am head/net-mgmt/collectd5/files/patch-src_network.c head/net-mgmt/collectd5/files/patch-src_zfs__arc.c head/net-mgmt/collectd5/files/patch-version-gen.sh head/net-mgmt/collectd5/pkg-plist Modified: head/net-mgmt/collectd5/Makefile ============================================================================== --- head/net-mgmt/collectd5/Makefile Mon May 11 23:51:58 2020 (r534966) +++ head/net-mgmt/collectd5/Makefile Tue May 12 00:09:32 2020 (r534967) @@ -2,8 +2,7 @@ # $FreeBSD$ 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 @@ GNU_CONFIGURE= yes 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_JSON_DESC= Enable curl_json plugin (implies curl 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 @@ REDIS_DESC= Enable redis-based plugins 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_LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ 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_CONFIGURE_WITH= libsigrok=${LOCALBASE} 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 @@ CONFIGURE_ARGS+= --enable-aggregation \ --enable-exec \ --enable-filecount \ --enable-interface \ + --enable-ipstats \ --enable-load \ --enable-logfile \ + --enable-logparser \ --enable-match_empty_counter \ --enable-match_hashed \ --enable-match_regex \ Modified: head/net-mgmt/collectd5/distinfo ============================================================================== --- head/net-mgmt/collectd5/distinfo Mon May 11 23:51:58 2020 (r534966) +++ head/net-mgmt/collectd5/distinfo Tue May 12 00:09:32 2020 (r534967) @@ -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 Modified: head/net-mgmt/collectd5/files/patch-Makefile.am ============================================================================== --- head/net-mgmt/collectd5/files/patch-Makefile.am Mon May 11 23:51:58 2020 (r534966) +++ head/net-mgmt/collectd5/files/patch-Makefile.am Tue May 12 00:09:32 2020 (r534967) @@ -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 Added: head/net-mgmt/collectd5/files/patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/collectd5/files/patch-configure.ac Tue May 12 00:09:32 2020 (r534967) @@ -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 + ], Modified: head/net-mgmt/collectd5/files/patch-src_network.c ============================================================================== --- head/net-mgmt/collectd5/files/patch-src_network.c Mon May 11 23:51:58 2020 (r534966) +++ head/net-mgmt/collectd5/files/patch-src_network.c Tue May 12 00:09:32 2020 (r534967) @@ -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; } Modified: head/net-mgmt/collectd5/files/patch-src_zfs__arc.c ============================================================================== --- head/net-mgmt/collectd5/files/patch-src_zfs__arc.c Mon May 11 23:51:58 2020 (r534966) +++ head/net-mgmt/collectd5/files/patch-src_zfs__arc.c Tue May 12 00:09:32 2020 (r534967) @@ -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"); Modified: head/net-mgmt/collectd5/files/patch-version-gen.sh ============================================================================== --- head/net-mgmt/collectd5/files/patch-version-gen.sh Mon May 11 23:51:58 2020 (r534966) +++ head/net-mgmt/collectd5/files/patch-version-gen.sh Tue May 12 00:09:32 2020 (r534967) @@ -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 Modified: head/net-mgmt/collectd5/pkg-plist ============================================================================== --- head/net-mgmt/collectd5/pkg-plist Mon May 11 23:51:58 2020 (r534966) +++ head/net-mgmt/collectd5/pkg-plist Tue May 12 00:09:32 2020 (r534967) @@ -36,11 +36,13 @@ lib/collectd/email.so 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 @@ lib/collectd/processes.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 @@ -101,6 +104,7 @@ lib/collectd/uuid.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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005120009.04C09Wue042914>