diff -ruN collectd5/Makefile collectd5.new/Makefile --- collectd5/Makefile 2015-06-08 18:43:01.000000000 +0200 +++ collectd5.new/Makefile 2015-07-14 12:28:32.860577000 +0200 @@ -2,10 +2,9 @@ # $FreeBSD: head/net-mgmt/collectd5/Makefile 388844 2015-06-08 16:43:01Z brd $ PORTNAME= collectd -PORTVERSION= 5.4.2 -PORTREVISION= 3 +PORTVERSION= 5.5.0 CATEGORIES= net-mgmt -MASTER_SITES= http://collectd.org/files/ +MASTER_SITES= https://collectd.org/files/ PKGNAMESUFFIX= 5 MAINTAINER= ports@bsdserwis.com @@ -24,16 +23,17 @@ OPTIONS_DEFINE= CGI DEBUG GCRYPT VIRT OPTIONS_GROUP= INPUT OUTPUT OPTIONS_GROUP_OUTPUT= RRDTOOL NOTIFYEMAIL NOTIFYDESKTOP RIEMANN -OPTIONS_GROUP_INPUT= CURL DBI JSON MEMCACHEC MODBUS MONGODB MYSQL \ - NUTUPS PERL PGSQL PING PYTHON RABBITMQ REDIS \ - ROUTEROS SIGROK SNMP STATGRAB TOKYOTYRANT VARNISH \ - XML XMMS +OPTIONS_GROUP_INPUT= CURL IPMI DBI JSON MEMCACHEC MODBUS MONGODB MYSQL \ + NUTUPS OLSRD ONEWIRE OPENLDAP PERL PGSQL PINBA PING \ + PYTHON RABBITMQ REDIS ROUTEROS SIGROK SNMP STATGRAB \ + STATSD TOKYOTYRANT VARNISH XML XMMS ZOOKEEPER CGI_DESC= Install collection.cgi (requires rrdtool) CURL_DESC= Enable curl-based plugins (apache, nginx, etc) DEBUG_DESC= Enable debugging DBI_DESC= Enable dbi plugin GCRYPT_DESC= Build with libgcrypt +IPMI_DESC= Enable OpenIPMI plugin JSON_DESC= Enable JSON plugins MEMCACHEC_DESC= Enable memcachec plugin MODBUS_DESC= Enable modbus plugin @@ -42,8 +42,12 @@ NOTIFYEMAIL_DESC= Enable notifications via email NOTIFYDESKTOP_DESC= Enable desktop notifications NUTUPS_DESC= Enable nut (ups) plugin +OLRSD_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 @@ -54,11 +58,13 @@ SIGROK_DESC= Enable sigrok plugin SNMP_DESC= Enable SNMP plugin STATGRAB_DESC= Enable statgrab-based plugins (disk, interface, etc) +STATSD_DESC= Enable statsd plugin TOKYOTYRANT_DESC= Enable tokyotyrant plugin -VARNISH_DESC= Enable varnish 3.x cache statistics +VARNISH_DESC= Enable varnish 3.x cache statistics (does not build with varnish 4.x) VIRT_DESC= Enable libvirt plugin (requires XML) XML_DESC= Enable XML plugins XMMS_DESC= Enable xmms plugin +ZOOKEEPER_DESC= Enable zookeeper plugin USE_RC_SUBR= collectd collectdmon @@ -81,17 +87,22 @@ --without-libganglia \ --without-libiptc \ --without-libjvm \ + --without-liblvm2app \ --without-libkstat \ + --without-libldap \ + --without-libmnl \ --without-libmodbus \ --without-libnetlink \ --without-libnetapp \ - --without-libopenipmi \ --without-libowcapi \ --without-libperfstat \ + --without-librdkafka \ --without-libsensors \ + --without-libvarnish \ --without-lvm \ --without-mic \ - --without-oracle + --without-oracle \ + --disable-turbostat # NOTE: Plugins without external dependencies CONFIGURE_ARGS+= \ @@ -104,9 +115,11 @@ --enable-dns \ --enable-email \ --enable-exec \ + --enable-fhcount \ --enable-filecount \ --enable-load \ --enable-logfile \ + --enable-log_logstash \ --enable-match_empty_counter \ --enable-match_hashed \ --enable-match_regex \ @@ -126,6 +139,7 @@ --enable-syslog \ --enable-table \ --enable-tail \ + --enable-tail_csv \ --enable-target_notification \ --enable-target_replace \ --enable-target_scale \ @@ -139,7 +153,8 @@ --enable-uptime \ --enable-uuid \ --enable-write_graphite \ - --enable-zfs_arc + --enable-write_log \ + --enable-zfs_arc \ .if ${PORT_OPTIONS:MCGI} RUN_DEPENDS+= p5-URI>=0:${PORTSDIR}/net/p5-URI \ @@ -217,6 +232,15 @@ CONFIGURE_ARGS+=--without-libgcrypt .endif +.if ${PORT_OPTIONS:MIPMI} +LIB_DEPENDS+= libOpenIPMI.so:${PORTSDIR}/sysutils/openipmi +CONFIGURE_ARGS+=--enable-ipmi +PLIST_SUB+= IPMI="" +.else +CONFIGURE_ARGS+=--disable-ipmi +PLIST_SUB+= IPMI="@comment " +.endif + .if ${PORT_OPTIONS:MJSON} LIB_DEPENDS+= libyajl.so:${PORTSDIR}/devel/yajl CONFIGURE_ARGS+=--with-libyajl=${LOCALBASE} @@ -235,7 +259,7 @@ .if ${PORT_OPTIONS:MMODBUS} LIB_DEPENDS+= libmodbus.so:${PORTSDIR}/comms/libmodbus -CONFIGURE_ARGS+=--enable-modbus +CONFIGURE_ARGS+=--with-libmodbus=${LOCALBASE} --enable-modbus PLIST_SUB+= MODBUS="" .else PLIST_SUB+= MODBUS="@comment " @@ -290,6 +314,32 @@ PLIST_SUB+= NUTUPS="@comment " .endif +.if ${PORT_OPTIONS:MOLSRD} +CONFIGURE_ARGS+=--enable-olsrd +PLIST_SUB+= OLSRD="" +.else +CONFIGURE_ARGS+=--enable-olsrd +PLIST_SUB+= OLSRD="@comment " +.endif + +.if ${PORT_OPTIONS:MONEWIRE} +LIB_DEPENDS+= libow.so:${PORTSDIR}/comms/owfs +CONFIGURE_ARGS+=--with-libowcapi=${LOCALBASE} --enable-onewire +PLIST_SUB+= ONEWIRE="" +.else +CONFIGURE_ARGS+=--disable-onewire +PLIST_SUB+= ONEWIRE="@comment " +.endif + +.if ${PORT_OPTIONS:MOPENLDAP} +USE_OPENLDAP= yes +CONFIGURE_ARGS+=--with-libldap=${LOCALBASE} --enable-openldap +PLIST_SUB+= OPENLDAP="" +.else +CONFIGURE_ARGS+=--disable-openldap +PLIST_SUB+= OPENLDAP="@comment " +.endif + .if ${PORT_OPTIONS:MPERL} USES+= perl5 CONFIGURE_ARGS+=--with-perl=${PERL} --with-perl-bindings --enable-perl @@ -308,6 +358,15 @@ PLIST_SUB+= PGSQL="@comment " .endif +.if ${PORT_OPTIONS:MPINBA} +LIB_DEPENDS+= libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c +CONFIGURE_ARGS+=--enable-pinba +PLIST_SUB+= PINBA="" +.else +CONFIGURE_ARGS+=--disable-pinba +PLIST_SUB+= PINBA="@comment " +.endif + .if ${PORT_OPTIONS:MPING} LIB_DEPENDS+= liboping.so:${PORTSDIR}/net/liboping CONFIGURE_ARGS+=--with-liboping=${LOCALBASE} --enable-ping @@ -338,8 +397,8 @@ .endif .if ${PORT_OPTIONS:MREDIS} -LIB_DEPENDS+= libcredis.so:${PORTSDIR}/databases/credis -CONFIGURE_ARGS+=--with-libcredis=${LOCALBASE} \ +LIB_DEPENDS+= libhiredis.so:${PORTSDIR}/databases/hiredis +CONFIGURE_ARGS+=--with-libhiredis=${LOCALBASE} \ --enable-redis \ --enable-write_redis PLIST_SUB+= REDIS="" @@ -423,6 +482,14 @@ PLIST_SUB+= SNMP="@comment " .endif +.if ${PORT_OPTIONS:MSTATSD} +CONFIGURE_ARGS+=--enable-statsd +PLIST_SUB+= STATSD="" +.else +CONFIGURE_ARGS+=--disable-statsd +PLIST_SUB+= STATSD="@comment " +.endif + .if ${PORT_OPTIONS:MTOKYOTYRANT} LIB_DEPENDS+= libtokyotyrant.so:${PORTSDIR}/databases/tokyotyrant CONFIGURE_ARGS+=--with-libtokyotyrant=${LOCALBASE} --enable-tokyotyrant @@ -433,7 +500,8 @@ .endif .if ${PORT_OPTIONS:MVARNISH} -LIB_DEPENDS+= libvarnishapi.so:${PORTSDIR}/www/varnish +BROKEN= "Only libvarnish 3.x support. Does not build with libvarnish4" +LIB_DEPENDS+= libvarnishapi.so:${PORTSDIR}/www/varnish4 CONFIGURE_ARGS+=--with-libvarnish=${LOCALBASE} --enable-varnish PLIST_SUB+= VARNISH="" .else @@ -446,10 +514,10 @@ IGNORE= VIRT requires XML. Either select XML or deselect VIRT. .endif LIB_DEPENDS+= libvirt.so:${PORTSDIR}/devel/libvirt -CONFIGURE_ARGS+=--enable-libvirt +CONFIGURE_ARGS+=--enable-virt PLIST_SUB+= VIRT="" .else -CONFIGURE_ARGS+=--without-libvirt --disable-libvirt +CONFIGURE_ARGS+=--without-virt --disable-virt PLIST_SUB+= VIRT="@comment " .endif @@ -468,6 +536,15 @@ PLIST_SUB+= XMMS="@comment " .endif +.if ${PORT_OPTIONS:MZOOKEEPER} +LIB_DEPENDS+= libzookeeper_mt.so:${PORTSDIR}/devel/libzookeeper +CONFIGURE_ARGS+=--with-libzookeeper=${LOCALBASE} --enable-zookeeper +PLIST_SUB+= ZOOKEEPER="" +.else +CONFIGURE_ARGS+=--without-libzookeeper --disable-zookeeper +PLIST_SUB+= ZOOKEEPER="@comment " +.endif + INSTALL_TARGET=install-strip SHEBANG_FILES= contrib/collection.cgi diff -ruN collectd5/distinfo collectd5.new/distinfo --- collectd5/distinfo 2015-03-03 17:23:06.000000000 +0100 +++ collectd5.new/distinfo 2015-06-19 12:45:31.436370000 +0200 @@ -1,2 +1,2 @@ -SHA256 (collectd-5.4.2.tar.bz2) = 9789e900c138b5dbe907d3d744143f12b1e30022276cb1d8c65bbabaf0c4e393 -SIZE (collectd-5.4.2.tar.bz2) = 1633610 +SHA256 (collectd-5.5.0.tar.bz2) = 847684cf5c10de1dc34145078af3fcf6e0d168ba98c14f1343b1062a4b569e88 +SIZE (collectd-5.5.0.tar.bz2) = 1824495 diff -ruN collectd5/files/patch-src-curl_xml.c collectd5.new/files/patch-src-curl_xml.c --- collectd5/files/patch-src-curl_xml.c 2015-03-28 21:29:29.000000000 +0100 +++ collectd5.new/files/patch-src-curl_xml.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- src/curl_xml.c.orig 2015-03-28 23:25:34.546602000 +0300 -+++ src/curl_xml.c 2015-03-28 23:25:51.513304000 +0300 -@@ -385,7 +385,7 @@ static int cx_handle_instance_xpath (xml - /* If the base xpath returns more than one block, the result is assumed to be - * a table. The `Instance' option is not optional in this case. Check for the - * condition and inform the user. */ -- if (is_table) -+ if (is_table && (vl->type_instance == NULL)) - { - WARNING ("curl_xml plugin: " - "Base-XPath %s is a table (more than one result was returned), " diff -ruN collectd5/files/patch-src__Makefile.am collectd5.new/files/patch-src__Makefile.am --- collectd5/files/patch-src__Makefile.am 2013-09-13 03:32:38.000000000 +0200 +++ collectd5.new/files/patch-src__Makefile.am 2015-07-14 10:16:35.000000000 +0200 @@ -1,7 +1,7 @@ ---- src/Makefile.am.orig 2013-08-18 04:24:25.061973000 -0600 -+++ src/Makefile.am 2013-08-20 21:34:14.000000000 -0600 -@@ -10,7 +10,7 @@ - AM_CPPFLAGS = -DPREFIX='"${prefix}"' +--- src/Makefile.am.orig 2015-05-26 21:38:14.116865000 +0200 ++++ src/Makefile.am 2015-07-14 10:15:28.397127883 +0200 +@@ -14,7 +14,7 @@ + AM_CPPFLAGS += -DPREFIX='"${prefix}"' AM_CPPFLAGS += -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' AM_CPPFLAGS += -DLOCALSTATEDIR='"${localstatedir}"' -AM_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"' @@ -9,34 +9,25 @@ if BUILD_FEATURE_DAEMON AM_CPPFLAGS += -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"' endif -@@ -64,7 +64,7 @@ - collectd_LDADD += -lpthread - endif - if BUILD_WITH_LIBKSTAT --collectd_LDADD += -lkstat -+collectd_LDADD += $(BUILD_WITH_LIBKSTAT_LIBS) - endif - if BUILD_WITH_LIBDEVINFO - collectd_LDADD += -ldevinfo -@@ -275,7 +275,7 @@ - cpu_la_LDFLAGS = -module -avoid-version - cpu_la_LIBADD = +@@ -218,7 +218,7 @@ + cpu_la_LDFLAGS = $(PLUGIN_LDFLAGS) + cpu_la_LIBADD = if BUILD_WITH_LIBKSTAT -cpu_la_LIBADD += -lkstat +cpu_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS) endif if BUILD_WITH_LIBDEVINFO cpu_la_LIBADD += -ldevinfo -@@ -373,7 +373,7 @@ - disk_la_LDFLAGS = -module -avoid-version - disk_la_LIBADD = +@@ -303,7 +303,7 @@ + disk_la_LDFLAGS = $(PLUGIN_LDFLAGS) + disk_la_LIBADD = if BUILD_WITH_LIBKSTAT -disk_la_LIBADD += -lkstat +disk_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS) endif if BUILD_WITH_LIBDEVINFO disk_la_LIBADD += -ldevinfo -@@ -480,7 +480,7 @@ +@@ -408,7 +408,7 @@ interface_la_LIBADD += $(BUILD_WITH_LIBSTATGRAB_LDFLAGS) else if BUILD_WITH_LIBKSTAT @@ -45,44 +36,35 @@ endif if BUILD_WITH_LIBDEVINFO interface_la_LIBADD += -ldevinfo -@@ -694,7 +694,7 @@ - collectd_LDADD += "-dlopen" memory.la - collectd_DEPENDENCIES += memory.la +@@ -591,7 +591,7 @@ + memory_la_LDFLAGS = $(PLUGIN_LDFLAGS) + memory_la_LIBADD = if BUILD_WITH_LIBKSTAT -memory_la_LIBADD += -lkstat +memory_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS) endif if BUILD_WITH_LIBDEVINFO memory_la_LIBADD += -ldevinfo -@@ -823,7 +823,7 @@ - pkglib_LTLIBRARIES += notify_email.la - notify_email_la_SOURCES = notify_email.c - notify_email_la_LDFLAGS = -module -avoid-version --notify_email_la_LIBADD = -lesmtp -lssl -lcrypto -lpthread -ldl -+notify_email_la_LIBADD = -lesmtp -lssl -lcrypto -lpthread - collectd_LDADD += "-dlopen" notify_email.la - collectd_DEPENDENCIES += notify_email.la - endif -@@ -1108,7 +1108,7 @@ - collectd_LDADD += "-dlopen" swap.la - collectd_DEPENDENCIES += swap.la +@@ -964,7 +964,7 @@ + swap_la_LDFLAGS = $(PLUGIN_LDFLAGS) + swap_la_LIBADD = if BUILD_WITH_LIBKSTAT -swap_la_LIBADD += -lkstat +swap_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS) endif if BUILD_WITH_LIBDEVINFO swap_la_LIBADD += -ldevinfo -@@ -1162,7 +1162,7 @@ +@@ -1010,7 +1010,7 @@ pkglib_LTLIBRARIES += tape.la tape_la_SOURCES = tape.c - tape_la_LDFLAGS = -module -avoid-version + tape_la_LDFLAGS = $(PLUGIN_LDFLAGS) -tape_la_LIBADD = -lkstat -ldevinfo +tape_la_LIBADD = $(BUILD_WITH_LIBKSTAT_LIBS) -ldevinfo - collectd_LDADD += "-dlopen" tape.la - collectd_DEPENDENCIES += tape.la endif -@@ -1285,7 +1285,7 @@ - uptime_la_LDFLAGS = -module -avoid-version + + if BUILD_PLUGIN_TARGET_NOTIFICATION +@@ -1116,7 +1116,7 @@ + uptime_la_LDFLAGS = $(PLUGIN_LDFLAGS) uptime_la_LIBADD = if BUILD_WITH_LIBKSTAT -uptime_la_LIBADD += -lkstat @@ -90,7 +72,16 @@ endif if BUILD_WITH_PERFSTAT uptime_la_LIBADD += -lperfstat -@@ -1519,12 +1519,7 @@ +@@ -1275,7 +1275,7 @@ + # zfs_arc requires no library on linux + else + # solaris +-zfs_arc_la_LIBADD = -lkstat ++zfs_arc_la_LIBADD = $(BUILD_WITH_LIBKSTAT_LIBS) + endif + endif + endif +@@ -1364,12 +1364,7 @@ install-exec-hook: $(mkinstalldirs) $(DESTDIR)$(sysconfdir) diff -ruN collectd5/files/patch-src__collectd.c collectd5.new/files/patch-src__collectd.c --- collectd5/files/patch-src__collectd.c 2014-05-13 00:06:36.000000000 +0200 +++ collectd5.new/files/patch-src__collectd.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- ./src/collectd.c.orig 2014-01-26 08:09:14.840391000 +0000 -+++ ./src/collectd.c 2014-05-10 23:35:17.226683756 +0100 -@@ -288,7 +288,7 @@ - #endif - - #if HAVE_LIBSTATGRAB -- if (sg_init ()) -+ if (sg_init (0)) - { - ERROR ("sg_init: %s", sg_str_error (sg_get_error ())); - return (-1); diff -ruN collectd5/files/patch-src__collectd.h collectd5.new/files/patch-src__collectd.h --- collectd5/files/patch-src__collectd.h 2013-06-20 05:02:07.000000000 +0200 +++ collectd5.new/files/patch-src__collectd.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,21 +0,0 @@ ---- ./src/collectd.h.orig 2013-01-27 13:47:18.246255000 +0000 -+++ ./src/collectd.h 2013-05-21 21:00:55.000000000 +0000 -@@ -235,15 +235,15 @@ - #endif - - #ifndef LOCALSTATEDIR --#define LOCALSTATEDIR PREFIX "/var" -+#define LOCALSTATEDIR "/var" - #endif - - #ifndef PKGLOCALSTATEDIR --#define PKGLOCALSTATEDIR PREFIX "/var/lib/" PACKAGE_NAME -+#define PKGLOCALSTATEDIR PREFIX "/var/db/" PACKAGE_NAME - #endif - - #ifndef PIDFILE --#define PIDFILE PREFIX "/var/run/" PACKAGE_NAME ".pid" -+#define PIDFILE "/var/run/" PACKAGE_NAME ".pid" - #endif - - #ifndef PLUGINDIR diff -ruN collectd5/files/patch-src__daemon__Makefile.am collectd5.new/files/patch-src__daemon__Makefile.am --- collectd5/files/patch-src__daemon__Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ collectd5.new/files/patch-src__daemon__Makefile.am 2015-07-14 12:09:52.000000000 +0200 @@ -0,0 +1,11 @@ +--- src/daemon/Makefile.am.orig 2015-05-26 21:38:31.425174000 +0200 ++++ src/daemon/Makefile.am 2015-07-14 12:08:36.825660450 +0200 +@@ -49,7 +49,7 @@ + collectd_CFLAGS = $(AM_CFLAGS) + collectd_LDFLAGS = -export-dynamic + collectd_LDADD = libavltree.la libcommon.la libheap.la -lm +-collectd_DEPENDENCIES = ++collectd_DEPENDENCIES = libavltree.la libcommon.la libheap.la + + # Link to these libraries.. + if BUILD_WITH_LIBRT diff -ruN collectd5/files/patch-src__daemon__collectd.h collectd5.new/files/patch-src__daemon__collectd.h --- collectd5/files/patch-src__daemon__collectd.h 1970-01-01 01:00:00.000000000 +0100 +++ collectd5.new/files/patch-src__daemon__collectd.h 2015-07-14 12:33:06.000000000 +0200 @@ -0,0 +1,21 @@ +--- src/daemon/collectd.h.orig 2015-05-22 12:04:36.951771000 +0200 ++++ src/daemon/collectd.h 2015-07-14 12:31:41.940566159 +0200 +@@ -240,15 +240,15 @@ + #endif + + #ifndef LOCALSTATEDIR +-#define LOCALSTATEDIR PREFIX "/var" ++#define LOCALSTATEDIR "/var" + #endif + + #ifndef PKGLOCALSTATEDIR +-#define PKGLOCALSTATEDIR PREFIX "/var/lib/" PACKAGE_NAME ++#define PKGLOCALSTATEDIR PREFIX "/var/db/" PACKAGE_NAME + #endif + + #ifndef PIDFILE +-#define PIDFILE PREFIX "/var/run/" PACKAGE_NAME ".pid" ++#define PIDFILE "/var/run/" PACKAGE_NAME ".pid" + #endif + + #ifndef PLUGINDIR diff -ruN collectd5/files/patch-src__disk.c collectd5.new/files/patch-src__disk.c --- collectd5/files/patch-src__disk.c 2014-05-13 00:06:36.000000000 +0200 +++ collectd5.new/files/patch-src__disk.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ ---- ./src/disk.c.orig 2014-01-26 08:09:14.856391000 +0000 -+++ ./src/disk.c 2014-05-10 23:35:17.232681397 +0100 -@@ -732,7 +732,8 @@ - - #elif defined(HAVE_LIBSTATGRAB) - sg_disk_io_stats *ds; -- int disks, counter; -+ size_t disks; -+ int counter; - char name[DATA_MAX_NAME_LEN]; - - if ((ds = sg_get_disk_io_stats(&disks)) == NULL) diff -ruN collectd5/files/patch-src__modbus.c collectd5.new/files/patch-src__modbus.c --- collectd5/files/patch-src__modbus.c 1970-01-01 01:00:00.000000000 +0100 +++ collectd5.new/files/patch-src__modbus.c 2013-05-15 13:38:21.000000000 +0200 @@ -0,0 +1,12 @@ +--- src/modbus.c.orig 2013-01-27 17:47:18.246255000 +0400 ++++ src/modbus.c 2013-05-14 18:40:05.000000000 +0400 +@@ -25,6 +25,9 @@ + #include "plugin.h" + #include "configfile.h" + ++/* FreeBSD needs this */ ++#include ++ + #include + + #include diff -ruN collectd5/files/patch-src__users.c collectd5.new/files/patch-src__users.c --- collectd5/files/patch-src__users.c 2014-07-05 18:11:38.000000000 +0200 +++ collectd5.new/files/patch-src__users.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ ---- ./src/users.c.orig 2014-06-02 22:12:33.650261000 -0700 -+++ ./src/users.c 2014-06-11 00:10:39.000000000 -0700 -@@ -101,12 +101,13 @@ - - #elif HAVE_LIBSTATGRAB - sg_user_stats *us; -+ size_t num_entries; - -- us = sg_get_user_stats (); -+ us = sg_get_user_stats (&num_entries); - if (us == NULL) - return (-1); - -- users_submit ((gauge_t) us->num_entries); -+ users_submit ((gauge_t) num_entries); - /* #endif HAVE_LIBSTATGRAB */ - - #else diff -ruN collectd5/files/patch-src_modbus.c collectd5.new/files/patch-src_modbus.c --- collectd5/files/patch-src_modbus.c 2013-05-15 13:38:21.000000000 +0200 +++ collectd5.new/files/patch-src_modbus.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ ---- src/modbus.c.orig 2013-01-27 17:47:18.246255000 +0400 -+++ src/modbus.c 2013-05-14 18:40:05.000000000 +0400 -@@ -25,6 +25,9 @@ - #include "plugin.h" - #include "configfile.h" - -+/* FreeBSD needs this */ -+#include -+ - #include - - #include diff -ruN collectd5/files/patch-version-gen.sh collectd5.new/files/patch-version-gen.sh --- collectd5/files/patch-version-gen.sh 2015-03-03 17:23:06.000000000 +0100 +++ collectd5.new/files/patch-version-gen.sh 2015-07-14 10:28:02.000000000 +0200 @@ -1,18 +1,17 @@ ---- version-gen.sh.orig 2015-03-02 20:20:43 UTC -+++ version-gen.sh +--- version-gen.sh.orig 2015-05-26 22:23:28.891814000 +0200 ++++ version-gen.sh 2015-07-14 10:27:43.464077709 +0200 @@ -1,13 +1,3 @@ --#!/usr/bin/env bash -- --DEFAULT_VERSION="5.4.2.git" + #!/bin/sh + +-DEFAULT_VERSION="5.5.0.git" - --VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`" +-VERSION="`git describe 2> /dev/null | grep collectd | sed -e 's/^collectd-//'`" - -if test -z "$VERSION"; then - VERSION="$DEFAULT_VERSION" -fi - -VERSION="`echo \"$VERSION\" | sed -e 's/-/./g'`" -+#!/bin/sh - --echo -n "$VERSION" -+echo -n "5.4.2.git" +- +-printf "%s" "$VERSION" ++echo -n "5.5.0.git" diff -ruN collectd5/pkg-descr collectd5.new/pkg-descr --- collectd5/pkg-descr 2014-01-22 16:44:51.000000000 +0100 +++ collectd5.new/pkg-descr 2015-06-19 12:49:59.466352000 +0200 @@ -3,4 +3,4 @@ The daemon is very fast and allows for frequent polling of values, with support for polling as frequent as every 10 seconds. -WWW: http://www.collectd.org/ +WWW: https://www.collectd.org/ diff -ruN collectd5/pkg-plist collectd5.new/pkg-plist --- collectd5/pkg-plist 2015-03-28 21:26:11.000000000 +0100 +++ collectd5.new/pkg-plist 2015-07-14 13:34:01.509307000 +0200 @@ -10,6 +10,9 @@ include/collectd/lcc_features.h include/collectd/network.h include/collectd/network_buffer.h +lib/libcollectdclient.so +lib/libcollectdclient.so.1 +lib/libcollectdclient.so.1.0.0 lib/collectd/aggregation.so %%CURL%%lib/collectd/apache.so lib/collectd/apcups.so @@ -27,9 +30,13 @@ lib/collectd/dns.so lib/collectd/email.so lib/collectd/exec.so +lib/collectd/fhcount.so lib/collectd/filecount.so %%STATGRAB%%lib/collectd/interface.so +%%IPMI%%lib/collectd/ipmi.so +@dir /var/lib/collectd lib/collectd/load.so +lib/collectd/log_logstash.so lib/collectd/logfile.so lib/collectd/match_empty_counter.so lib/collectd/match_hashed.so @@ -40,21 +47,24 @@ %%MEMCACHEC%%lib/collectd/memcachec.so lib/collectd/memcached.so lib/collectd/memory.so +%%MODBUS%%lib/collectd/modbus.so %%MYSQL%%lib/collectd/mysql.so lib/collectd/network.so %%CURL%%lib/collectd/nginx.so -%%NOTIFYEMAIL%%lib/collectd/notify_email.so %%NOTIFYDESKTOP%%lib/collectd/notify_desktop.so +%%NOTIFYEMAIL%%lib/collectd/notify_email.so lib/collectd/ntpd.so %%NUTUPS%%lib/collectd/nut.so +%%OLSRD%%lib/collectd/olsrd.so +%%ONEWIRE%%lib/collectd/onewire.so +%%OPENLDAP%%lib/collectd/openldap.so lib/collectd/openvpn.so %%PERL%%lib/collectd/perl.so -%%PERL%%%%PERL5_MAN3%%/Collectd::Unixsock.3.gz -%%PERL%%%%SITE_PERL%%/Collectd/Plugins/OpenVZ.pm +lib/collectd/pf.so +%%PINBA%%lib/collectd/pinba.so %%PING%%lib/collectd/ping.so %%PGSQL%%lib/collectd/postgresql.so lib/collectd/powerdns.so -lib/collectd/pf.so lib/collectd/processes.so %%PYTHON%%lib/collectd/python.so %%REDIS%%lib/collectd/redis.so @@ -63,11 +73,12 @@ %%RRDTOOL%%lib/collectd/rrdtool.so %%SIGROK%%lib/collectd/sigrok.so %%SNMP%%lib/collectd/snmp.so -lib/collectd/statsd.so +%%STATSD%%lib/collectd/statsd.so lib/collectd/swap.so lib/collectd/syslog.so lib/collectd/table.so lib/collectd/tail.so +lib/collectd/tail_csv.so lib/collectd/target_notification.so lib/collectd/target_replace.so lib/collectd/target_scale.so @@ -83,20 +94,22 @@ %%USERS%%lib/collectd/users.so lib/collectd/uuid.so %%VARNISH%%lib/collectd/varnish.so -%%VIRT%%lib/collectd/libvirt.so +%%VARNISH%%lib/collectd/varnish.so +%%VIRT%%lib/collectd/virt.so lib/collectd/write_graphite.so %%CURL%%lib/collectd/write_http.so +lib/collectd/write_log.so %%MONGODB%%lib/collectd/write_mongodb.so %%REDIS%%lib/collectd/write_redis.so %%RIEMANN%%lib/collectd/write_riemann.so %%XMMS%%lib/collectd/xmms.so lib/collectd/zfs_arc.so -lib/libcollectdclient.so -lib/libcollectdclient.so.1 -lib/libcollectdclient.so.1.0.0 +%%ZOOKEEPER%%lib/collectd/zookeeper.so libdata/pkgconfig/libcollectdclient.pc %%DATADIR%%/postgresql_default.conf %%DATADIR%%/types.db +%%PERL%%%%PERL5_MAN3%%/Collectd::Unixsock.3.gz +%%PERL%%%%SITE_PERL%%/Collectd/Plugins/OpenVZ.pm %%PERL%%%%SITE_PERL%%/Collectd.pm %%PERL%%%%SITE_PERL%%/Collectd/Unixsock.pm man/man1/collectd-nagios.1.gz @@ -115,5 +128,4 @@ man/man5/collectd.conf.5.gz man/man5/types.db.5.gz @dir /var/db/collectd -@dir /var/lib/collectd @dir /var/lib