Index: head/net-mgmt/collectd5/Makefile =================================================================== --- head/net-mgmt/collectd5/Makefile (revision 430554) +++ head/net-mgmt/collectd5/Makefile (revision 430555) @@ -1,366 +1,365 @@ # Created by: Matt Peterson # $FreeBSD$ PORTNAME= collectd -PORTVERSION= 5.6.0 -PORTREVISION= 2 +PORTVERSION= 5.7.0 CATEGORIES= net-mgmt MASTER_SITES= https://collectd.org/files/ \ http://collectd.org/files/ PKGNAMESUFFIX= 5 MAINTAINER= ports@bsdserwis.com COMMENT= Systems & network statistics collection daemon LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING # Only autoreconf stage and sigrok plugin need GLIB: BUILD_DEPENDS= ${LOCALBASE}/share/aclocal/glib-2.0.m4:devel/glib20 LIB_DEPENDS= libltdl.so:devel/libltdl USES= autoreconf gmake libtool pkgconfig shebangfix tar:bzip2 GNU_CONFIGURE= yes OPTIONS_DEFINE= CGI DEBUG GCRYPT LOGSTASH VIRT OPTIONS_GROUP= INPUT OUTPUT OPTIONS_GROUP_OUTPUT= KAFKA MONGODB NOTIFYDESKTOP NOTIFYEMAIL 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 ROUTEROS \ SIGROK SNMP STATSD TOKYOTYRANT VARNISH XML \ XMMS ZOOKEEPER CGI_DESC= Install collection.cgi (requires rrdtool) CHRONY_DESC= Enable chronyd plugin CURL_DESC= Enable curl-based plugins (apache, nginx, etc) CURL_JSON_DESC= Enable curl_json plugin (implies curl and json) CURL_XML_DESC= Enable ascent, bind, curl_xml plugins (implies curl and xml) DBI_DESC= Enable dbi plugin GCRYPT_DESC= Build with libgcrypt IPMI_DESC= Enable OpenIPMI plugin JSON_DESC= Enable JSON plugins KAFKA_DESC= Enable write_kafka plugin LOGSTASH_DESC= Enable log_logstash plugin (requires json) MEMCACHEC_DESC= Enable memcachec plugin MODBUS_DESC= Enable modbus plugin MONGODB_DESC= Enable write_mongodb plugin (BROKEN) MQTT_DESC= Enable MQTT broker metrics MYSQL_DESC= Enable mysql-based plugins NOTIFYDESKTOP_DESC= Enable desktop notifications NOTIFYEMAIL_DESC= Enable notifications via email NUTUPS_DESC= Enable nut (ups) plugin OLSRD_DESC= Enable olsrd plugin ONEWIRE_DESC= Eanble onewire plugin (via owfs) OPENLDAP_DESC= Enable OpenLDAP plugin PERL_DESC= Enable libperl plugin and binding PGSQL_DESC= Enable postgresql-based plugins PINBA_DESC= Enable pinba plugin (via protobuf-c) PING_DESC= Enable ping plugin PYTHON_DESC= Enable python-based plugins RABBITMQ_DESC= Enable rabbitmq-based plugins REDIS_DESC= Enable redis-based plugins RIEMANN_DESC= Enable write_riemann plugin (via riemann-c-client) ROUTEROS_DESC= Enable routeros plugin RRDTOOL_DESC= Enable rrdtool plugin (also rrdcached plugin) SIGROK_DESC= Enable sigrok plugin SNMP_DESC= Enable SNMP plugin STATSD_DESC= Enable statsd plugin TOKYOTYRANT_DESC= Enable tokyotyrant plugin TSDB_DESC= Enable write_tsdb plugin VARNISH_DESC= Enable varnish 4.x cache statistics VIRT_DESC= Enable libvirt plugin (requires XML) XML_DESC= Enable XML plugins XMMS_DESC= Enable xmms plugin ZOOKEEPER_DESC= Enable zookeeper plugin OPTIONS_SUB= yes USE_RC_SUBR= collectd collectdmon USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib # NOTE: Plugins without dependencies are defined further down. CONFIGURE_ARGS= --localstatedir=/var \ --disable-all-plugins \ --disable-static \ --without-amqp \ --disable-ceph \ --disable-cgroups \ --disable-fhcount \ --without-java \ --without-libaquaero5 \ --without-libganglia \ --without-libiptc \ --without-libjvm \ --without-liblvm2app \ --without-libkstat \ --without-libldap \ --without-libmnl \ --without-libnetlink \ --without-libnetapp \ --without-libowcapi \ --without-libperfstat \ --without-libsensors \ --without-lvm \ --without-mic \ --without-oracle \ --disable-turbostat CGI_RUN_DEPENDS= p5-URI>=0:net/p5-URI \ p5-CGI>=0:www/p5-CGI \ p5-Data-Dumper>=0:devel/p5-Data-Dumper \ p5-HTML-Parser>=0:www/p5-HTML-Parser CGI_IMPLIES= RRDTOOL CHRONY_CONFIGURE_ENABLE= chrony CURL_LIB_DEPENDS= libcurl.so:ftp/curl CURL_CONFIGURE_ENABLE= apache curl nginx write_http CURL_CONFIGURE_WITH= libcurl=${LOCALBASE} CURL_JSON_IMPLIES= CURL JSON CURL_JSON_CONFIGURE_ENABLE= curl_json CURL_XML_IMPLIES= CURL XML CURL_XML_CONFIGURE_ENABLE= ascent bind curl_xml DEBUG_CONFIGURE_ENABLE= debug DBI_LIB_DEPENDS= libdbi.so:databases/libdbi DBI_CONFIGURE_WITH= libdbi=${LOCALBASE} DBI_CONFIGURE_ENABLE= dbi DBI_CFLAGS= -Wno-deprecated-declarations GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt GCRYPT_CONFIGURE_WITH= -with-libgcrypt=${LOCALBASE} GCRYPT_LIBS= -lgcrypt IPMI_LIB_DEPENDS= libOpenIPMI.so:sysutils/openipmi IPMI_CONFIGURE_ENABLE= ipmi JSON_LIB_DEPENDS= libyajl.so:devel/yajl JSON_CONFIGURE_WITH= libyajl=${LOCALBASE} KAFKA_LIB_DEPENDS= librdkafka.so:net/librdkafka KAFKA_CONFIGURE_ENABLE= write_kafka LOGSTASH_CONFIGURE_ENABLE= log_logstash LOGSTASH_IMPLIES= JSON MEMCACHEC_LIB_DEPENDS= libmemcached.so:databases/libmemcached MEMCACHEC_CONFIGURE_ENABLE= memcachec MEMCACHEC_CONFIGURE_WITH= libmemcached=${LOCALBASE} MODBUS_LIB_DEPENDS= libmodbus.so:comms/libmodbus MODBUS_CONFIGURE_ENABLE= modbus MODBUS_CONFIGURE_WITH= libmodbus=use_pkgconfig MONGODB_LIB_DEPENDS= libmongoc-1.0.so:devel/mongo-c-driver MONGODB_LIB_DEPENDS+= libbson-1.0.so:devel/libbson MONGODB_CONFIGURE_ENABLE= write_mongodb MONGODB_CONFIGURE_WITH= libmongoc=${LOCALBASE} MONGODB_BROKEN= fails to configure with write_mongodb option MQTT_LIB_DEPENDS= libmosquitto.so:net/mosquitto MQTT_CONFIGURE_ENABLE= mqtt MQTT_CONFIGURE_WITH= libmosquitto=${LOCALBASE} MYSQL_USE= mysql=yes MYSQL_CONFIGURE_ENABLE= mysql MYSQL_CONFIGURE_WITH= libmysql=${LOCALBASE} NOTIFYDESKTOP_LIB_DEPENDS= libnotify.so:devel/libnotify NOTIFYDESKTOP_CONFIGURE_ENABLE= notify_desktop NOTIFYDESKTOP_CONFIGURE_WITH= libnotify=${LOCALBASE} NOTIFYEMAIL_LIB_DEPENDS= libesmtp.so:mail/libesmtp NOTIFYEMAIL_CONFIGURE_ENABLE= notify_email NOTIFYEMAIL_CONFIGURE_WITH= libesmtp=${LOCALBASE} NUTUPS_LIB_DEPENDS= libupsclient.so:sysutils/nut NUTUPS_CONFIGURE_ENABLE= nut NUTUPS_CONFIGURE_WITH= upsclient=${LOCALBASE} OLSRD_CONFIGURE_ENABLE= olsrd ONEWIRE_LIB_DEPENDS= libow.so:comms/owfs ONEWIRE_CONFIGURE_ENABLE= onewire ONEWIRE_CONFIGURE_WITH= libowcapi=${LOCALBASE} OPENLDAP_USE= openldap=yes OPENLDAP_CONFIGURE_ENABLE= openldap OPENLDAP_CONFIGURE_WITH= libldap=${LOCALBASE} PERL_USES= perl5 PERL_CONFIGURE_ENABLE= perl PERL_CONFIGURE_WITH= perl=${PERL} perl-bindings PGSQL_USES= pgsql PGSQL_CONFIGURE_ENABLE= postgresql PGSQL_CONFIGURE_WITH= postgresql=${LOCALBASE} libpq PINBA_LIB_DEPENDS= libprotobuf-c.so:devel/protobuf-c PINBA_CONFIGURE_ENABLE= pinba PING_LIB_DEPENDS= liboping.so:net/liboping PING_CONFIGURE_ENABLE= ping PING_CONFIGURE_WITH= liboping=${LOCALBASE} PYTHON_USES= python:2 PYTHON_CONFIGURE_ENABLE= python PYTHON_CONFIGURE_WITH= python=${PYTHON_CMD} RABBITMQ_LIB_DEPENDS= librabbitmq.so:net/rabbitmq-c RABBITMQ_CONFIGURE_ENABLE= rabbitmq RABBITMQ_CONFIGURE_WITH= librabbitmq=${LOCALBASE} REDIS_LIB_DEPENDS= libhiredis.so:databases/hiredis REDIS_CONFIGURE_ENABLE= redis write_redis REDIS_CONFIGURE_WITH= libhiredis=${LOCALBASE} RIEMANN_LIB_DEPENDS= libriemann-client.so:net-mgmt/riemann-c-client RIEMANN_CONFIGURE_ENABLE= write_riemann ROUTEROS_LIB_DEPENDS= librouteros.so:net/librouteros ROUTEROS_CONFIGURE_ENABLE= routeros ROUTEROS_CONFIGURE_WITH= librouteros=${LOCALBASE} RRDTOOL_LIB_DEPENDS= librrd.so:databases/rrdtool RRDTOOL_CONFIGURE_ENABLE= rrdcached rrdtool RRDTOOL_CONFIGURE_WITH= librrd=${LOCALBASE} SIGROK_USE= GNOME=glib20 SIGROK_CFLAGS= `pkg-config --cflags glib-2.0` SIGROK_LIB_DEPENDS= libsigrok.so:devel/libsigrok SIGROK_CONFIGURE_ENABLE= sigrok SIGROK_CONFIGURE_WITH= libsigrok SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp SNMP_CONFIGURE_ENABLE= snmp SNMP_CONFIGURE_WITH= libnetsnmp STATSD_CONFIGURE_ENABLE= statsd TOKYOTYRANT_LIB_DEPENDS= libtokyotyrant.so:databases/tokyotyrant TOKYOTYRANT_CONFIGURE_ENABLE= tokyotyrant TOKYOTYRANT_CONFIGURE_WITH= libtokyotyrant=${LOCALBASE} TSDB_CONFIGURE_ENABLE= write_tsdb VARNISH_LIB_DEPENDS= libvarnishapi.so:www/varnish4 VARNISH_CONFIGURE_ENABLE= varnish VARNISH_CONFIGURE_WITH= libvarnish=${LOCALBASE} VIRT_IMPLIES= XML VIRT_LIB_DEPENDS= libvirt.so:devel/libvirt VIRT_CONFIGURE_ENABLE= virt VIRT_CONFIGURE_WITH= virt=${LOCALBASE} XML_LIB_DEPENDS= libxml2.so:textproc/libxml2 XML_CONFIGURE_WITH= libxml2=${LOCALBASE} XMMS_CFLAGS= `xmms-config --cflags` XMMS_LIB_DEPENDS= libxmms.so:multimedia/xmms XMMS_CONFIGURE_ENABLE= xmms XMMS_CONFIGURE_WITH= libxmms=${LOCALBASE} ZOOKEEPER_LIB_DEPENDS= libzookeeper_mt.so:devel/libzookeeper ZOOKEEPER_CONFIGURE_ENABLE= zookeeper ZOOKEEPER_CONFIGURE_WITH= libzookeeper=${LOCALBASE} # NOTE: Plugins without external dependencies CONFIGURE_ARGS+=--enable-aggregation \ --enable-apcups \ --enable-contextswitch \ --enable-cpu \ --enable-csv \ --enable-df \ --enable-dns \ --enable-email \ --enable-exec \ --enable-filecount \ --enable-interface \ --enable-load \ --enable-logfile \ --enable-match_empty_counter \ --enable-match_hashed \ --enable-match_regex \ --enable-match_timediff \ --enable-match_value \ --enable-mbmon \ --enable-memcached \ --enable-memory \ --enable-network \ --enable-ntpd \ --enable-openvpn \ --enable-powerdns \ --enable-pf \ --enable-processes \ --enable-statsd \ --enable-swap \ --enable-syslog \ --enable-table \ --enable-tail \ --enable-tail_csv \ --enable-target_notification \ --enable-target_replace \ --enable-target_scale \ --enable-target_set \ --enable-target_v5upgrade \ --enable-tcpconns \ --enable-teamspeak2 \ --enable-ted \ --enable-threshold \ --enable-unixsock \ --enable-uptime \ --enable-users \ --enable-uuid \ --enable-write_graphite \ --enable-write_log \ --enable-zfs_arc \ .include .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 PLIST_SUB+= DISK="@comment " .else CONFIGURE_ARGS+=--enable-disk PLIST_SUB+= DISK="" .endif INSTALL_TARGET= install-strip SHEBANG_FILES= contrib/collection.cgi post-patch: @${REINPLACE_CMD} 's/-Werror//' \ ${WRKSRC}/configure.ac ${WRKSRC}/src/Makefile.am \ ${WRKSRC}/src/libcollectdclient/Makefile.am @${REINPLACE_CMD} \ -e 's;@prefix@/var/;/var/;' \ -e 's;/var/lib/;/var/db/;' \ -e 's;@localstatedir@/lib/;/var/db/;' \ ${WRKSRC}/src/collectd.conf.in \ ${WRKSRC}/src/collectd.conf.5 @${REINPLACE_CMD} \ -e 's;/etc/collection\.conf;${WWWDIR}/collection.conf;' \ ${WRKSRC}/contrib/collection.cgi @${REINPLACE_CMD} \ -e 's;/opt/collectd/var/lib;/var/db;' \ -e 's;/opt/collectd/lib;${PREFIX}/lib;' \ ${WRKSRC}/contrib/collection.conf post-install: ${MKDIR} ${STAGEDIR}/var/db/collectd post-install-CGI-on: ${MKDIR} ${STAGEDIR}${WWWDIR} ${INSTALL_SCRIPT} ${WRKSRC}/contrib/collection.cgi ${STAGEDIR}${WWWDIR}/ ${INSTALL_DATA} ${WRKSRC}/contrib/collection.conf \ ${STAGEDIR}${WWWDIR}/collection.conf.sample .include Index: head/net-mgmt/collectd5/distinfo =================================================================== --- head/net-mgmt/collectd5/distinfo (revision 430554) +++ head/net-mgmt/collectd5/distinfo (revision 430555) @@ -1,3 +1,3 @@ -TIMESTAMP = 1474290609 -SHA256 (collectd-5.6.0.tar.bz2) = f0ffbbd91fac3682bd324a74b9b4c9eabe781394b303b5cfd457c4cfbe748623 -SIZE (collectd-5.6.0.tar.bz2) = 1818470 +TIMESTAMP = 1483447838 +SHA256 (collectd-5.7.0.tar.bz2) = 25a05fbdc6baad571554342bbac6141928bf95a47fc60ee3b32e46d0c89ef2b2 +SIZE (collectd-5.7.0.tar.bz2) = 1861882 Index: head/net-mgmt/collectd5/files/patch-src__daemon__collectd.h =================================================================== --- head/net-mgmt/collectd5/files/patch-src__daemon__collectd.h (revision 430554) +++ head/net-mgmt/collectd5/files/patch-src__daemon__collectd.h (revision 430555) @@ -1,21 +1,21 @@ ---- src/daemon/collectd.h.orig 2016-09-11 08:10:25 UTC -+++ src/daemon/collectd.h -@@ -243,15 +243,15 @@ typedef int _Bool; +--- src/daemon/collectd.h.orig 2016-12-12 03:03:36.704279144 -0500 ++++ src/daemon/collectd.h 2017-01-03 07:53:41.101884000 -0500 +@@ -243,15 +243,15 @@ #endif #ifndef LOCALSTATEDIR --# define LOCALSTATEDIR PREFIX "/var" -+# define LOCALSTATEDIR "/var" +-#define LOCALSTATEDIR PREFIX "/var" ++#define LOCALSTATEDIR "/var" #endif #ifndef PKGLOCALSTATEDIR --# define PKGLOCALSTATEDIR PREFIX "/var/lib/" PACKAGE_NAME -+# define PKGLOCALSTATEDIR PREFIX "/var/db/" PACKAGE_NAME +-#define PKGLOCALSTATEDIR PREFIX "/var/lib/" PACKAGE_NAME ++#define PKGLOCALSTATEDIR "/var/db/" PACKAGE_NAME #endif #ifndef PIDFILE --# define PIDFILE PREFIX "/var/run/" PACKAGE_NAME ".pid" -+# define PIDFILE "/var/run/" PACKAGE_NAME ".pid" +-#define PIDFILE PREFIX "/var/run/" PACKAGE_NAME ".pid" ++#define PIDFILE "/var/run/" PACKAGE_NAME ".pid" #endif #ifndef PLUGINDIR Index: head/net-mgmt/collectd5/files/patch-src__dns.c =================================================================== --- head/net-mgmt/collectd5/files/patch-src__dns.c (revision 430554) +++ head/net-mgmt/collectd5/files/patch-src__dns.c (revision 430555) @@ -1,18 +1,18 @@ ---- src/dns.c.orig 2016-09-11 08:10:25 UTC -+++ src/dns.c -@@ -225,6 +225,15 @@ static int dns_run_pcap_loop (void) - pthread_sigmask (SIG_SETMASK, &sigmask, NULL); - } +--- src/dns.c.orig 2016-12-12 03:03:36.708279115 -0500 ++++ src/dns.c 2017-01-03 08:10:33.137711000 -0500 +@@ -198,6 +198,15 @@ + pthread_sigmask(SIG_SETMASK, &sigmask, NULL); + } + /* Check for pcap_device, if needed */ +#ifdef __sparc64__ -+ if (pcap_device == NULL) -+ { -+ ERROR ("dns plugin: Interface required"); -+ return (NULL); -+ } ++ if (pcap_device == NULL) ++ { ++ ERROR ("dns plugin: Interface required"); ++ return (NULL); ++ } +#endif + - /* Passing `pcap_device == NULL' is okay and the same as passign "any" */ - DEBUG ("dns plugin: Creating PCAP object.."); - pcap_obj = pcap_open_live ((pcap_device != NULL) ? pcap_device : "any", + /* Passing `pcap_device == NULL' is okay and the same as passign "any" */ + DEBUG("dns plugin: Creating PCAP object.."); + pcap_obj = pcap_open_live((pcap_device != NULL) ? pcap_device : "any", Index: head/net-mgmt/collectd5/files/patch-src__modbus.c =================================================================== --- head/net-mgmt/collectd5/files/patch-src__modbus.c (revision 430554) +++ head/net-mgmt/collectd5/files/patch-src__modbus.c (revision 430555) @@ -1,12 +1,12 @@ ---- src/modbus.c.orig 2016-09-11 08:10:25 UTC -+++ src/modbus.c -@@ -25,6 +25,9 @@ - #include "common.h" +--- src/modbus.c.orig 2016-12-12 03:03:36.712279086 -0500 ++++ src/modbus.c 2017-01-03 08:12:39.318883000 -0500 +@@ -26,6 +26,9 @@ + #include "configfile.h" #include "plugin.h" +/* FreeBSD needs this */ +#include + - #include - #include + #include + #include Index: head/net-mgmt/collectd5/files/patch-src_zfs__arc.c =================================================================== --- head/net-mgmt/collectd5/files/patch-src_zfs__arc.c (revision 430554) +++ head/net-mgmt/collectd5/files/patch-src_zfs__arc.c (revision 430555) @@ -1,10 +1,11 @@ ---- src/zfs_arc.c.orig 2016-09-11 08:10:25 UTC -+++ src/zfs_arc.c -@@ -314,7 +314,6 @@ static int za_read (void) - za_read_derive (ksp, "demand_data_misses", "cache_result", "demand_data-miss"); - za_read_derive (ksp, "demand_metadata_misses", "cache_result", "demand_metadata-miss"); - za_read_derive (ksp, "prefetch_data_misses", "cache_result", "prefetch_data-miss"); -- za_read_derive (ksp, "prefetch_metadata_misses", "cache_result", "prefetch_metadata-miss"); - za_read_derive (ksp, "mfu_hits", "cache_result", "mfu-hit"); - za_read_derive (ksp, "mfu_ghost_hits", "cache_result", "mfu_ghost-hit"); - za_read_derive (ksp, "mru_hits", "cache_result", "mru-hit"); +--- src/zfs_arc.c.orig 2016-12-12 03:03:36.728278972 -0500 ++++ src/zfs_arc.c 2017-01-03 08:15:23.751003000 -0500 +@@ -286,8 +286,6 @@ + za_read_derive(ksp, "prefetch_metadata_hits", "cache_result", + "prefetch_metadata-hit"); + za_read_derive(ksp, "demand_data_misses", "cache_result", "demand_data-miss"); +- za_read_derive(ksp, "demand_metadata_misses", "cache_result", +- "demand_metadata-miss"); + za_read_derive(ksp, "prefetch_data_misses", "cache_result", + "prefetch_data-miss"); + za_read_derive(ksp, "prefetch_metadata_misses", "cache_result", Index: head/net-mgmt/collectd5/files/patch-version-gen.sh =================================================================== --- head/net-mgmt/collectd5/files/patch-version-gen.sh (revision 430554) +++ head/net-mgmt/collectd5/files/patch-version-gen.sh (revision 430555) @@ -1,17 +1,17 @@ ---- version-gen.sh.orig 2016-09-11 08:10:25 UTC -+++ version-gen.sh +--- version-gen.sh.orig 2017-01-03 08:18:24.963614000 -0500 ++++ version-gen.sh 2017-01-03 08:19:07.743161000 -0500 @@ -1,13 +1,2 @@ #!/bin/sh - --DEFAULT_VERSION="5.6.0.git" +-DEFAULT_VERSION="5.7.0.git" - -if [ -d .git ]; then - VERSION="`git describe --dirty=+ --abbrev=7 2> /dev/null | grep collectd | sed -e 's/^collectd-//' -e 's/-/./g'`" -fi - -if test -z "$VERSION"; then - VERSION="$DEFAULT_VERSION" -fi - -printf "%s" "$VERSION" -+echo -n '5.6.0.git' ++echo -n '5.7.0.git'