diff options
author | fhajny <fhajny@pkgsrc.org> | 2016-10-13 15:17:28 +0000 |
---|---|---|
committer | fhajny <fhajny@pkgsrc.org> | 2016-10-13 15:17:28 +0000 |
commit | 6512d00bf1c4d8930306132459cd53c85be9a6e0 (patch) | |
tree | 7a60fb4e882cb6b4d9afc46fb24f9afd66627d93 /sysutils/collectd | |
parent | 743f7cbec00d54a8f2b2f8d686510b3135db4674 (diff) | |
download | pkgsrc-6512d00bf1c4d8930306132459cd53c85be9a6e0.tar.gz |
Update sysutils/collectd and subpackages to 5.6.1.
- Simplify patching somewhat by calling automake
- Temporarily disable the processes plugin patch for NetBSD, until
its code is amended for collectd code changes.
Version 5.6.1
- Build system: Unnecessary linking of the Write Graphite plugin
with libyajl has been removed.
- collectd: A bug in the FlushInterval option that caused a
segmentation fault in the Write HTTP plugin has been fixed.
- Apache plugin: A syntax error has been fixed.
- cURL-JSON plugin: A segmentation fault that occurred when
handling JSON with unexpected structure has been fixed.
- PostgreSQL plugin: Handling of NULL values in the query_plans
and query_plans_by_table queries has been fixed.
- RRDCacheD plugin: Reconnection behavior has been added.
- VServer plugin: Use of a deprecated API (readdir_r()) has been
fixed.
- Write Graphite plugin: Make default values configurable at
compile time again.
- Write HTTP plugin: A bug has been fixed that lead to flush
callbacks being registered twice.
Version 5.6.0
- Build system: An option to to avoid building the DF plugin
against XFS has been added.
- Build system: Autoconf >=2.60, a C99-capable compiler and
pkg-config are now required.
- Build system: Building with -Werror is now optional.
- Build system: Many compilation issues on non-Linux platforms
have been fixed, leading to wider plugin support.
- Build system: The configuration summary now also ends up in
config.log.
- collectd: All command-line options now override global options
from the config file.
- collectd: A number of unit tests for commonly used functions
have been added.
- collectd: Plugins start up and read timeouts are now logged.
- collectd: Support for a timeout has been added to FLUSH
callbacks.
- collectd: The -T command line switch now reports more errors.
- collectd: The max size of value list elements
(DATA_MAX_NAME_LEN) has been doubled and is now configurable at
build time.
- Set target: The MetaData option has been added.
- AMQP plugin, Write_HTTP plugin, Write_Kafka plugin: Support for
libyajl < 2 has been added.
- APC UPS plugin: Parsing of end markers has been fixed.
- APC UPS plugin: The PersistentConnection option has been added.
- ceph plugin, DNS plugin, Exec plugin, IPTables plugin, Ping
plugin, turbostat plugin: When running unprivileged, these
plugins will now warn about insuffiscient permissions or
capabilities(7).
- Chrony plugin: This new plugin collects NTP data from the chrony
NTP server.
- cpusleep plugin: This new plugin measures time spent by CPU in
deep sleep mode.
- CPU plugin: The ReportNumCpu option has been added.
- cURL plugin, cURL-JSON plugin, cURL-XML plugin: The new
Statistics reports various per-HTTP connection timers.
- DBI plugin: The Interval option has been added to Database
blocks.
- Disk plugin: Support for FreeBSD has been added.
- Empty Counter match: Support for derives has been implemented.
- GenericJMX plugin: Support for TabularData and the PluginName
option have been added.
- GPS plugin: This new plugin reports the number of sattelites
seen by and precision of a GPS receiver.
- gRPC plugin: This new client and server plugin allows sending
and receiving metrics using the gRPC protocol. Comparable to the
UnixSock plugin, but using TCP and TLS.
- Interface plugin: Reporting dropped packets has been added.
- Interface plugin: The ReportInactive has been added, letting
users skip inactive network interfaces.
- Interface plugin: The new, Solaris-only UniqueName option has
been added.
- Lua plugin: This new language binding allows writing plugins
using the Lua programming language.
- Memory plugin: Reporting of ARC memory on Solaris has been
added.
- MQTT plugin: This new plugin sends metrics to and/or receives
metrics from an MQTT broker.
- MySQL plugin: Connection to the database server can now be done
over SSL.
- MySQL plugin: Monitoring slow queries has been added.
- MySQL plugin: mysql_bpool_pages-flushed has been renamed to
mysql_bpool_counters-pages_flushed because the value is
cumulative.
- MySQL plugin: Support for Galera statistics has been added.
- MySQL plugin: Support for InnoDB metrics was improved.
- MySQL plugin: The mysql_sort type has been split into 3
different types.
- Network plugin: Decryption error logging has been improved.
- Notify Nagios plugin: This new plugin sends notifications to
Nagios as a passive check result.
- NTPd plugin: The plugin now detects if the ntp daemon reports
nanoseconds instead of microseconds.
- OpenLDAP plugin: Several connection-related improvements have
been made.
- OpenLDAP plugin: Support for "simple authentication" has been
added.
- Ping plugin: The Size option has been added, allowing the ICMP
data payload size to be configured.
- PostgreSQL plugin, DBI plugin, Oracle plugin: The new
PluginInstanceFrom option has been added.
- PowerDNS plugin: The recursor metrics have been updated to 3.7.3
and missing rr types have been added.
- Processes plugin: Counting of context switches was added for
Linux.
- Processes plugin: Improve reliability of thread counts on Linux.
- Python plugin: Minimal Python version requirement has been
bumped to 2.6.
- Redis plugin: Several additional metrics are now collected.
- Sensors plugin: The UseLabels option has been added.
- SMART plugin: The new IgnoreSleepMode option has been added.
- SMART plugin: The new UseSerial option allows identifying
devices in a stable way.
- SNMP plugin: The IpAddress can now be used for instances.
- StatsD plugin: Latency calculation histogram is now able to
shrink automatically to optimal size.
- StatsD plugin: The CounterSum option has been added.
- UUID plugin: The plugin now also looks in in smbios system table
and /sys/class/dmi.
- virt plugin: The PluginInstanceFormat option has been added.
- Write Graphite plugin: The ReconnectInterval option has been
added.
- Write HTTP plugin: A KairosDB formatter has been added.
- Write HTTP plugin: Notifications are now handled by this plugin.
- Write HTTP plugin: The LogHttpError option has been added.
- Write HTTP plugin: The new Headers option allows setting custom
HTTP headers in outgoing requests.
- Write Kafka plugin: Key handling has been made more
comprehensive and reliable.
- Write Redis plugin: The Database, MaxSetSize, Prefix and
StoreRates options have been added.
- Write Riemann plugin: The new BatchFlushTimeout and Timeout
option have been added.
- Write Riemann plugin: This plugin now requires the
riemann-c-client library, version 1.6.0+. This adds support for
submitting values to Riemann over TLS.
- Write TSDB plugin, Write Sensu plugin, Write Riemann plugin,
Write Graphite plugin, Write TSDB plugin: TCP keepalive is now
enabled, helping graceful recovery from unclean network
disconnections.
- XenCPU plugin: This new plugin collects XEN Hypervisor CPU
stats.
- ZFS ARC plugin: Several new statistics have been added and a
couple of obsolete ones removed.
- Zone plugin: This new plugin reads per-zone CPU usage on
Solaris.
Version 5.5.2
- collectd: A division by zero has been fixed in the
plugin_dispatch_multivalue() function.
- collectd: The address of the Free Software Foundation has been
fixed in GPL license headers.
- Build system: Detection and handling of librrd 1.6 and later has
been fixed.
- Apache plugin: A warning about a possible misconfiguration has
been added.
- cURL, cURL-JSON and cURL-XML plugins: A memory leak when
allocating more memory fails has been fixed.
- DF plugin: A build issue on DragonFlyBSD has been fixed.
- Ethstat plugin: Code to strip leading whitespace from device
names. This works around an issue in the VMXNet3 driver.
- Exec plugin: A problem in the error handling of an fdopen()
failure has been fixed.
- Modbus plugin: The debug output has been disabled by default. It
is now only enabled when building with --enable-debug.
- Network plugin: A check for the initialization of secure memory
has been added. Previously, failure to initialize this memory
was ignored.
- Network plugin: A heap overflow has been fixed in the server
code. This issue can be triggered remotely and is potentially
exploitable.
- Perl plugin: Init callbacks have been changed to run essentially
single-threaded to avoid race conditions by init functions which
create additional threads.
- Processes plugin: A compilation error on systems without regex.h
has been fixed.
- Processes plugin: A memory leak on Solaris has been fixed.
- Processes plugin: A warning about too long process names has
been added.
- Redis plugin: A memory leak in an error handling code path has
been fixed.
- Redis plugin: The data source type of the expired_keys metric
has been corrected to DERIVE.
- SMART plugin: A build dependency on libudev has been added.
- StatsD plugin: A deadlock on plugin shutdown has been fixed.
- Write HTTP plugin: Freeing of memory holding HTTP headers during
shutdown has been fixed.
- Write Sensu plugin: A segfault when the Tag was unset has been
fixed.
- ZFS ARC plugin: The cache_operation-stolen metric has been
removed for FreeBSD 10.2 and later.
Diffstat (limited to 'sysutils/collectd')
19 files changed, 150 insertions, 1436 deletions
diff --git a/sysutils/collectd/Makefile b/sysutils/collectd/Makefile index 59e5de30037..01e2ea6a207 100644 --- a/sysutils/collectd/Makefile +++ b/sysutils/collectd/Makefile @@ -1,6 +1,5 @@ -# $NetBSD: Makefile,v 1.17 2016/07/09 06:38:58 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2016/10/13 15:17:28 fhajny Exp $ -PKGREVISION= 12 .include "../../sysutils/collectd/Makefile.common" COMMENT= Statistics collection daemon base @@ -25,6 +24,8 @@ CONFIGURE_ARGS+= --enable-${option} # Several libs not generated in time for linking collectd MAKE_JOBS_SAFE= no +INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples/collectd + .include "options.mk" CONF_FILES+= share/examples/collectd/collectd.conf \ diff --git a/sysutils/collectd/Makefile.common b/sysutils/collectd/Makefile.common index 8f7e6bf9584..32c0c5e9875 100644 --- a/sysutils/collectd/Makefile.common +++ b/sysutils/collectd/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.11 2015/10/28 11:46:07 jperkin Exp $ +# $NetBSD: Makefile.common,v 1.12 2016/10/13 15:17:28 fhajny Exp $ # # used by sysutils/collectd/Makefile # used by sysutils/collectd-amqp/Makefile @@ -16,9 +16,10 @@ # used by sysutils/p5-collectd/Makefile # used by sysutils/py-collectd/Makefile -DISTNAME= collectd-5.5.0 +DISTNAME= collectd-5.6.1 MASTER_SITES= http://collectd.org/files/ CATEGORIES= sysutils +EXTRACT_SUFX= .tar.bz2 MAINTAINER= filip@joyent.com HOMEPAGE= http://collectd.org/ @@ -26,7 +27,7 @@ LICENSE= gnu-gpl-v2 GNU_CONFIGURE= yes USE_LIBTOOL= yes -USE_TOOLS+= pkg-config +USE_TOOLS+= autoconf automake pkg-config USE_LANGUAGES= c c99 c++ DISTINFO_FILE= ${.CURDIR}/../../sysutils/collectd/distinfo @@ -69,6 +70,8 @@ CONFIGURE_ARGS+= --localstatedir=${VARBASE} CONFIGURE_ARGS+= --with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib CONFIGURE_ARGS+= --with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include +CONFIGURE_ARGS.NetBSD+= ac_cv_func_getfsstat=no + CPPFLAGS.SunOS+= -DSOLARIS2=${OS_VERSION:C/5.//} .include "../../mk/compiler.mk" @@ -78,5 +81,14 @@ CFLAGS+= -Wno-error=tautological-pointer-compare \ -Wno-error=pointer-bool-conversion .endif +SUBST_CLASSES+= ver +SUBST_MESSAGE.ver= Fixing canonical version number +SUBST_STAGE.ver= pre-configure +SUBST_FILES.ver= configure.ac +SUBST_SED.ver= -e 's,m4_esyscmd(./version-gen.sh),${PKGVERSION_NOREV},' + +pre-configure: + cd ${WRKSRC} && autoreconf + .include "../../devel/libltdl/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/sysutils/collectd/PLIST b/sysutils/collectd/PLIST index ecdd3c2eca0..eedea9fc044 100644 --- a/sysutils/collectd/PLIST +++ b/sysutils/collectd/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2015/09/12 19:04:56 he Exp $ +@comment $NetBSD: PLIST,v 1.7 2016/10/13 15:17:28 fhajny Exp $ bin/collectd-nagios bin/collectd-tg bin/collectdctl @@ -13,10 +13,10 @@ ${PLIST.battery}lib/collectd/battery.la ${PLIST.contextswitch}lib/collectd/contextswitch.la ${PLIST.cpu}lib/collectd/cpu.la lib/collectd/csv.la -${PLIST.entropy}lib/collectd/entropy.la ${PLIST.df}lib/collectd/df.la ${PLIST.disk}lib/collectd/disk.la lib/collectd/email.la +${PLIST.entropy}lib/collectd/entropy.la lib/collectd/exec.la lib/collectd/filecount.la lib/collectd/hddtemp.la @@ -50,8 +50,8 @@ lib/collectd/target_replace.la lib/collectd/target_scale.la lib/collectd/target_set.la lib/collectd/target_v5upgrade.la -lib/collectd/teamspeak2.la ${PLIST.tcpconns}lib/collectd/tcpconns.la +lib/collectd/teamspeak2.la lib/collectd/threshold.la lib/collectd/unixsock.la ${PLIST.uptime}lib/collectd/uptime.la @@ -59,6 +59,7 @@ ${PLIST.users}lib/collectd/users.la lib/collectd/uuid.la lib/collectd/write_graphite.la ${PLIST.zfs-arc}lib/collectd/zfs_arc.la +${PLIST.zone}lib/collectd/zone.la lib/libcollectdclient.la lib/pkgconfig/libcollectdclient.pc man/man1/collectd-nagios.1 @@ -69,6 +70,7 @@ man/man1/collectdmon.1 man/man5/collectd-email.5 man/man5/collectd-exec.5 man/man5/collectd-java.5 +man/man5/collectd-lua.5 man/man5/collectd-perl.5 man/man5/collectd-python.5 man/man5/collectd-snmp.5 diff --git a/sysutils/collectd/distinfo b/sysutils/collectd/distinfo index f10f9247709..f6faaba820a 100644 --- a/sysutils/collectd/distinfo +++ b/sysutils/collectd/distinfo @@ -1,28 +1,23 @@ -$NetBSD: distinfo,v 1.27 2016/02/03 15:10:43 he Exp $ +$NetBSD: distinfo,v 1.28 2016/10/13 15:17:28 fhajny Exp $ -SHA1 (collectd-5.5.0.tar.gz) = d24e284c1eae20c5e75b846c8b2612ab65bd5565 -RMD160 (collectd-5.5.0.tar.gz) = 2197758942a5fe56e4eabda3786f09d4138e943a -SHA512 (collectd-5.5.0.tar.gz) = b7ab9db91bf8c0eadbf9893421c019239acf85d2d84a5adb834582ed218a7dd03f750b7279dc4b1bb0030a8b9d3302bea9ae9f201c913128e1896cbd1349b5a9 -Size (collectd-5.5.0.tar.gz) = 2244454 bytes +SHA1 (collectd-5.6.1.tar.bz2) = 20b773928743b346e0962fc1dc37167390a16d80 +RMD160 (collectd-5.6.1.tar.bz2) = 5247f6b4a0936ac9715189e16afe6f65bee94788 +SHA512 (collectd-5.6.1.tar.bz2) = da25f1a9cbaf47533f5a4d2f5f78b966317d4f21865c5a714954ad9d7d02b4798a3e0471ce52199dc80e01dc2808376cb10a7e19c402aafc984bf595f09951a6 +Size (collectd-5.6.1.tar.bz2) = 1903962 bytes SHA1 (patch-Makefile.am) = ed45b75293a4ea2dd577d04eeb3b9017b8f47319 -SHA1 (patch-Makefile.in) = a7cf69ca29c526be643af0ef85544e3a2dc80a77 -SHA1 (patch-configure) = f4bf389b98f03152347f0d1c6fba34e948e81625 -SHA1 (patch-configure.ac) = 8313b139c3b23f10e26a42a976e97b09ad72e656 -SHA1 (patch-src_Makefile.am) = 45930ca400c6c67927020c9a264d3d5adc30ca46 -SHA1 (patch-src_Makefile.in) = 46bea4aa9a045e56478ff96730245134ddb0b362 -SHA1 (patch-src_collectd-tg.c) = f9f41dfb0b1b55a62202128a165d5c9943faf5bc +SHA1 (patch-configure.ac) = f450d6b00e5c7c37214b4d90ca057c515ed08fa1 +SHA1 (patch-src_Makefile.am) = 1d5cc2f58ce776df04feab2afc937f12ee7b0765 SHA1 (patch-src_collectd.conf.in) = f0b35085cf0ddfd766e140b145177ab1f1326f5f -SHA1 (patch-src_config.h.in) = be17db23b6ee7a90ba57e73f073ed5be11c369c5 -SHA1 (patch-src_cpu.c) = 55b5cfc69bf0df279d1a12003eb6a8e681155e18 +SHA1 (patch-src_cpu.c) = 32af60d7e49edf9d16481b705bc1ea429c90c82b +SHA1 (patch-src_daemon_Makefile.am) = e38d465faf8bdd750fd9cb7f0bd9f041fcc8f83c SHA1 (patch-src_df.c) = 7e75dfbc72ecad48eb0eb7427a19329daf6b9a60 SHA1 (patch-src_disk.c) = 159862e8ca1e841e3c4013c03ba03f059fdbbab5 SHA1 (patch-src_entropy.c) = 4fa683654936f57fb7366faebb93d572af08db9c -SHA1 (patch-src_irq.c) = 8d5c516fea31bf2ab9736c32540be3223dea15d9 -SHA1 (patch-src_libcollectclient_network__buffer.c) = e07d403d299613fa0885a0e7285849eb85510253 -SHA1 (patch-src_memory.c) = f48d50245176426e26af7fa1b1f4ff6fbf0b1d95 +SHA1 (patch-src_irq.c) = 6e414b6fd664e784edd5aa9f907c8cfa80a0cd48 +SHA1 (patch-src_libcollectclient_network__buffer.c) = 76c94284b4078259985b70168342ac306b4505b7 +SHA1 (patch-src_memory.c) = b15225915ff23beed0b75c45be2eb3940d3717fd SHA1 (patch-src_netstat__udp.c) = 30cb12d25f56c60959658dbd181783212e00cc61 SHA1 (patch-src_processes.c) = e00d2edf6b4e6bfe3663e34fffb05f40652affe5 -SHA1 (patch-src_swap.c) = e7602eb83eed6b90752b8293b9666b94bdd42493 +SHA1 (patch-src_swap.c) = 304a25324099495fb875127221ed5fc95173a164 SHA1 (patch-src_tcpconns.c) = 712af1b821d62217283df884dd283d5b1218ab7c SHA1 (patch-src_utils__dns.c) = c3782dc9127f42da30e3142b853aa2cb2259af94 -SHA1 (patch-version-gen.sh) = 07d830019e22ac651514b75acf299b1f50c4632d diff --git a/sysutils/collectd/options.mk b/sysutils/collectd/options.mk index 117adde782e..7d9f15643c1 100644 --- a/sysutils/collectd/options.mk +++ b/sysutils/collectd/options.mk @@ -1,13 +1,13 @@ -# $NetBSD: options.mk,v 1.7 2016/02/26 10:24:11 jperkin Exp $ +# $NetBSD: options.mk,v 1.8 2016/10/13 15:17:28 fhajny Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.collectd PKG_SUPPORTED_OPTIONS= cpu df interface load memory syslog uptime PKG_SUGGESTED_OPTIONS+= cpu df interface load memory syslog uptime PKG_SUPPORTED_OPTIONS.NetBSD+= contextswitch disk entropy irq pf netstat_udp -PKG_SUPPORTED_OPTIONS.NetBSD+= processes swap tcpconns users +PKG_SUPPORTED_OPTIONS.NetBSD+= swap tcpconns users PKG_SUGGESTED_OPTIONS.NetBSD+= contextswitch disk entropy irq pf netstat_udp -PKG_SUGGESTED_OPTIONS.NetBSD+= processes swap tcpconns users +PKG_SUGGESTED_OPTIONS.NetBSD+= swap tcpconns users PKG_SUPPORTED_OPTIONS.FreeBSD+= contextswitch pf processes swap tcpconns zfs-arc PKG_SUGGESTED_OPTIONS.FreeBSD+= contextswitch pf processes swap tcpconns zfs-arc @@ -17,8 +17,8 @@ PKG_SUPPORTED_OPTIONS.Darwin+= processes swap tcpconns users PKG_SUGGESTED_OPTIONS.Darwin+= apple-sensors battery contextswitch disk PKG_SUGGESTED_OPTIONS.Darwin+= processes swap tcpconns users -PKG_SUPPORTED_OPTIONS.SunOS+= disk nfs swap users zfs-arc -PKG_SUGGESTED_OPTIONS.SunOS+= disk nfs swap users zfs-arc +PKG_SUPPORTED_OPTIONS.SunOS+= disk nfs swap users zfs-arc zone +PKG_SUGGESTED_OPTIONS.SunOS+= disk nfs swap users zfs-arc zone .include "../../mk/bsd.options.mk" @@ -26,7 +26,7 @@ PLIST_VARS+= apple-sensors battery contextswitch cpu entropy \ df disk \ interface irq load netstat_udp \ memory nfs pf processes swap \ - syslog tcpconns uptime users zfs-arc + syslog tcpconns uptime users zfs-arc zone .for option in ${PLIST_VARS} . if !empty(PKG_OPTIONS:M${option}) diff --git a/sysutils/collectd/patches/patch-Makefile.in b/sysutils/collectd/patches/patch-Makefile.in deleted file mode 100644 index ec5d187c5fb..00000000000 --- a/sysutils/collectd/patches/patch-Makefile.in +++ /dev/null @@ -1,159 +0,0 @@ -$NetBSD: patch-Makefile.in,v 1.2 2015/08/18 07:47:46 he Exp $ - -Regenerate. - ---- Makefile.in.orig 2014-01-26 08:09:57.577219038 +0000 -+++ Makefile.in -@@ -1,7 +1,7 @@ --# Makefile.in generated by automake 1.14.1 from Makefile.am. -+# Makefile.in generated by automake 1.15 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+# Copyright (C) 1994-2014 Free Software Foundation, Inc. - - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -14,7 +14,17 @@ - - @SET_MAKE@ - VPATH = @srcdir@ --am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__is_gnu_make = { \ -+ if test -z '$(MAKELEVEL)'; then \ -+ false; \ -+ elif test -n '$(MAKE_HOST)'; then \ -+ true; \ -+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ -+ true; \ -+ else \ -+ false; \ -+ fi; \ -+} - am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ -@@ -78,25 +88,12 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - subdir = . --DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -- $(top_srcdir)/configure $(am__configure_deps) \ -- $(top_srcdir)/src/libcollectdclient/collectd/lcc_features.h.in \ -- AUTHORS COPYING ChangeLog INSTALL NEWS README TODO compile \ -- libltdl/config/compile config.guess \ -- libltdl/config/config.guess config.sub \ -- libltdl/config/config.sub depcomp libltdl/config/depcomp \ -- install-sh libltdl/config/install-sh missing \ -- libltdl/config/missing ylwrap libltdl/config/ylwrap ltmain.sh \ -- libltdl/config/ltmain.sh $(top_srcdir)/libltdl/config/compile \ -- $(top_srcdir)/libltdl/config/config.guess \ -- $(top_srcdir)/libltdl/config/config.sub \ -- $(top_srcdir)/libltdl/config/install-sh \ -- $(top_srcdir)/libltdl/config/ltmain.sh \ -- $(top_srcdir)/libltdl/config/missing - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/configure.ac - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ -+ $(am__configure_deps) $(am__DIST_COMMON) - am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno config.status.lineno - mkinstalldirs = $(install_sh) -d -@@ -159,6 +156,21 @@ ETAGS = etags - CTAGS = ctags - CSCOPE = cscope - DIST_SUBDIRS = $(SUBDIRS) -+am__DIST_COMMON = $(srcdir)/Makefile.in \ -+ $(top_srcdir)/libltdl/config/compile \ -+ $(top_srcdir)/libltdl/config/config.guess \ -+ $(top_srcdir)/libltdl/config/config.sub \ -+ $(top_srcdir)/libltdl/config/install-sh \ -+ $(top_srcdir)/libltdl/config/ltmain.sh \ -+ $(top_srcdir)/libltdl/config/missing \ -+ $(top_srcdir)/src/libcollectdclient/collectd/lcc_features.h.in \ -+ AUTHORS COPYING ChangeLog INSTALL NEWS README TODO compile \ -+ config.guess config.sub depcomp install-sh \ -+ libltdl/config/compile libltdl/config/config.guess \ -+ libltdl/config/config.sub libltdl/config/depcomp \ -+ libltdl/config/install-sh libltdl/config/ltmain.sh \ -+ libltdl/config/missing libltdl/config/ylwrap ltmain.sh missing \ -+ ylwrap - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - distdir = $(PACKAGE)-$(VERSION) - top_distdir = $(distdir) -@@ -353,9 +365,6 @@ LIBADD_DL = @LIBADD_DL@ - LIBADD_DLD_LINK = @LIBADD_DLD_LINK@ - LIBADD_DLOPEN = @LIBADD_DLOPEN@ - LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@ --LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ --LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ --LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ - LIBLTDL = @LIBLTDL@ - LIBNETAPP_CPPFLAGS = @LIBNETAPP_CPPFLAGS@ - LIBNETAPP_LDFLAGS = @LIBNETAPP_LDFLAGS@ -@@ -493,7 +502,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign Makefile --.PRECIOUS: Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ -@@ -710,15 +718,15 @@ dist-xz: distdir - $(am__post_remove_distdir) - - dist-tarZ: distdir -- @echo WARNING: "Support for shar distribution archives is" \ -- "deprecated." >&2 -+ @echo WARNING: "Support for distribution archives compressed with" \ -+ "legacy program 'compress' is deprecated." >&2 - @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__post_remove_distdir) - - dist-shar: distdir -- @echo WARNING: "Support for distribution archives compressed with" \ -- "legacy program 'compress' is deprecated." >&2 -+ @echo WARNING: "Support for shar distribution archives is" \ -+ "deprecated." >&2 - @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__post_remove_distdir) -@@ -754,17 +762,17 @@ distcheck: dist - esac - chmod -R a-w $(distdir) - chmod u+w $(distdir) -- mkdir $(distdir)/_build $(distdir)/_inst -+ mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst - chmod a-w $(distdir) - test -d $(distdir)/_build || exit 0; \ - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && am__cwd=`pwd` \ -- && $(am__cd) $(distdir)/_build \ -- && ../configure \ -+ && $(am__cd) $(distdir)/_build/sub \ -+ && ../../configure \ - $(AM_DISTCHECK_CONFIGURE_FLAGS) \ - $(DISTCHECK_CONFIGURE_FLAGS) \ -- --srcdir=.. --prefix="$$dc_install_base" \ -+ --srcdir=../.. --prefix="$$dc_install_base" \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ -@@ -944,10 +952,12 @@ uninstall-am: - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-am uninstall uninstall-am - -+.PRECIOUS: Makefile -+ - - install-exec-hook: - $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run -- $(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/$(PACKAGE_NAME) -+ $(mkinstalldirs) $(DESTDIR)$(localstatedir)/db/$(PACKAGE_NAME) - $(mkinstalldirs) $(DESTDIR)$(localstatedir)/log - - maintainer-clean-local: diff --git a/sysutils/collectd/patches/patch-configure b/sysutils/collectd/patches/patch-configure deleted file mode 100644 index 40b2ba9c974..00000000000 --- a/sysutils/collectd/patches/patch-configure +++ /dev/null @@ -1,324 +0,0 @@ -$NetBSD: patch-configure,v 1.11 2016/02/03 13:10:27 he Exp $ - -Regen from configure.ac. - ---- configure.orig 2015-05-27 07:51:50.000000000 +0000 -+++ configure -@@ -797,6 +797,8 @@ BUILD_PLUGIN_NFS_FALSE - BUILD_PLUGIN_NFS_TRUE - BUILD_PLUGIN_NETWORK_FALSE - BUILD_PLUGIN_NETWORK_TRUE -+BUILD_PLUGIN_NETSTAT_UDP_FALSE -+BUILD_PLUGIN_NETSTAT_UDP_TRUE - BUILD_PLUGIN_NETLINK_FALSE - BUILD_PLUGIN_NETLINK_TRUE - BUILD_PLUGIN_NETAPP_FALSE -@@ -1431,6 +1433,7 @@ enable_multimeter - enable_mysql - enable_netapp - enable_netlink -+enable_netstat_udp - enable_network - enable_nfs - enable_nginx -@@ -2230,6 +2233,7 @@ collectd plugins: - --enable-mysql MySQL statistics - --enable-netapp NetApp plugin - --enable-netlink Enhanced Linux network statistics -+ --enable-netstat_udp UDP network statistics - --enable-network Network communication plugin - --enable-nfs NFS statistics - --enable-nginx nginx statistics -@@ -13908,7 +13912,7 @@ else - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ --#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) -+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -@@ -13954,7 +13958,7 @@ else - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ --#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) -+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -@@ -13978,7 +13982,7 @@ rm -f core conftest.err conftest.$ac_obj - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ --#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) -+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -@@ -14023,7 +14027,7 @@ else - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ --#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) -+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -@@ -14047,7 +14051,7 @@ rm -f core conftest.err conftest.$ac_obj - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ --#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) -+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -@@ -15319,6 +15323,12 @@ $as_echo "#define KERNEL_OPENBSD 1" >>co - - ac_system="OpenBSD" - ;; -+ *netbsd*) -+ -+$as_echo "#define KERNEL_NETBSD 1" >>confdefs.h -+ -+ ac_system="NetBSD" -+ ;; - *aix*) - - $as_echo "#define KERNEL_AIX 1" >>confdefs.h -@@ -15876,6 +15886,29 @@ fi - done - - -+# For entropy plugin on newer NetBSD -+for ac_header in sys/rndio.h -+do : -+ ac_fn_c_check_header_compile "$LINENO" "sys/rndio.h" "ac_cv_header_sys_rndio_h" "#if HAVE_SYS_TYPES_H -+# include <sys/types.h> -+#endif -+#if HAVE_SYS_IOCTL_H -+# include <sys/ioctl.h> -+#endif -+#if HAVE_SYS_PARAM_H -+# include <sys/param.h> -+#endif -+ -+" -+if test "x$ac_cv_header_sys_rndio_h" = xyes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_SYS_RNDIO_H 1 -+_ACEOF -+ -+fi -+ -+done -+ - # For ping library - for ac_header in netinet/in_systm.h - do : -@@ -16215,6 +16248,27 @@ else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysctl kern.cp_time" >&5 -+$as_echo_n "checking for sysctl kern.cp_time... " >&6; } -+if test -x /sbin/sysctl -+then -+ /sbin/sysctl kern.cp_time 2>/dev/null -+ if test $? -eq 0 -+ then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } -+ -+$as_echo "#define HAVE_SYSCTL_KERN_CP_TIME 1" >>confdefs.h -+ -+ else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+ fi -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ - - # For hddtemp module - for ac_header in linux/major.h -@@ -19171,6 +19225,54 @@ else - fi - - -+ac_fn_c_check_member "$LINENO" "struct kinfo_proc2" "p_pid" "ac_cv_member_struct_kinfo_proc2_p_pid" " -+#include <sys/param.h> -+#include <sys/sysctl.h> -+#include <kvm.h> -+ -+" -+if test "x$ac_cv_member_struct_kinfo_proc2_p_pid" = xyes; then : -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_STRUCT_KINFO_PROC2_P_PID 1 -+_ACEOF -+ -+ -+ -+$as_echo "#define HAVE_STRUCT_KINFO_PROC2_NETBSD 1" >>confdefs.h -+ -+ have_struct_kinfo_proc2_netbsd="yes" -+ -+else -+ -+ have_struct_kinfo_proc2_netbsd="no" -+ -+fi -+ac_fn_c_check_member "$LINENO" "struct kinfo_proc2" "p_uru_maxrss" "ac_cv_member_struct_kinfo_proc2_p_uru_maxrss" " -+#include <sys/param.h> -+#include <sys/sysctl.h> -+#include <kvm.h> -+ -+" -+if test "x$ac_cv_member_struct_kinfo_proc2_p_uru_maxrss" = xyes; then : -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_STRUCT_KINFO_PROC2_P_URU_MAXRSS 1 -+_ACEOF -+ -+ -+ -+$as_echo "#define HAVE_STRUCT_KINFO_PROC2_NETBSD 1" >>confdefs.h -+ -+ have_struct_kinfo_proc2_netbsd="yes" -+ -+else -+ -+ have_struct_kinfo_proc2_netbsd="no" -+ -+fi -+ -+ - ac_fn_c_check_member "$LINENO" "struct udphdr" "uh_dport" "ac_cv_member_struct_udphdr_uh_dport" "#define _BSD_SOURCE - #define _DEFAULT_SOURCE - #if HAVE_STDINT_H -@@ -27579,6 +27681,7 @@ plugin_load="no" - plugin_log_logstash="no" - plugin_memory="no" - plugin_multimeter="no" -+plugin_netstat_udp="no" - plugin_nfs="no" - plugin_numa="no" - plugin_perl="no" -@@ -27648,6 +27751,15 @@ then - plugin_tcpconns="yes" - fi - -+if test "x$ac_system" = "xNetBSD" -+then -+ plugin_entropy="yes" -+ plugin_irq="yes" -+ plugin_processes="yes" -+ plugin_disk="yes" -+ plugin_netstat_udp="yes" -+fi -+ - # Mac OS X devices - if test "x$with_libiokit" = "xyes" - then -@@ -27890,6 +28002,11 @@ then - plugin_swap="yes" - fi - -+if test "x$have_swapctl" = "xyes" && test "x$c_cv_have_swapctl_three_args" = "xyes" -+then -+ plugin_swap="yes" -+fi -+ - if test "x$with_kvm_openfiles$with_kvm_nlist" = "xyesyes" - then - plugin_tcpconns="yes" -@@ -31715,6 +31832,66 @@ fi - - enable_plugin="no" - force="no" -+ # Check whether --enable-netstat_udp was given. -+if test "${enable_netstat_udp+set}" = set; then : -+ enableval=$enable_netstat_udp; -+ if test "x$enableval" = "xyes" -+ then -+ enable_plugin="yes" -+ else if test "x$enableval" = "xforce" -+ then -+ enable_plugin="yes" -+ force="yes" -+ else -+ enable_plugin="no (disabled on command line)" -+ fi; fi -+ -+else -+ -+ if test "x$enable_all_plugins" = "xauto" -+ then -+ if test "x$plugin_netstat_udp" = "xyes" -+ then -+ enable_plugin="yes" -+ else -+ enable_plugin="no" -+ fi -+ else -+ enable_plugin="$enable_all_plugins" -+ fi -+ -+fi -+ -+ if test "x$enable_plugin" = "xyes" -+ then -+ if test "x$plugin_netstat_udp" = "xyes" || test "x$force" = "xyes" -+ then -+ -+$as_echo "#define HAVE_PLUGIN_NETSTAT_UDP 1" >>confdefs.h -+ -+ if test "x$plugin_netstat_udp" != "xyes" -+ then -+ dependency_warning="yes" -+ fi -+ else # User passed "yes" but dependency checking yielded "no" => Dependency problem. -+ dependency_error="yes" -+ enable_plugin="no (dependency error)" -+ fi -+ fi -+ if test "x$enable_plugin" = "xyes"; then -+ BUILD_PLUGIN_NETSTAT_UDP_TRUE= -+ BUILD_PLUGIN_NETSTAT_UDP_FALSE='#' -+else -+ BUILD_PLUGIN_NETSTAT_UDP_TRUE='#' -+ BUILD_PLUGIN_NETSTAT_UDP_FALSE= -+fi -+ -+ enable_netstat_udp="$enable_plugin" -+ -+ -+ -+ enable_plugin="no" -+ force="no" - # Check whether --enable-network was given. - if test "${enable_network+set}" = set; then : - enableval=$enable_network; -@@ -36781,6 +36958,10 @@ if test -z "${BUILD_PLUGIN_NETLINK_TRUE} - as_fn_error $? "conditional \"BUILD_PLUGIN_NETLINK\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi -+if test -z "${BUILD_PLUGIN_NETSTAT_UDP_TRUE}" && test -z "${BUILD_PLUGIN_NETSTAT_UDP_FALSE}"; then -+ as_fn_error $? "conditional \"BUILD_PLUGIN_NETSTAT_UDP\" was never defined. -+Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+fi - if test -z "${BUILD_PLUGIN_NETWORK_TRUE}" && test -z "${BUILD_PLUGIN_NETWORK_FALSE}"; then - as_fn_error $? "conditional \"BUILD_PLUGIN_NETWORK\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 -@@ -39602,6 +39783,7 @@ Configuration: - mysql . . . . . . . . $enable_mysql - netapp . . . . . . . $enable_netapp - netlink . . . . . . . $enable_netlink -+ netstat_udp . . . . . $enable_netstat_udp - network . . . . . . . $enable_network - nfs . . . . . . . . . $enable_nfs - nginx . . . . . . . . $enable_nginx diff --git a/sysutils/collectd/patches/patch-configure.ac b/sysutils/collectd/patches/patch-configure.ac index c7c05ddb6bd..a37c962441b 100644 --- a/sysutils/collectd/patches/patch-configure.ac +++ b/sysutils/collectd/patches/patch-configure.ac @@ -1,87 +1,20 @@ -$NetBSD: patch-configure.ac,v 1.9 2016/02/03 13:10:27 he Exp $ +$NetBSD: patch-configure.ac,v 1.10 2016/10/13 15:17:28 fhajny Exp $ Add KERNEL_NETBSD, add entry and disk plugins for NetBSD, and also do swap for "have_swapctl_three_args" (as for NetBSD). Also, the start of process support, but that's not yet finished. ---- configure.ac.orig 2015-05-27 07:51:35.000000000 +0000 +--- configure.ac.orig 2016-09-11 08:10:25.243038749 +0000 +++ configure.ac -@@ -77,6 +77,10 @@ case $host_os in - AC_DEFINE([KERNEL_OPENBSD], 1, [True if program is to be compiled for an OpenBSD kernel]) - ac_system="OpenBSD" - ;; -+ *netbsd*) -+ AC_DEFINE([KERNEL_NETBSD], 1, [True if program is to be compiled for a NetBSD kernel]) -+ ac_system="NetBSD" -+ ;; - *aix*) - AC_DEFINE([KERNEL_AIX], 1, [True if program is to be compiled for a AIX kernel]) - ac_system="AIX" -@@ -151,6 +155,18 @@ AC_HEADER_STDBOOL +@@ -147,6 +147,7 @@ AM_CONDITIONAL([BUILD_DARWIN], [test "x$ + AM_CONDITIONAL([BUILD_FREEBSD], [test "x$ac_system" = "xFreeBSD"]) + AM_CONDITIONAL([BUILD_LINUX], [test "x$ac_system" = "xLinux"]) + AM_CONDITIONAL([BUILD_OPENBSD], [test "x$ac_system" = "xOpenBSD"]) ++AM_CONDITIONAL([BUILD_NETBSD], [test "x$ac_system" = "xNetBSD"]) + AM_CONDITIONAL([BUILD_SOLARIS], [test "x$ac_system" = "xSolaris"]) - AC_CHECK_HEADERS(stdio.h errno.h math.h stdarg.h syslog.h fcntl.h signal.h assert.h sys/types.h sys/socket.h sys/select.h poll.h netdb.h arpa/inet.h sys/resource.h sys/param.h kstat.h regex.h sys/ioctl.h endian.h sys/isa_defs.h fnmatch.h libgen.h) - -+# For entropy plugin on newer NetBSD -+AC_CHECK_HEADERS(sys/rndio.h, [], [], -+[#if HAVE_SYS_TYPES_H -+# include <sys/types.h> -+#endif -+#if HAVE_SYS_IOCTL_H -+# include <sys/ioctl.h> -+#endif -+#if HAVE_SYS_PARAM_H -+# include <sys/param.h> -+#endif -+]) - # For ping library - AC_CHECK_HEADERS(netinet/in_systm.h, [], [], - [#if HAVE_STDINT_H -@@ -329,6 +345,22 @@ then - else - AC_MSG_RESULT([no]) - fi -+AC_MSG_CHECKING([for sysctl kern.cp_time]) -+if test -x /sbin/sysctl -+then -+ /sbin/sysctl kern.cp_time 2>/dev/null -+ if test $? -eq 0 -+ then -+ AC_MSG_RESULT([yes]) -+ AC_DEFINE(HAVE_SYSCTL_KERN_CP_TIME, 1, -+ [Define if sysctl supports kern.cp_time]) -+ else -+ AC_MSG_RESULT([no]) -+ fi -+else -+ AC_MSG_RESULT([no]) -+fi -+ - - # For hddtemp module - AC_CHECK_HEADERS(linux/major.h) -@@ -1363,6 +1395,21 @@ AC_CHECK_MEMBERS([struct kinfo_proc.p_pi - #include <kvm.h> - ]) - -+AC_CHECK_MEMBERS([struct kinfo_proc2.p_pid, struct kinfo_proc2.p_uru_maxrss], -+ [ -+ AC_DEFINE(HAVE_STRUCT_KINFO_PROC2_NETBSD, 1, -+ [Define if struct kinfo_proc2 exists in the NetBSD variant.]) -+ have_struct_kinfo_proc2_netbsd="yes" -+ ], -+ [ -+ have_struct_kinfo_proc2_netbsd="no" -+ ], -+ [ -+#include <sys/param.h> -+#include <sys/sysctl.h> -+#include <kvm.h> -+ ]) -+ - AC_CHECK_MEMBERS([struct udphdr.uh_dport, struct udphdr.uh_sport], [], [], - [#define _BSD_SOURCE - #define _DEFAULT_SOURCE -@@ -5175,6 +5222,7 @@ plugin_load="no" + if test "x$ac_system" = "xLinux" +@@ -5717,6 +5718,7 @@ plugin_load="no" plugin_log_logstash="no" plugin_memory="no" plugin_multimeter="no" @@ -89,47 +22,27 @@ Also, the start of process support, but that's not yet finished. plugin_nfs="no" plugin_numa="no" plugin_perl="no" -@@ -5244,6 +5292,15 @@ then - plugin_tcpconns="yes" +@@ -5803,6 +5805,7 @@ then + plugin_entropy="yes" + plugin_irq="yes" + plugin_processes="yes" ++ plugin_netstat_udp="yes" fi -+if test "x$ac_system" = "xNetBSD" -+then -+ plugin_entropy="yes" -+ plugin_irq="yes" -+ plugin_processes="yes" -+ plugin_disk="yes" -+ plugin_netstat_udp="yes" -+fi -+ # Mac OS X devices - if test "x$with_libiokit" = "xyes" - then -@@ -5482,6 +5539,11 @@ then - plugin_swap="yes" - fi - -+if test "x$have_swapctl" = "xyes" && test "x$c_cv_have_swapctl_three_args" = "xyes" -+then -+ plugin_swap="yes" -+fi -+ - if test "x$with_kvm_openfiles$with_kvm_nlist" = "xyesyes" - then - plugin_tcpconns="yes" -@@ -5585,6 +5647,7 @@ AC_PLUGIN([multimeter], [$plugin_multim - AC_PLUGIN([mysql], [$with_libmysql], [MySQL statistics]) - AC_PLUGIN([netapp], [$with_libnetapp], [NetApp plugin]) - AC_PLUGIN([netlink], [$with_libmnl], [Enhanced Linux network statistics]) -+AC_PLUGIN([netstat_udp], [$plugin_netstat_udp], [UDP network statistics]) - AC_PLUGIN([network], [yes], [Network communication plugin]) - AC_PLUGIN([nfs], [$plugin_nfs], [NFS statistics]) - AC_PLUGIN([nginx], [$with_libcurl], [nginx statistics]) -@@ -5963,6 +6026,7 @@ Configuration: - mysql . . . . . . . . $enable_mysql - netapp . . . . . . . $enable_netapp - netlink . . . . . . . $enable_netlink -+ netstat_udp . . . . . $enable_netstat_udp - network . . . . . . . $enable_network - nfs . . . . . . . . . $enable_nfs - nginx . . . . . . . . $enable_nginx +@@ -6194,6 +6197,7 @@ AC_PLUGIN([multimeter], [$plugi + AC_PLUGIN([mysql], [$with_libmysql], [MySQL statistics]) + AC_PLUGIN([netapp], [$with_libnetapp], [NetApp plugin]) + AC_PLUGIN([netlink], [$with_libmnl], [Enhanced Linux network statistics]) ++AC_PLUGIN([netstat_udp], [$plugin_netstat_udp], [UDP network statistics]) + AC_PLUGIN([network], [yes], [Network communication plugin]) + AC_PLUGIN([nfs], [$plugin_nfs], [NFS statistics]) + AC_PLUGIN([nginx], [$with_libcurl], [nginx statistics]) +@@ -6624,6 +6628,7 @@ AC_MSG_RESULT([ multimeter . . . . . + AC_MSG_RESULT([ mysql . . . . . . . . $enable_mysql]) + AC_MSG_RESULT([ netapp . . . . . . . $enable_netapp]) + AC_MSG_RESULT([ netlink . . . . . . . $enable_netlink]) ++AC_MSG_RESULT([ netstat_udp . . . . . $enable_netstat_udp]) + AC_MSG_RESULT([ network . . . . . . . $enable_network]) + AC_MSG_RESULT([ nfs . . . . . . . . . $enable_nfs]) + AC_MSG_RESULT([ nginx . . . . . . . . $enable_nginx]) diff --git a/sysutils/collectd/patches/patch-src_Makefile.am b/sysutils/collectd/patches/patch-src_Makefile.am index daa66c60be1..289310967f8 100644 --- a/sysutils/collectd/patches/patch-src_Makefile.am +++ b/sysutils/collectd/patches/patch-src_Makefile.am @@ -1,10 +1,10 @@ -$NetBSD: patch-src_Makefile.am,v 1.2 2015/09/12 19:04:56 he Exp $ +$NetBSD: patch-src_Makefile.am,v 1.3 2016/10/13 15:17:28 fhajny Exp $ Install config file in example directory. ---- src/Makefile.am.orig 2015-05-26 19:38:14.000000000 +0000 +--- src/Makefile.am.orig 2016-09-11 08:10:25.251038738 +0000 +++ src/Makefile.am -@@ -14,13 +14,15 @@ AM_CPPFLAGS = -I$(srcdir)/daemon +@@ -10,7 +10,7 @@ AM_CPPFLAGS = -I$(srcdir)/daemon AM_CPPFLAGS += -DPREFIX='"${prefix}"' AM_CPPFLAGS += -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' AM_CPPFLAGS += -DLOCALSTATEDIR='"${localstatedir}"' @@ -13,15 +13,7 @@ Install config file in example directory. if BUILD_FEATURE_DAEMON AM_CPPFLAGS += -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"' endif - AM_CPPFLAGS += -DPLUGINDIR='"${pkglibdir}"' - AM_CPPFLAGS += -DPKGDATADIR='"${pkgdatadir}"' - -+egdir = @exec_prefix@/share/examples/@PACKAGE@ -+ - AUTOMAKE_OPTIONS = subdir-objects - - noinst_LTLIBRARIES = libmount.la liblookup.la -@@ -657,6 +659,12 @@ netlink_la_CFLAGS = $(AM_CFLAGS) $(BUILD +@@ -737,6 +737,12 @@ netlink_la_CFLAGS = $(AM_CFLAGS) $(BUILD netlink_la_LIBADD = $(BUILD_WITH_LIBMNL_LIBS) endif @@ -34,28 +26,3 @@ Install config file in example directory. if BUILD_PLUGIN_NETWORK pkglib_LTLIBRARIES += network.la network_la_SOURCES = network.c network.h \ -@@ -1363,13 +1371,8 @@ riemann.pb-c.c riemann.pb-c.h: riemann.p - endif - - install-exec-hook: -- $(mkinstalldirs) $(DESTDIR)$(sysconfdir) -- if test -e $(DESTDIR)$(sysconfdir)/collectd.conf; \ -- then \ -- $(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.pkg-orig; \ -- else \ -- $(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf; \ -- fi; \ -+ $(mkinstalldirs) $(DESTDIR)$(egdir) -+ $(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(egdir)/collectd.conf - $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) - $(INSTALL) -m 0644 $(srcdir)/types.db $(DESTDIR)$(pkgdatadir)/types.db; - $(INSTALL) -m 0644 $(srcdir)/postgresql_default.conf \ -@@ -1377,7 +1380,7 @@ install-exec-hook: - - uninstall-hook: - rm -f $(DESTDIR)$(pkgdatadir)/types.db; -- rm -f $(DESTDIR)$(sysconfdir)/collectd.conf -+ rm -f $(DESTDIR)$(egdir)/collectd.conf - rm -f $(DESTDIR)$(pkgdatadir)/postgresql_default.conf; - - check_PROGRAMS = test_utils_mount test_utils_vl_lookup diff --git a/sysutils/collectd/patches/patch-src_Makefile.in b/sysutils/collectd/patches/patch-src_Makefile.in deleted file mode 100644 index 2a771fc01a0..00000000000 --- a/sysutils/collectd/patches/patch-src_Makefile.in +++ /dev/null @@ -1,616 +0,0 @@ -$NetBSD: patch-src_Makefile.in,v 1.5 2015/09/17 11:24:11 he Exp $ - -Use a reasonable db dir. -Install config file into examples. - ---- src/Makefile.in.orig 2015-05-27 07:51:49.001922959 +0000 -+++ src/Makefile.in -@@ -1,7 +1,7 @@ --# Makefile.in generated by automake 1.14.1 from Makefile.am. -+# Makefile.in generated by automake 1.15 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+# Copyright (C) 1994-2014 Free Software Foundation, Inc. - - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -16,7 +16,17 @@ - - - VPATH = @srcdir@ --am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__is_gnu_make = { \ -+ if test -z '$(MAKELEVEL)'; then \ -+ false; \ -+ elif test -n '$(MAKE_HOST)'; then \ -+ true; \ -+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ -+ true; \ -+ else \ -+ false; \ -+ fi; \ -+} - am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ -@@ -193,124 +203,122 @@ bin_PROGRAMS = collectd-nagios$(EXEEXT) - @BUILD_PLUGIN_MYSQL_TRUE@@BUILD_WITH_LIBMYSQL_TRUE@am__append_109 = $(BUILD_WITH_LIBMYSQL_LIBS) - @BUILD_PLUGIN_NETAPP_TRUE@am__append_110 = netapp.la - @BUILD_PLUGIN_NETLINK_TRUE@am__append_111 = netlink.la --@BUILD_PLUGIN_NETWORK_TRUE@am__append_112 = network.la --@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_113 = -lsocket --@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBGCRYPT_TRUE@am__append_114 = $(GCRYPT_CPPFLAGS) --@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBGCRYPT_TRUE@am__append_115 = $(GCRYPT_LDFLAGS) --@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBGCRYPT_TRUE@am__append_116 = $(GCRYPT_LIBS) --@BUILD_PLUGIN_NFS_TRUE@am__append_117 = nfs.la --@BUILD_PLUGIN_FSCACHE_TRUE@am__append_118 = fscache.la --@BUILD_PLUGIN_NGINX_TRUE@am__append_119 = nginx.la --@BUILD_PLUGIN_NGINX_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__append_120 = $(BUILD_WITH_LIBCURL_CFLAGS) --@BUILD_PLUGIN_NGINX_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__append_121 = $(BUILD_WITH_LIBCURL_LIBS) --@BUILD_PLUGIN_NOTIFY_DESKTOP_TRUE@am__append_122 = notify_desktop.la --@BUILD_PLUGIN_NOTIFY_EMAIL_TRUE@am__append_123 = notify_email.la --@BUILD_PLUGIN_NTPD_TRUE@am__append_124 = ntpd.la --@BUILD_PLUGIN_NTPD_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_125 = -lsocket --@BUILD_PLUGIN_NUMA_TRUE@am__append_126 = numa.la --@BUILD_PLUGIN_NUT_TRUE@am__append_127 = nut.la --@BUILD_PLUGIN_OLSRD_TRUE@am__append_128 = olsrd.la --@BUILD_PLUGIN_OLSRD_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_129 = -lsocket --@BUILD_PLUGIN_ONEWIRE_TRUE@am__append_130 = onewire.la --@BUILD_PLUGIN_OPENLDAP_TRUE@am__append_131 = openldap.la --@BUILD_PLUGIN_OPENVPN_TRUE@am__append_132 = openvpn.la --@BUILD_PLUGIN_ORACLE_TRUE@am__append_133 = oracle.la --@BUILD_PLUGIN_PERL_TRUE@am__append_134 = perl.la -+@BUILD_PLUGIN_NETSTAT_UDP_TRUE@am__append_112 = netstat_udp.la -+@BUILD_PLUGIN_NETWORK_TRUE@am__append_113 = network.la -+@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_114 = -lsocket -+@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBGCRYPT_TRUE@am__append_115 = $(GCRYPT_CPPFLAGS) -+@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBGCRYPT_TRUE@am__append_116 = $(GCRYPT_LDFLAGS) -+@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBGCRYPT_TRUE@am__append_117 = $(GCRYPT_LIBS) -+@BUILD_PLUGIN_NFS_TRUE@am__append_118 = nfs.la -+@BUILD_PLUGIN_FSCACHE_TRUE@am__append_119 = fscache.la -+@BUILD_PLUGIN_NGINX_TRUE@am__append_120 = nginx.la -+@BUILD_PLUGIN_NGINX_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__append_121 = $(BUILD_WITH_LIBCURL_CFLAGS) -+@BUILD_PLUGIN_NGINX_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__append_122 = $(BUILD_WITH_LIBCURL_LIBS) -+@BUILD_PLUGIN_NOTIFY_DESKTOP_TRUE@am__append_123 = notify_desktop.la -+@BUILD_PLUGIN_NOTIFY_EMAIL_TRUE@am__append_124 = notify_email.la -+@BUILD_PLUGIN_NTPD_TRUE@am__append_125 = ntpd.la -+@BUILD_PLUGIN_NTPD_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_126 = -lsocket -+@BUILD_PLUGIN_NUMA_TRUE@am__append_127 = numa.la -+@BUILD_PLUGIN_NUT_TRUE@am__append_128 = nut.la -+@BUILD_PLUGIN_OLSRD_TRUE@am__append_129 = olsrd.la -+@BUILD_PLUGIN_OLSRD_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_130 = -lsocket -+@BUILD_PLUGIN_ONEWIRE_TRUE@am__append_131 = onewire.la -+@BUILD_PLUGIN_OPENLDAP_TRUE@am__append_132 = openldap.la -+@BUILD_PLUGIN_OPENVPN_TRUE@am__append_133 = openvpn.la -+@BUILD_PLUGIN_ORACLE_TRUE@am__append_134 = oracle.la -+@BUILD_PLUGIN_PERL_TRUE@am__append_135 = perl.la - # Work-around for issues #41 and #42 - Perl 5.10 incorrectly introduced - # __attribute__nonnull__(3) for Perl_load_module(). --@BUILD_PLUGIN_PERL_TRUE@@HAVE_BROKEN_PERL_LOAD_MODULE_TRUE@am__append_135 = -Wno-nonnull --@BUILD_PLUGIN_PF_TRUE@am__append_136 = pf.la --@BUILD_PLUGIN_PINBA_TRUE@am__append_137 = pinba.la --@BUILD_PLUGIN_PING_TRUE@am__append_138 = ping.la --@BUILD_PLUGIN_POSTGRESQL_TRUE@am__append_139 = postgresql.la --@BUILD_PLUGIN_POWERDNS_TRUE@am__append_140 = powerdns.la --@BUILD_PLUGIN_PYTHON_TRUE@am__append_141 = python.la --@BUILD_PLUGIN_PYTHON_TRUE@@COMPILER_IS_GCC_TRUE@am__append_142 = -fno-strict-aliasing -Wno-strict-aliasing --@BUILD_PLUGIN_PROCESSES_TRUE@am__append_143 = processes.la --@BUILD_PLUGIN_PROCESSES_TRUE@@BUILD_WITH_LIBKVM_GETPROCS_TRUE@am__append_144 = -lkvm --@BUILD_PLUGIN_PROTOCOLS_TRUE@am__append_145 = protocols.la --@BUILD_PLUGIN_REDIS_TRUE@am__append_146 = redis.la --@BUILD_PLUGIN_ROUTEROS_TRUE@am__append_147 = routeros.la --@BUILD_PLUGIN_RRDCACHED_TRUE@am__append_148 = rrdcached.la --@BUILD_PLUGIN_RRDTOOL_TRUE@am__append_149 = rrdtool.la --@BUILD_PLUGIN_SENSORS_TRUE@am__append_150 = sensors.la --@BUILD_PLUGIN_SERIAL_TRUE@am__append_151 = serial.la --@BUILD_PLUGIN_SIGROK_TRUE@am__append_152 = sigrok.la --@BUILD_PLUGIN_SMART_TRUE@@BUILD_WITH_LIBUDEV_TRUE@am__append_153 = smart.la --@BUILD_PLUGIN_SNMP_TRUE@am__append_154 = snmp.la --@BUILD_PLUGIN_SNMP_TRUE@@BUILD_WITH_LIBNETSNMP_TRUE@am__append_155 = $(BUILD_WITH_LIBSNMP_CFLAGS) --@BUILD_PLUGIN_SNMP_TRUE@@BUILD_WITH_LIBNETSNMP_TRUE@am__append_156 = $(BUILD_WITH_LIBSNMP_LIBS) --@BUILD_PLUGIN_SNMP_TRUE@@BUILD_WITH_LIBPTHREAD_TRUE@am__append_157 = -lpthread --@BUILD_PLUGIN_STATSD_TRUE@am__append_158 = statsd.la --@BUILD_PLUGIN_SWAP_TRUE@am__append_159 = swap.la --@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@am__append_160 = -lkstat --@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBDEVINFO_TRUE@am__append_161 = -ldevinfo --@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBKVM_GETSWAPINFO_TRUE@am__append_162 = -lkvm --@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_163 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS) --@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_164 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS) --@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_PERFSTAT_TRUE@am__append_165 = -lperfstat --@BUILD_PLUGIN_SYSLOG_TRUE@am__append_166 = syslog.la --@BUILD_PLUGIN_TABLE_TRUE@am__append_167 = table.la --@BUILD_PLUGIN_TAIL_TRUE@am__append_168 = tail.la --@BUILD_PLUGIN_TAIL_CSV_TRUE@am__append_169 = tail_csv.la --@BUILD_PLUGIN_TAPE_TRUE@am__append_170 = tape.la --@BUILD_PLUGIN_TARGET_NOTIFICATION_TRUE@am__append_171 = target_notification.la --@BUILD_PLUGIN_TARGET_REPLACE_TRUE@am__append_172 = target_replace.la --@BUILD_PLUGIN_TARGET_SCALE_TRUE@am__append_173 = target_scale.la --@BUILD_PLUGIN_TARGET_SET_TRUE@am__append_174 = target_set.la --@BUILD_PLUGIN_TARGET_V5UPGRADE_TRUE@am__append_175 = target_v5upgrade.la --@BUILD_PLUGIN_TCPCONNS_TRUE@am__append_176 = tcpconns.la --@BUILD_PLUGIN_TCPCONNS_TRUE@@BUILD_WITH_LIBKVM_NLIST_TRUE@am__append_177 = -lkvm --@BUILD_PLUGIN_TEAMSPEAK2_TRUE@am__append_178 = teamspeak2.la --@BUILD_PLUGIN_TED_TRUE@am__append_179 = ted.la --@BUILD_PLUGIN_THERMAL_TRUE@am__append_180 = thermal.la --@BUILD_PLUGIN_THRESHOLD_TRUE@am__append_181 = threshold.la --@BUILD_PLUGIN_TOKYOTYRANT_TRUE@am__append_182 = tokyotyrant.la --@BUILD_PLUGIN_TOKYOTYRANT_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_183 = -lsocket --@BUILD_PLUGIN_TURBOSTAT_TRUE@am__append_184 = turbostat.la --@BUILD_PLUGIN_UNIXSOCK_TRUE@am__append_185 = unixsock.la --@BUILD_PLUGIN_UPTIME_TRUE@am__append_186 = uptime.la --@BUILD_PLUGIN_UPTIME_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@am__append_187 = -lkstat --@BUILD_PLUGIN_UPTIME_TRUE@@BUILD_WITH_PERFSTAT_TRUE@am__append_188 = -lperfstat --@BUILD_PLUGIN_USERS_TRUE@am__append_189 = users.la --@BUILD_PLUGIN_USERS_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_190 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS) --@BUILD_PLUGIN_USERS_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_191 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS) --@BUILD_PLUGIN_UUID_TRUE@am__append_192 = uuid.la --@BUILD_PLUGIN_VARNISH_TRUE@am__append_193 = varnish.la --@BUILD_PLUGIN_VIRT_TRUE@am__append_194 = virt.la --@BUILD_PLUGIN_VMEM_TRUE@am__append_195 = vmem.la --@BUILD_PLUGIN_VSERVER_TRUE@am__append_196 = vserver.la --@BUILD_PLUGIN_WIRELESS_TRUE@am__append_197 = wireless.la --@BUILD_PLUGIN_WRITE_GRAPHITE_TRUE@am__append_198 = write_graphite.la --@BUILD_PLUGIN_WRITE_HTTP_TRUE@am__append_199 = write_http.la --@BUILD_PLUGIN_WRITE_HTTP_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__append_200 = $(BUILD_WITH_LIBCURL_CFLAGS) --@BUILD_PLUGIN_WRITE_HTTP_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__append_201 = $(BUILD_WITH_LIBCURL_LIBS) --@BUILD_PLUGIN_WRITE_KAFKA_TRUE@am__append_202 = write_kafka.la --@BUILD_PLUGIN_WRITE_LOG_TRUE@am__append_203 = write_log.la --@BUILD_PLUGIN_WRITE_MONGODB_TRUE@am__append_204 = write_mongodb.la --@BUILD_PLUGIN_WRITE_REDIS_TRUE@am__append_205 = write_redis.la --@BUILD_PLUGIN_WRITE_RIEMANN_TRUE@am__append_206 = write_riemann.la --@BUILD_PLUGIN_WRITE_SENSU_TRUE@am__append_207 = write_sensu.la --@BUILD_PLUGIN_WRITE_TSDB_TRUE@am__append_208 = write_tsdb.la --@BUILD_PLUGIN_XMMS_TRUE@am__append_209 = xmms.la --@BUILD_PLUGIN_ZFS_ARC_TRUE@am__append_210 = zfs_arc.la --@BUILD_PLUGIN_ZOOKEEPER_TRUE@am__append_211 = zookeeper.la --@HAVE_PROTOC_C_TRUE@am__append_212 = pinba.pb-c.c pinba.pb-c.h \ --@HAVE_PROTOC_C_TRUE@ riemann.pb-c.c riemann.pb-c.h -+@BUILD_PLUGIN_PERL_TRUE@@HAVE_BROKEN_PERL_LOAD_MODULE_TRUE@am__append_136 = -Wno-nonnull -+@BUILD_PLUGIN_PF_TRUE@am__append_137 = pf.la -+@BUILD_PLUGIN_PINBA_TRUE@am__append_138 = pinba.la -+@BUILD_PLUGIN_PING_TRUE@am__append_139 = ping.la -+@BUILD_PLUGIN_POSTGRESQL_TRUE@am__append_140 = postgresql.la -+@BUILD_PLUGIN_POWERDNS_TRUE@am__append_141 = powerdns.la -+@BUILD_PLUGIN_PYTHON_TRUE@am__append_142 = python.la -+@BUILD_PLUGIN_PYTHON_TRUE@@COMPILER_IS_GCC_TRUE@am__append_143 = -fno-strict-aliasing -Wno-strict-aliasing -+@BUILD_PLUGIN_PROCESSES_TRUE@am__append_144 = processes.la -+@BUILD_PLUGIN_PROCESSES_TRUE@@BUILD_WITH_LIBKVM_GETPROCS_TRUE@am__append_145 = -lkvm -+@BUILD_PLUGIN_PROTOCOLS_TRUE@am__append_146 = protocols.la -+@BUILD_PLUGIN_REDIS_TRUE@am__append_147 = redis.la -+@BUILD_PLUGIN_ROUTEROS_TRUE@am__append_148 = routeros.la -+@BUILD_PLUGIN_RRDCACHED_TRUE@am__append_149 = rrdcached.la -+@BUILD_PLUGIN_RRDTOOL_TRUE@am__append_150 = rrdtool.la -+@BUILD_PLUGIN_SENSORS_TRUE@am__append_151 = sensors.la -+@BUILD_PLUGIN_SERIAL_TRUE@am__append_152 = serial.la -+@BUILD_PLUGIN_SIGROK_TRUE@am__append_153 = sigrok.la -+@BUILD_PLUGIN_SMART_TRUE@@BUILD_WITH_LIBUDEV_TRUE@am__append_154 = smart.la -+@BUILD_PLUGIN_SNMP_TRUE@am__append_155 = snmp.la -+@BUILD_PLUGIN_SNMP_TRUE@@BUILD_WITH_LIBNETSNMP_TRUE@am__append_156 = $(BUILD_WITH_LIBSNMP_CFLAGS) -+@BUILD_PLUGIN_SNMP_TRUE@@BUILD_WITH_LIBNETSNMP_TRUE@am__append_157 = $(BUILD_WITH_LIBSNMP_LIBS) -+@BUILD_PLUGIN_SNMP_TRUE@@BUILD_WITH_LIBPTHREAD_TRUE@am__append_158 = -lpthread -+@BUILD_PLUGIN_STATSD_TRUE@am__append_159 = statsd.la -+@BUILD_PLUGIN_SWAP_TRUE@am__append_160 = swap.la -+@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@am__append_161 = -lkstat -+@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBDEVINFO_TRUE@am__append_162 = -ldevinfo -+@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBKVM_GETSWAPINFO_TRUE@am__append_163 = -lkvm -+@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_164 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS) -+@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_165 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS) -+@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_PERFSTAT_TRUE@am__append_166 = -lperfstat -+@BUILD_PLUGIN_SYSLOG_TRUE@am__append_167 = syslog.la -+@BUILD_PLUGIN_TABLE_TRUE@am__append_168 = table.la -+@BUILD_PLUGIN_TAIL_TRUE@am__append_169 = tail.la -+@BUILD_PLUGIN_TAIL_CSV_TRUE@am__append_170 = tail_csv.la -+@BUILD_PLUGIN_TAPE_TRUE@am__append_171 = tape.la -+@BUILD_PLUGIN_TARGET_NOTIFICATION_TRUE@am__append_172 = target_notification.la -+@BUILD_PLUGIN_TARGET_REPLACE_TRUE@am__append_173 = target_replace.la -+@BUILD_PLUGIN_TARGET_SCALE_TRUE@am__append_174 = target_scale.la -+@BUILD_PLUGIN_TARGET_SET_TRUE@am__append_175 = target_set.la -+@BUILD_PLUGIN_TARGET_V5UPGRADE_TRUE@am__append_176 = target_v5upgrade.la -+@BUILD_PLUGIN_TCPCONNS_TRUE@am__append_177 = tcpconns.la -+@BUILD_PLUGIN_TCPCONNS_TRUE@@BUILD_WITH_LIBKVM_NLIST_TRUE@am__append_178 = -lkvm -+@BUILD_PLUGIN_TEAMSPEAK2_TRUE@am__append_179 = teamspeak2.la -+@BUILD_PLUGIN_TED_TRUE@am__append_180 = ted.la -+@BUILD_PLUGIN_THERMAL_TRUE@am__append_181 = thermal.la -+@BUILD_PLUGIN_THRESHOLD_TRUE@am__append_182 = threshold.la -+@BUILD_PLUGIN_TOKYOTYRANT_TRUE@am__append_183 = tokyotyrant.la -+@BUILD_PLUGIN_TOKYOTYRANT_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_184 = -lsocket -+@BUILD_PLUGIN_TURBOSTAT_TRUE@am__append_185 = turbostat.la -+@BUILD_PLUGIN_UNIXSOCK_TRUE@am__append_186 = unixsock.la -+@BUILD_PLUGIN_UPTIME_TRUE@am__append_187 = uptime.la -+@BUILD_PLUGIN_UPTIME_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@am__append_188 = -lkstat -+@BUILD_PLUGIN_UPTIME_TRUE@@BUILD_WITH_PERFSTAT_TRUE@am__append_189 = -lperfstat -+@BUILD_PLUGIN_USERS_TRUE@am__append_190 = users.la -+@BUILD_PLUGIN_USERS_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_191 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS) -+@BUILD_PLUGIN_USERS_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_192 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS) -+@BUILD_PLUGIN_UUID_TRUE@am__append_193 = uuid.la -+@BUILD_PLUGIN_VARNISH_TRUE@am__append_194 = varnish.la -+@BUILD_PLUGIN_VIRT_TRUE@am__append_195 = virt.la -+@BUILD_PLUGIN_VMEM_TRUE@am__append_196 = vmem.la -+@BUILD_PLUGIN_VSERVER_TRUE@am__append_197 = vserver.la -+@BUILD_PLUGIN_WIRELESS_TRUE@am__append_198 = wireless.la -+@BUILD_PLUGIN_WRITE_GRAPHITE_TRUE@am__append_199 = write_graphite.la -+@BUILD_PLUGIN_WRITE_HTTP_TRUE@am__append_200 = write_http.la -+@BUILD_PLUGIN_WRITE_HTTP_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__append_201 = $(BUILD_WITH_LIBCURL_CFLAGS) -+@BUILD_PLUGIN_WRITE_HTTP_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__append_202 = $(BUILD_WITH_LIBCURL_LIBS) -+@BUILD_PLUGIN_WRITE_KAFKA_TRUE@am__append_203 = write_kafka.la -+@BUILD_PLUGIN_WRITE_LOG_TRUE@am__append_204 = write_log.la -+@BUILD_PLUGIN_WRITE_MONGODB_TRUE@am__append_205 = write_mongodb.la -+@BUILD_PLUGIN_WRITE_REDIS_TRUE@am__append_206 = write_redis.la -+@BUILD_PLUGIN_WRITE_RIEMANN_TRUE@am__append_207 = write_riemann.la -+@BUILD_PLUGIN_WRITE_SENSU_TRUE@am__append_208 = write_sensu.la -+@BUILD_PLUGIN_WRITE_TSDB_TRUE@am__append_209 = write_tsdb.la -+@BUILD_PLUGIN_XMMS_TRUE@am__append_210 = xmms.la -+@BUILD_PLUGIN_ZFS_ARC_TRUE@am__append_211 = zfs_arc.la -+@BUILD_PLUGIN_ZOOKEEPER_TRUE@am__append_212 = zookeeper.la - @HAVE_PROTOC_C_TRUE@am__append_213 = pinba.pb-c.c pinba.pb-c.h \ - @HAVE_PROTOC_C_TRUE@ riemann.pb-c.c riemann.pb-c.h -+@HAVE_PROTOC_C_TRUE@am__append_214 = pinba.pb-c.c pinba.pb-c.h \ -+@HAVE_PROTOC_C_TRUE@ riemann.pb-c.c riemann.pb-c.h - check_PROGRAMS = test_utils_mount$(EXEEXT) \ - test_utils_vl_lookup$(EXEEXT) - TESTS = test_utils_mount$(EXEEXT) test_utils_vl_lookup$(EXEEXT) - subdir = src --DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -- $(srcdir)/config.h.in $(srcdir)/collectd.conf.in \ -- $(top_srcdir)/libltdl/config/depcomp $(dist_man_MANS) \ -- $(top_srcdir)/libltdl/config/test-driver - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/configure.ac - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) - mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = config.h - CONFIG_CLEAN_FILES = collectd.conf -@@ -977,6 +985,17 @@ netlink_la_LINK = $(LIBTOOL) $(AM_V_lt) - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(netlink_la_CFLAGS) \ - $(CFLAGS) $(netlink_la_LDFLAGS) $(LDFLAGS) -o $@ - @BUILD_PLUGIN_NETLINK_TRUE@am_netlink_la_rpath = -rpath $(pkglibdir) -+netstat_udp_la_LIBADD = -+am__netstat_udp_la_SOURCES_DIST = netstat_udp.c -+@BUILD_PLUGIN_NETSTAT_UDP_TRUE@am_netstat_udp_la_OBJECTS = \ -+@BUILD_PLUGIN_NETSTAT_UDP_TRUE@ netstat_udp.lo -+netstat_udp_la_OBJECTS = $(am_netstat_udp_la_OBJECTS) -+netstat_udp_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ -+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -+ $(AM_CFLAGS) $(CFLAGS) $(netstat_udp_la_LDFLAGS) $(LDFLAGS) -o \ -+ $@ -+@BUILD_PLUGIN_NETSTAT_UDP_TRUE@am_netstat_udp_la_rpath = -rpath \ -+@BUILD_PLUGIN_NETSTAT_UDP_TRUE@ $(pkglibdir) - @BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBGCRYPT_TRUE@am__DEPENDENCIES_11 = $(am__DEPENDENCIES_1) - @BUILD_PLUGIN_NETWORK_TRUE@network_la_DEPENDENCIES = \ - @BUILD_PLUGIN_NETWORK_TRUE@ $(am__DEPENDENCIES_1) \ -@@ -1780,7 +1799,8 @@ SOURCES = $(aggregation_la_SOURCES) $(am - $(memcached_la_SOURCES) $(memory_la_SOURCES) $(mic_la_SOURCES) \ - $(modbus_la_SOURCES) $(multimeter_la_SOURCES) \ - $(mysql_la_SOURCES) $(netapp_la_SOURCES) $(netlink_la_SOURCES) \ -- $(network_la_SOURCES) $(nfs_la_SOURCES) $(nginx_la_SOURCES) \ -+ $(netstat_udp_la_SOURCES) $(network_la_SOURCES) \ -+ $(nfs_la_SOURCES) $(nginx_la_SOURCES) \ - $(notify_desktop_la_SOURCES) $(notify_email_la_SOURCES) \ - $(ntpd_la_SOURCES) $(numa_la_SOURCES) $(nut_la_SOURCES) \ - $(olsrd_la_SOURCES) $(onewire_la_SOURCES) \ -@@ -1857,6 +1877,7 @@ DIST_SOURCES = $(am__aggregation_la_SOUR - $(am__mic_la_SOURCES_DIST) $(am__modbus_la_SOURCES_DIST) \ - $(am__multimeter_la_SOURCES_DIST) $(am__mysql_la_SOURCES_DIST) \ - $(am__netapp_la_SOURCES_DIST) $(am__netlink_la_SOURCES_DIST) \ -+ $(am__netstat_udp_la_SOURCES_DIST) \ - $(am__network_la_SOURCES_DIST) $(am__nfs_la_SOURCES_DIST) \ - $(am__nginx_la_SOURCES_DIST) \ - $(am__notify_desktop_la_SOURCES_DIST) \ -@@ -2132,6 +2153,10 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir) - TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ - $(TEST_LOG_FLAGS) - DIST_SUBDIRS = libcollectdclient liboconfig daemon -+am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in \ -+ $(srcdir)/collectd.conf.in $(srcdir)/config.h.in \ -+ $(top_srcdir)/libltdl/config/depcomp \ -+ $(top_srcdir)/libltdl/config/test-driver - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - am__relativize = \ - dir0=`pwd`; \ -@@ -2275,12 +2300,6 @@ GANGLIA_LIBS = @GANGLIA_LIBS@ - GCRYPT_CPPFLAGS = @GCRYPT_CPPFLAGS@ - GCRYPT_LDFLAGS = @GCRYPT_LDFLAGS@ - GCRYPT_LIBS = @GCRYPT_LIBS@ --GLIB_CFLAGS = @GLIB_CFLAGS@ --GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ --GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ --GLIB_LIBS = @GLIB_LIBS@ --GLIB_MKENUMS = @GLIB_MKENUMS@ --GOBJECT_QUERY = @GOBJECT_QUERY@ - GREP = @GREP@ - INCLTDL = @INCLTDL@ - INSTALL = @INSTALL@ -@@ -2310,9 +2329,6 @@ LIBADD_DL = @LIBADD_DL@ - LIBADD_DLD_LINK = @LIBADD_DLD_LINK@ - LIBADD_DLOPEN = @LIBADD_DLOPEN@ - LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@ --LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ --LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ --LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ - LIBLTDL = @LIBLTDL@ - LIBNETAPP_CPPFLAGS = @LIBNETAPP_CPPFLAGS@ - LIBNETAPP_LDFLAGS = @LIBNETAPP_LDFLAGS@ -@@ -2434,9 +2450,10 @@ PLUGIN_LDFLAGS = -module -avoid-version - AM_CPPFLAGS = -I$(srcdir)/daemon -DPREFIX='"${prefix}"' \ - -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \ - -DLOCALSTATEDIR='"${localstatedir}"' \ -- -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"' \ -+ -DPKGLOCALSTATEDIR='"${localstatedir}/db/${PACKAGE_NAME}"' \ - $(am__append_2) -DPLUGINDIR='"${pkglibdir}"' \ - -DPKGDATADIR='"${pkgdatadir}"' -+egdir = @exec_prefix@/share/examples/@PACKAGE@ - AUTOMAKE_OPTIONS = subdir-objects - noinst_LTLIBRARIES = libmount.la liblookup.la - libmount_la_SOURCES = utils_mount.c utils_mount.h -@@ -2482,32 +2499,33 @@ pkglib_LTLIBRARIES = $(am__append_11) $( - $(am__append_95) $(am__append_96) $(am__append_98) \ - $(am__append_104) $(am__append_105) $(am__append_106) \ - $(am__append_107) $(am__append_110) $(am__append_111) \ -- $(am__append_112) $(am__append_117) $(am__append_118) \ -- $(am__append_119) $(am__append_122) $(am__append_123) \ -- $(am__append_124) $(am__append_126) $(am__append_127) \ -- $(am__append_128) $(am__append_130) $(am__append_131) \ -+ $(am__append_112) $(am__append_113) $(am__append_118) \ -+ $(am__append_119) $(am__append_120) $(am__append_123) \ -+ $(am__append_124) $(am__append_125) $(am__append_127) \ -+ $(am__append_128) $(am__append_129) $(am__append_131) \ - $(am__append_132) $(am__append_133) $(am__append_134) \ -- $(am__append_136) $(am__append_137) $(am__append_138) \ -+ $(am__append_135) $(am__append_137) $(am__append_138) \ - $(am__append_139) $(am__append_140) $(am__append_141) \ -- $(am__append_143) $(am__append_145) $(am__append_146) \ -+ $(am__append_142) $(am__append_144) $(am__append_146) \ - $(am__append_147) $(am__append_148) $(am__append_149) \ - $(am__append_150) $(am__append_151) $(am__append_152) \ -- $(am__append_153) $(am__append_154) $(am__append_158) \ -- $(am__append_159) $(am__append_166) $(am__append_167) \ -+ $(am__append_153) $(am__append_154) $(am__append_155) \ -+ $(am__append_159) $(am__append_160) $(am__append_167) \ - $(am__append_168) $(am__append_169) $(am__append_170) \ - $(am__append_171) $(am__append_172) $(am__append_173) \ - $(am__append_174) $(am__append_175) $(am__append_176) \ -- $(am__append_178) $(am__append_179) $(am__append_180) \ -- $(am__append_181) $(am__append_182) $(am__append_184) \ -- $(am__append_185) $(am__append_186) $(am__append_189) \ -- $(am__append_192) $(am__append_193) $(am__append_194) \ -+ $(am__append_177) $(am__append_179) $(am__append_180) \ -+ $(am__append_181) $(am__append_182) $(am__append_183) \ -+ $(am__append_185) $(am__append_186) $(am__append_187) \ -+ $(am__append_190) $(am__append_193) $(am__append_194) \ - $(am__append_195) $(am__append_196) $(am__append_197) \ -- $(am__append_198) $(am__append_199) $(am__append_202) \ -+ $(am__append_198) $(am__append_199) $(am__append_200) \ - $(am__append_203) $(am__append_204) $(am__append_205) \ - $(am__append_206) $(am__append_207) $(am__append_208) \ -- $(am__append_209) $(am__append_210) $(am__append_211) --BUILT_SOURCES = $(dist_man_MANS) $(am__append_213) --CLEANFILES = $(am__append_212) -+ $(am__append_209) $(am__append_210) $(am__append_211) \ -+ $(am__append_212) -+BUILT_SOURCES = $(dist_man_MANS) $(am__append_214) -+CLEANFILES = $(am__append_213) - @BUILD_PLUGIN_AGGREGATION_TRUE@aggregation_la_SOURCES = aggregation.c \ - @BUILD_PLUGIN_AGGREGATION_TRUE@ utils_vl_lookup.c utils_vl_lookup.h - -@@ -2765,23 +2783,25 @@ CLEANFILES = $(am__append_212) - @BUILD_PLUGIN_NETLINK_TRUE@netlink_la_LDFLAGS = $(PLUGIN_LDFLAGS) - @BUILD_PLUGIN_NETLINK_TRUE@netlink_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBMNL_CFLAGS) - @BUILD_PLUGIN_NETLINK_TRUE@netlink_la_LIBADD = $(BUILD_WITH_LIBMNL_LIBS) -+@BUILD_PLUGIN_NETSTAT_UDP_TRUE@netstat_udp_la_SOURCES = netstat_udp.c -+@BUILD_PLUGIN_NETSTAT_UDP_TRUE@netstat_udp_la_LDFLAGS = $(PLUGIN_LDFLAGS) - @BUILD_PLUGIN_NETWORK_TRUE@network_la_SOURCES = network.c network.h \ - @BUILD_PLUGIN_NETWORK_TRUE@ utils_fbhash.c utils_fbhash.h - - @BUILD_PLUGIN_NETWORK_TRUE@network_la_CPPFLAGS = $(AM_CPPFLAGS) \ --@BUILD_PLUGIN_NETWORK_TRUE@ $(am__append_114) --@BUILD_PLUGIN_NETWORK_TRUE@network_la_LDFLAGS = $(PLUGIN_LDFLAGS) \ - @BUILD_PLUGIN_NETWORK_TRUE@ $(am__append_115) -+@BUILD_PLUGIN_NETWORK_TRUE@network_la_LDFLAGS = $(PLUGIN_LDFLAGS) \ -+@BUILD_PLUGIN_NETWORK_TRUE@ $(am__append_116) - @BUILD_PLUGIN_NETWORK_TRUE@network_la_LIBADD = -lpthread \ --@BUILD_PLUGIN_NETWORK_TRUE@ $(am__append_113) $(am__append_116) -+@BUILD_PLUGIN_NETWORK_TRUE@ $(am__append_114) $(am__append_117) - @BUILD_PLUGIN_NFS_TRUE@nfs_la_SOURCES = nfs.c - @BUILD_PLUGIN_NFS_TRUE@nfs_la_LDFLAGS = $(PLUGIN_LDFLAGS) - @BUILD_PLUGIN_FSCACHE_TRUE@fscache_la_SOURCES = fscache.c - @BUILD_PLUGIN_FSCACHE_TRUE@fscache_la_LDFLAGS = $(PLUGIN_LDFLAGS) - @BUILD_PLUGIN_NGINX_TRUE@nginx_la_SOURCES = nginx.c - @BUILD_PLUGIN_NGINX_TRUE@nginx_la_CFLAGS = $(AM_CFLAGS) \ --@BUILD_PLUGIN_NGINX_TRUE@ $(am__append_120) --@BUILD_PLUGIN_NGINX_TRUE@nginx_la_LIBADD = $(am__append_121) -+@BUILD_PLUGIN_NGINX_TRUE@ $(am__append_121) -+@BUILD_PLUGIN_NGINX_TRUE@nginx_la_LIBADD = $(am__append_122) - @BUILD_PLUGIN_NGINX_TRUE@nginx_la_LDFLAGS = $(PLUGIN_LDFLAGS) - @BUILD_PLUGIN_NOTIFY_DESKTOP_TRUE@notify_desktop_la_SOURCES = notify_desktop.c - @BUILD_PLUGIN_NOTIFY_DESKTOP_TRUE@notify_desktop_la_CFLAGS = $(AM_CFLAGS) $(LIBNOTIFY_CFLAGS) -@@ -2792,7 +2812,7 @@ CLEANFILES = $(am__append_212) - @BUILD_PLUGIN_NOTIFY_EMAIL_TRUE@notify_email_la_LIBADD = -lesmtp -lssl -lcrypto -lpthread - @BUILD_PLUGIN_NTPD_TRUE@ntpd_la_SOURCES = ntpd.c - @BUILD_PLUGIN_NTPD_TRUE@ntpd_la_LDFLAGS = $(PLUGIN_LDFLAGS) --@BUILD_PLUGIN_NTPD_TRUE@ntpd_la_LIBADD = $(am__append_125) -+@BUILD_PLUGIN_NTPD_TRUE@ntpd_la_LIBADD = $(am__append_126) - @BUILD_PLUGIN_NUMA_TRUE@numa_la_SOURCES = numa.c - @BUILD_PLUGIN_NUMA_TRUE@numa_la_LDFLAGS = $(PLUGIN_LDFLAGS) - @BUILD_PLUGIN_NUT_TRUE@nut_la_SOURCES = nut.c -@@ -2801,7 +2821,7 @@ CLEANFILES = $(am__append_212) - @BUILD_PLUGIN_NUT_TRUE@nut_la_LIBADD = -lpthread $(BUILD_WITH_LIBUPSCLIENT_LIBS) - @BUILD_PLUGIN_OLSRD_TRUE@olsrd_la_SOURCES = olsrd.c - @BUILD_PLUGIN_OLSRD_TRUE@olsrd_la_LDFLAGS = $(PLUGIN_LDFLAGS) --@BUILD_PLUGIN_OLSRD_TRUE@olsrd_la_LIBADD = $(am__append_129) -+@BUILD_PLUGIN_OLSRD_TRUE@olsrd_la_LIBADD = $(am__append_130) - @BUILD_PLUGIN_ONEWIRE_TRUE@onewire_la_SOURCES = onewire.c \ - @BUILD_PLUGIN_ONEWIRE_TRUE@ utils_ignorelist.c utils_ignorelist.h - -@@ -2830,7 +2850,7 @@ CLEANFILES = $(am__append_212) - @BUILD_PLUGIN_PERL_TRUE@perl_la_CFLAGS = $(AM_CFLAGS) $(PERL_CFLAGS) \ - @BUILD_PLUGIN_PERL_TRUE@ -DXS_VERSION=\"$(VERSION)\" \ - @BUILD_PLUGIN_PERL_TRUE@ -DVERSION=\"$(VERSION)\" \ --@BUILD_PLUGIN_PERL_TRUE@ $(am__append_135) -+@BUILD_PLUGIN_PERL_TRUE@ $(am__append_136) - @BUILD_PLUGIN_PERL_TRUE@perl_la_LDFLAGS = $(PLUGIN_LDFLAGS) \ - @BUILD_PLUGIN_PERL_TRUE@ $(PERL_LDFLAGS) - -@@ -2858,12 +2878,12 @@ CLEANFILES = $(am__append_212) - @BUILD_PLUGIN_PYTHON_TRUE@python_la_SOURCES = python.c pyconfig.c pyvalues.c cpython.h - @BUILD_PLUGIN_PYTHON_TRUE@python_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_PYTHON_CPPFLAGS) - @BUILD_PLUGIN_PYTHON_TRUE@python_la_CFLAGS = $(AM_CFLAGS) \ --@BUILD_PLUGIN_PYTHON_TRUE@ $(am__append_142) -+@BUILD_PLUGIN_PYTHON_TRUE@ $(am__append_143) - @BUILD_PLUGIN_PYTHON_TRUE@python_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_PYTHON_LDFLAGS) - @BUILD_PLUGIN_PYTHON_TRUE@python_la_LIBADD = $(BUILD_WITH_PYTHON_LIBS) - @BUILD_PLUGIN_PROCESSES_TRUE@processes_la_SOURCES = processes.c - @BUILD_PLUGIN_PROCESSES_TRUE@processes_la_LDFLAGS = $(PLUGIN_LDFLAGS) --@BUILD_PLUGIN_PROCESSES_TRUE@processes_la_LIBADD = $(am__append_144) -+@BUILD_PLUGIN_PROCESSES_TRUE@processes_la_LIBADD = $(am__append_145) - @BUILD_PLUGIN_PROTOCOLS_TRUE@protocols_la_SOURCES = protocols.c \ - @BUILD_PLUGIN_PROTOCOLS_TRUE@ utils_ignorelist.c utils_ignorelist.h - -@@ -2905,9 +2925,9 @@ CLEANFILES = $(am__append_212) - @BUILD_PLUGIN_SNMP_TRUE@snmp_la_SOURCES = snmp.c - @BUILD_PLUGIN_SNMP_TRUE@snmp_la_LDFLAGS = $(PLUGIN_LDFLAGS) - @BUILD_PLUGIN_SNMP_TRUE@snmp_la_CFLAGS = $(AM_CFLAGS) \ --@BUILD_PLUGIN_SNMP_TRUE@ $(am__append_155) --@BUILD_PLUGIN_SNMP_TRUE@snmp_la_LIBADD = $(am__append_156) \ --@BUILD_PLUGIN_SNMP_TRUE@ $(am__append_157) -+@BUILD_PLUGIN_SNMP_TRUE@ $(am__append_156) -+@BUILD_PLUGIN_SNMP_TRUE@snmp_la_LIBADD = $(am__append_157) \ -+@BUILD_PLUGIN_SNMP_TRUE@ $(am__append_158) - @BUILD_PLUGIN_STATSD_TRUE@statsd_la_SOURCES = statsd.c \ - @BUILD_PLUGIN_STATSD_TRUE@ utils_latency.h utils_latency.c - -@@ -2915,11 +2935,11 @@ CLEANFILES = $(am__append_212) - @BUILD_PLUGIN_STATSD_TRUE@statsd_la_LIBADD = -lpthread - @BUILD_PLUGIN_SWAP_TRUE@swap_la_SOURCES = swap.c - @BUILD_PLUGIN_SWAP_TRUE@swap_la_CFLAGS = $(AM_CFLAGS) \ --@BUILD_PLUGIN_SWAP_TRUE@ $(am__append_163) -+@BUILD_PLUGIN_SWAP_TRUE@ $(am__append_164) - @BUILD_PLUGIN_SWAP_TRUE@swap_la_LDFLAGS = $(PLUGIN_LDFLAGS) --@BUILD_PLUGIN_SWAP_TRUE@swap_la_LIBADD = $(am__append_160) \ --@BUILD_PLUGIN_SWAP_TRUE@ $(am__append_161) $(am__append_162) \ --@BUILD_PLUGIN_SWAP_TRUE@ $(am__append_164) $(am__append_165) -+@BUILD_PLUGIN_SWAP_TRUE@swap_la_LIBADD = $(am__append_161) \ -+@BUILD_PLUGIN_SWAP_TRUE@ $(am__append_162) $(am__append_163) \ -+@BUILD_PLUGIN_SWAP_TRUE@ $(am__append_165) $(am__append_166) - @BUILD_PLUGIN_SYSLOG_TRUE@syslog_la_SOURCES = syslog.c - @BUILD_PLUGIN_SYSLOG_TRUE@syslog_la_LDFLAGS = $(PLUGIN_LDFLAGS) - @BUILD_PLUGIN_TABLE_TRUE@table_la_SOURCES = table.c -@@ -2943,7 +2963,7 @@ CLEANFILES = $(am__append_212) - @BUILD_PLUGIN_TARGET_V5UPGRADE_TRUE@target_v5upgrade_la_LDFLAGS = $(PLUGIN_LDFLAGS) - @BUILD_PLUGIN_TCPCONNS_TRUE@tcpconns_la_SOURCES = tcpconns.c - @BUILD_PLUGIN_TCPCONNS_TRUE@tcpconns_la_LDFLAGS = $(PLUGIN_LDFLAGS) --@BUILD_PLUGIN_TCPCONNS_TRUE@tcpconns_la_LIBADD = $(am__append_177) -+@BUILD_PLUGIN_TCPCONNS_TRUE@tcpconns_la_LIBADD = $(am__append_178) - @BUILD_PLUGIN_TEAMSPEAK2_TRUE@teamspeak2_la_SOURCES = teamspeak2.c - @BUILD_PLUGIN_TEAMSPEAK2_TRUE@teamspeak2_la_LDFLAGS = $(PLUGIN_LDFLAGS) - @BUILD_PLUGIN_TED_TRUE@ted_la_SOURCES = ted.c -@@ -2958,7 +2978,7 @@ CLEANFILES = $(am__append_212) - @BUILD_PLUGIN_TOKYOTYRANT_TRUE@tokyotyrant_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBTOKYOTYRANT_CPPFLAGS) - @BUILD_PLUGIN_TOKYOTYRANT_TRUE@tokyotyrant_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBTOKYOTYRANT_LDFLAGS) - @BUILD_PLUGIN_TOKYOTYRANT_TRUE@tokyotyrant_la_LIBADD = $(BUILD_WITH_LIBTOKYOTYRANT_LIBS) \ --@BUILD_PLUGIN_TOKYOTYRANT_TRUE@ $(am__append_183) -+@BUILD_PLUGIN_TOKYOTYRANT_TRUE@ $(am__append_184) - @BUILD_PLUGIN_TURBOSTAT_TRUE@turbostat_la_SOURCES = turbostat.c - @BUILD_PLUGIN_TURBOSTAT_TRUE@turbostat_la_LDFLAGS = $(PLUGIN_LDFLAGS) - @BUILD_PLUGIN_UNIXSOCK_TRUE@unixsock_la_SOURCES = unixsock.c \ -@@ -2975,13 +2995,13 @@ CLEANFILES = $(am__append_212) - @BUILD_PLUGIN_UPTIME_TRUE@uptime_la_SOURCES = uptime.c - @BUILD_PLUGIN_UPTIME_TRUE@uptime_la_CFLAGS = $(AM_CFLAGS) - @BUILD_PLUGIN_UPTIME_TRUE@uptime_la_LDFLAGS = $(PLUGIN_LDFLAGS) --@BUILD_PLUGIN_UPTIME_TRUE@uptime_la_LIBADD = $(am__append_187) \ --@BUILD_PLUGIN_UPTIME_TRUE@ $(am__append_188) -+@BUILD_PLUGIN_UPTIME_TRUE@uptime_la_LIBADD = $(am__append_188) \ -+@BUILD_PLUGIN_UPTIME_TRUE@ $(am__append_189) - @BUILD_PLUGIN_USERS_TRUE@users_la_SOURCES = users.c - @BUILD_PLUGIN_USERS_TRUE@users_la_CFLAGS = $(AM_CFLAGS) \ --@BUILD_PLUGIN_USERS_TRUE@ $(am__append_190) -+@BUILD_PLUGIN_USERS_TRUE@ $(am__append_191) - @BUILD_PLUGIN_USERS_TRUE@users_la_LDFLAGS = $(PLUGIN_LDFLAGS) --@BUILD_PLUGIN_USERS_TRUE@users_la_LIBADD = $(am__append_191) -+@BUILD_PLUGIN_USERS_TRUE@users_la_LIBADD = $(am__append_192) - @BUILD_PLUGIN_UUID_TRUE@uuid_la_SOURCES = uuid.c - @BUILD_PLUGIN_UUID_TRUE@uuid_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBHAL_CFLAGS) - @BUILD_PLUGIN_UUID_TRUE@uuid_la_LIBADD = $(BUILD_WITH_LIBHAL_LIBS) -@@ -3014,9 +3034,9 @@ CLEANFILES = $(am__append_212) - - @BUILD_PLUGIN_WRITE_HTTP_TRUE@write_http_la_LDFLAGS = $(PLUGIN_LDFLAGS) - @BUILD_PLUGIN_WRITE_HTTP_TRUE@write_http_la_CFLAGS = $(AM_CFLAGS) \ --@BUILD_PLUGIN_WRITE_HTTP_TRUE@ $(am__append_200) --@BUILD_PLUGIN_WRITE_HTTP_TRUE@write_http_la_LIBADD = \ - @BUILD_PLUGIN_WRITE_HTTP_TRUE@ $(am__append_201) -+@BUILD_PLUGIN_WRITE_HTTP_TRUE@write_http_la_LIBADD = \ -+@BUILD_PLUGIN_WRITE_HTTP_TRUE@ $(am__append_202) - @BUILD_PLUGIN_WRITE_KAFKA_TRUE@write_kafka_la_SOURCES = write_kafka.c \ - @BUILD_PLUGIN_WRITE_KAFKA_TRUE@ utils_format_graphite.c utils_format_graphite.h \ - @BUILD_PLUGIN_WRITE_KAFKA_TRUE@ utils_format_json.c utils_format_json.h \ -@@ -3108,7 +3128,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/Makefile --.PRECIOUS: Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ -@@ -3385,6 +3404,9 @@ netapp.la: $(netapp_la_OBJECTS) $(netapp - netlink.la: $(netlink_la_OBJECTS) $(netlink_la_DEPENDENCIES) $(EXTRA_netlink_la_DEPENDENCIES) - $(AM_V_CCLD)$(netlink_la_LINK) $(am_netlink_la_rpath) $(netlink_la_OBJECTS) $(netlink_la_LIBADD) $(LIBS) - -+netstat_udp.la: $(netstat_udp_la_OBJECTS) $(netstat_udp_la_DEPENDENCIES) $(EXTRA_netstat_udp_la_DEPENDENCIES) -+ $(AM_V_CCLD)$(netstat_udp_la_LINK) $(am_netstat_udp_la_rpath) $(netstat_udp_la_OBJECTS) $(netstat_udp_la_LIBADD) $(LIBS) -+ - network.la: $(network_la_OBJECTS) $(network_la_DEPENDENCIES) $(EXTRA_network_la_DEPENDENCIES) - $(AM_V_CCLD)$(network_la_LINK) $(am_network_la_rpath) $(network_la_OBJECTS) $(network_la_LIBADD) $(LIBS) - -@@ -3811,6 +3833,7 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netapp_la-netapp.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netapp_la-utils_ignorelist.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netlink_la-netlink.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netstat_udp.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network_la-network.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network_la-utils_fbhash.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nfs.Plo@am__quote@ -@@ -4821,7 +4844,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) - if test -n "$$am__remaking_logs"; then \ - echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ - "recursion detected" >&2; \ -- else \ -+ elif test -n "$$redo_logs"; then \ - am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ - fi; \ - if $(am__make_dryrun); then :; else \ -@@ -5166,6 +5189,8 @@ uninstall-man: uninstall-man1 uninstall- - uninstall-man1 uninstall-man5 uninstall-pkglibLTLIBRARIES \ - uninstall-sbinPROGRAMS - -+.PRECIOUS: Makefile -+ - - .pod.1: - pod2man --release=$(VERSION) --center=$(PACKAGE) $< \ -@@ -5190,13 +5215,8 @@ uninstall-man: uninstall-man1 uninstall- - @HAVE_PROTOC_C_TRUE@ protoc-c -I$(srcdir) --c_out . $(srcdir)/riemann.proto - - install-exec-hook: -- $(mkinstalldirs) $(DESTDIR)$(sysconfdir) -- if test -e $(DESTDIR)$(sysconfdir)/collectd.conf; \ -- then \ -- $(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.pkg-orig; \ -- else \ -- $(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf; \ -- fi; \ -+ $(mkinstalldirs) $(DESTDIR)$(egdir) -+ $(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(egdir)/collectd.conf - $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) - $(INSTALL) -m 0644 $(srcdir)/types.db $(DESTDIR)$(pkgdatadir)/types.db; - $(INSTALL) -m 0644 $(srcdir)/postgresql_default.conf \ -@@ -5204,7 +5224,7 @@ install-exec-hook: - - uninstall-hook: - rm -f $(DESTDIR)$(pkgdatadir)/types.db; -- rm -f $(DESTDIR)$(sysconfdir)/collectd.conf -+ rm -f $(DESTDIR)$(egdir)/collectd.conf - rm -f $(DESTDIR)$(pkgdatadir)/postgresql_default.conf; - - # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/sysutils/collectd/patches/patch-src_collectd-tg.c b/sysutils/collectd/patches/patch-src_collectd-tg.c deleted file mode 100644 index 6fa00abaa00..00000000000 --- a/sysutils/collectd/patches/patch-src_collectd-tg.c +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-src_collectd-tg.c,v 1.1 2015/03/19 13:50:30 jperkin Exp $ - -Don't go past _XOPEN_SOURCE=600 on SunOS. - ---- src/collectd-tg.c.orig 2014-01-26 08:09:14.836391498 +0000 -+++ src/collectd-tg.c -@@ -32,8 +32,12 @@ - #endif - - #ifndef _XOPEN_SOURCE -+#ifdef __sun -+# define _XOPEN_SOURCE 600 -+#else - # define _XOPEN_SOURCE 700 - #endif -+#endif - - #if !__GNUC__ - # define __attribute__(x) /**/ diff --git a/sysutils/collectd/patches/patch-src_config.h.in b/sysutils/collectd/patches/patch-src_config.h.in deleted file mode 100644 index 1929ae35fff..00000000000 --- a/sysutils/collectd/patches/patch-src_config.h.in +++ /dev/null @@ -1,52 +0,0 @@ -$NetBSD: patch-src_config.h.in,v 1.4 2015/09/01 09:00:04 he Exp $ - -Optionally define a few vars for NetBSD. - ---- src/config.h.in.orig 2015-05-27 07:53:03.000000000 +0000 -+++ src/config.h.in -@@ -1246,6 +1246,15 @@ - /* Define to 1 if `imr_ifindex' is a member of `struct ip_mreqn'. */ - #undef HAVE_STRUCT_IP_MREQN_IMR_IFINDEX - -+/* Define if struct kinfo_proc2 exists in the NetBSD variant. */ -+#undef HAVE_STRUCT_KINFO_PROC2_NETBSD -+ -+/* Define to 1 if `p_pid' is a member of `struct kinfo_proc2'. */ -+#undef HAVE_STRUCT_KINFO_PROC2_P_PID -+ -+/* Define to 1 if `p_uru_maxrss' is a member of `struct kinfo_proc2'. */ -+#undef HAVE_STRUCT_KINFO_PROC2_P_URU_MAXRSS -+ - /* Define if struct kinfo_proc exists in the FreeBSD variant. */ - #undef HAVE_STRUCT_KINFO_PROC_FREEBSD - -@@ -1319,6 +1328,9 @@ - /* Define to 1 if you have the `sysctlbyname' function. */ - #undef HAVE_SYSCTLBYNAME - -+/* Define if sysctl supports kern.cp_time */ -+#undef HAVE_SYSCTL_KERN_CP_TIME -+ - /* Define if sysctl supports kern.cp_times */ - #undef HAVE_SYSCTL_KERN_CP_TIMES - -@@ -1375,6 +1387,9 @@ - /* Define to 1 if you have the <sys/resource.h> header file. */ - #undef HAVE_SYS_RESOURCE_H - -+/* Define to 1 if you have the <sys/rndio.h> header file. */ -+#undef HAVE_SYS_RNDIO_H -+ - /* Define to 1 if you have the <sys/select.h> header file. */ - #undef HAVE_SYS_SELECT_H - -@@ -1507,6 +1522,9 @@ - /* True if program is to be compiled for a Linux kernel */ - #undef KERNEL_LINUX - -+/* True if program is to be compiled for a NetBSD kernel */ -+#undef KERNEL_NETBSD -+ - /* True if program is to be compiled for an OpenBSD kernel */ - #undef KERNEL_OPENBSD - diff --git a/sysutils/collectd/patches/patch-src_cpu.c b/sysutils/collectd/patches/patch-src_cpu.c index 13e67c63559..37836cff7b6 100644 --- a/sysutils/collectd/patches/patch-src_cpu.c +++ b/sysutils/collectd/patches/patch-src_cpu.c @@ -1,10 +1,10 @@ -$NetBSD: patch-src_cpu.c,v 1.1 2015/08/26 12:19:27 he Exp $ +$NetBSD: patch-src_cpu.c,v 1.2 2016/10/13 15:17:28 fhajny Exp $ Port this too to NetBSD. ---- src/cpu.c.orig 2015-03-10 14:14:45.000000000 +0000 +--- src/cpu.c.orig 2016-09-11 08:10:25.255038733 +0000 +++ src/cpu.c -@@ -79,7 +79,9 @@ +@@ -80,7 +80,9 @@ #if HAVE_SYSCTL # if defined(CTL_HW) && defined(HW_NCPU) \ @@ -15,36 +15,36 @@ Port this too to NetBSD. # define CAN_USE_SYSCTL 1 # else # define CAN_USE_SYSCTL 0 -@@ -676,6 +678,24 @@ static int cpu_read (void) +@@ -696,6 +698,24 @@ static int cpu_read (void) memset (cpuinfo, 0, sizeof (cpuinfo)); +#if defined(KERN_CP_TIME) && defined(KERNEL_NETBSD) -+ { -+ int mib[] = {CTL_KERN, KERN_CP_TIME}; ++ { ++ int mib[] = {CTL_KERN, KERN_CP_TIME}; + -+ cpuinfo_size = sizeof(cpuinfo[0]) * numcpu * CPUSTATES; -+ status = sysctl(mib, 2, cpuinfo, &cpuinfo_size, NULL, 0); -+ if (status == -1) { -+ char errbuf[1024]; ++ cpuinfo_size = sizeof(cpuinfo[0]) * numcpu * CPUSTATES; ++ status = sysctl(mib, 2, cpuinfo, &cpuinfo_size, NULL, 0); ++ if (status == -1) { ++ char errbuf[1024]; + -+ ERROR ("cpu plugin: sysctl failed: %s.", -+ sstrerror (errno, errbuf, sizeof (errbuf))); -+ return -1; -+ } -+ if (cpuinfo_size == (sizeof(cpuinfo[0]) * CPUSTATES)) { -+ numcpu = 1; -+ } -+ } ++ ERROR ("cpu plugin: sysctl failed: %s.", ++ sstrerror (errno, errbuf, sizeof (errbuf))); ++ return -1; ++ } ++ if (cpuinfo_size == (sizeof(cpuinfo[0]) * CPUSTATES)) { ++ numcpu = 1; ++ } ++ } +#else /* defined(KERN_CP_TIME) && defined(KERNEL_NETBSD) */ #if defined(KERN_CPTIME2) if (numcpu > 1) { - for (i = 0; i < numcpu; i++) { -@@ -715,6 +735,7 @@ static int cpu_read (void) + for (int i = 0; i < numcpu; i++) { +@@ -735,6 +755,7 @@ static int cpu_read (void) cpuinfo[0][i] = cpuinfo_tmp[i]; } } +#endif /* defined(KERN_CP_TIME) && defined(KERNEL_NETBSD) */ - for (i = 0; i < numcpu; i++) { + for (int i = 0; i < numcpu; i++) { cpu_stage (i, COLLECTD_CPU_STATE_USER, (derive_t) cpuinfo[i][CP_USER], now); diff --git a/sysutils/collectd/patches/patch-src_daemon_Makefile.am b/sysutils/collectd/patches/patch-src_daemon_Makefile.am new file mode 100644 index 00000000000..94ea2fcd932 --- /dev/null +++ b/sysutils/collectd/patches/patch-src_daemon_Makefile.am @@ -0,0 +1,15 @@ +$NetBSD: patch-src_daemon_Makefile.am,v 1.1 2016/10/13 15:17:28 fhajny Exp $ + +Use other data directory. + +--- src/daemon/Makefile.am.orig 2016-10-07 06:49:37.631866621 +0000 ++++ src/daemon/Makefile.am +@@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src + AM_CPPFLAGS += -DPREFIX='"${prefix}"' + AM_CPPFLAGS += -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' + AM_CPPFLAGS += -DLOCALSTATEDIR='"${localstatedir}"' +-AM_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"' ++AM_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/db/${PACKAGE_NAME}"' + if BUILD_FEATURE_DAEMON + AM_CPPFLAGS += -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"' + endif diff --git a/sysutils/collectd/patches/patch-src_irq.c b/sysutils/collectd/patches/patch-src_irq.c index 60210423f4e..e6137c418e7 100644 --- a/sysutils/collectd/patches/patch-src_irq.c +++ b/sysutils/collectd/patches/patch-src_irq.c @@ -1,11 +1,11 @@ -$NetBSD: patch-src_irq.c,v 1.2 2016/02/03 15:10:43 he Exp $ +$NetBSD: patch-src_irq.c,v 1.3 2016/10/13 15:17:28 fhajny Exp $ Provide a port to NetBSD. ---- src/irq.c.orig 2014-09-05 08:57:01.000000000 +0000 +--- src/irq.c.orig 2016-09-11 08:10:25.263038721 +0000 +++ src/irq.c -@@ -27,10 +27,22 @@ - #include "configfile.h" +@@ -27,10 +27,20 @@ + #include "plugin.h" #include "utils_ignorelist.h" -#if !KERNEL_LINUX @@ -23,12 +23,10 @@ Provide a port to NetBSD. + +#endif /* KERNEL_NETBSD */ + -+ -+ /* * (Module-)Global variables */ -@@ -90,6 +102,7 @@ static void irq_submit (const char *irq_ +@@ -90,6 +100,7 @@ static void irq_submit (const char *irq_ plugin_dispatch_values (&vl); } /* void irq_submit */ @@ -36,7 +34,7 @@ Provide a port to NetBSD. static int irq_read (void) { FILE *fh; -@@ -183,6 +196,64 @@ static int irq_read (void) +@@ -188,6 +199,64 @@ static int irq_read (void) return (0); } /* int irq_read */ diff --git a/sysutils/collectd/patches/patch-src_libcollectclient_network__buffer.c b/sysutils/collectd/patches/patch-src_libcollectclient_network__buffer.c index b8194f2cb6a..1bf5bce531f 100644 --- a/sysutils/collectd/patches/patch-src_libcollectclient_network__buffer.c +++ b/sysutils/collectd/patches/patch-src_libcollectclient_network__buffer.c @@ -1,18 +1,18 @@ -$NetBSD: patch-src_libcollectclient_network__buffer.c,v 1.1 2014/02/17 11:21:55 fhajny Exp $ +$NetBSD: patch-src_libcollectclient_network__buffer.c,v 1.2 2016/10/13 15:17:28 fhajny Exp $ Need the workaround on at least SunOS too. ---- src/libcollectdclient/network_buffer.c.orig 2014-01-26 08:09:14.868392118 +0000 +--- src/libcollectdclient/network_buffer.c.orig 2016-09-11 08:10:25.263038721 +0000 +++ src/libcollectdclient/network_buffer.c -@@ -37,7 +37,7 @@ +@@ -36,7 +36,7 @@ + #include <pthread.h> #if HAVE_LIBGCRYPT - # include <pthread.h> -# if defined __APPLE__ -+# if defined(__APPLE__) || defined(__sun) ++# if defined __APPLE__ || defined(__sun) /* default xcode compiler throws warnings even when deprecated functionality * is not used. -Werror breaks the build because of erroneous warnings. * http://stackoverflow.com/questions/10556299/compiler-warnings-with-libgcrypt-v1-5-0/12830209#12830209 -@@ -50,7 +50,7 @@ +@@ -49,7 +49,7 @@ */ # define GCRYPT_NO_DEPRECATED # include <gcrypt.h> diff --git a/sysutils/collectd/patches/patch-src_memory.c b/sysutils/collectd/patches/patch-src_memory.c index 706a35e1508..c3b70063a0b 100644 --- a/sysutils/collectd/patches/patch-src_memory.c +++ b/sysutils/collectd/patches/patch-src_memory.c @@ -1,11 +1,11 @@ -$NetBSD: patch-src_memory.c,v 1.2 2015/08/16 08:01:58 he Exp $ +$NetBSD: patch-src_memory.c,v 1.3 2016/10/13 15:17:28 fhajny Exp $ Add a port for NetBSD using VM_UVMEXP2, and preferring sysctl over sysctlbyname. ---- src/memory.c.orig 2015-03-10 14:14:45.000000000 +0000 +--- src/memory.c.orig 2016-09-11 08:10:25.267038716 +0000 +++ src/memory.c -@@ -65,6 +65,10 @@ static mach_port_t port_host; +@@ -66,6 +66,10 @@ static mach_port_t port_host; static vm_size_t pagesize; /* #endif HAVE_HOST_STATISTICS */ @@ -16,8 +16,8 @@ sysctl over sysctlbyname. #elif HAVE_SYSCTLBYNAME /* no global variables */ /* #endif HAVE_SYSCTLBYNAME */ -@@ -78,10 +82,6 @@ static int pagesize; - static kstat_t *ksp; +@@ -80,10 +84,6 @@ static kstat_t *ksp; + static kstat_t *ksz; /* #endif HAVE_LIBKSTAT */ -#elif HAVE_SYSCTL @@ -27,7 +27,7 @@ sysctl over sysctlbyname. #elif HAVE_LIBSTATGRAB /* no global variables */ /* endif HAVE_LIBSTATGRAB */ -@@ -92,6 +92,10 @@ static int pagesize; +@@ -94,6 +94,10 @@ static int pagesize; # error "No applicable input method." #endif @@ -54,8 +54,8 @@ sysctl over sysctlbyname. #elif HAVE_SYSCTLBYNAME /* no init stuff */ /* #endif HAVE_SYSCTLBYNAME */ -@@ -139,15 +152,6 @@ static int memory_init (void) - } +@@ -145,15 +158,6 @@ static int memory_init (void) + /* #endif HAVE_LIBKSTAT */ -#elif HAVE_SYSCTL @@ -70,7 +70,7 @@ sysctl over sysctlbyname. #elif HAVE_LIBSTATGRAB /* no init stuff */ /* #endif HAVE_LIBSTATGRAB */ -@@ -221,6 +225,46 @@ static int memory_read_internal (value_l +@@ -227,6 +231,46 @@ static int memory_read_internal (value_l /* #endif HAVE_HOST_STATISTICS */ #elif HAVE_SYSCTLBYNAME @@ -117,7 +117,7 @@ sysctl over sysctlbyname. /* * vm.stats.vm.v_page_size: 4096 * vm.stats.vm.v_page_count: 246178 -@@ -272,6 +316,8 @@ static int memory_read_internal (value_l +@@ -276,6 +320,8 @@ static int memory_read_internal (value_l "active", (gauge_t) sysctl_vals[4], "inactive", (gauge_t) sysctl_vals[5], "cache", (gauge_t) sysctl_vals[6]); diff --git a/sysutils/collectd/patches/patch-src_swap.c b/sysutils/collectd/patches/patch-src_swap.c index dbac98a1ec3..7b1c49e2af4 100644 --- a/sysutils/collectd/patches/patch-src_swap.c +++ b/sysutils/collectd/patches/patch-src_swap.c @@ -1,11 +1,11 @@ -$NetBSD: patch-src_swap.c,v 1.2 2015/08/11 14:15:00 he Exp $ +$NetBSD: patch-src_swap.c,v 1.3 2016/10/13 15:17:28 fhajny Exp $ Extend support for NetBSD, and add per-swap-device reporting for HAVE_SWAPCTL_THREE_ARGS. ---- src/swap.c.orig 2015-05-20 12:04:47.000000000 +0000 +--- src/swap.c.orig 2016-09-11 08:10:25.271038709 +0000 +++ src/swap.c -@@ -76,9 +76,12 @@ static _Bool report_bytes = 0; +@@ -77,9 +77,12 @@ static _Bool report_bytes = 0; static _Bool report_by_device = 0; /* #endif KERNEL_LINUX */ @@ -19,7 +19,7 @@ reporting for HAVE_SWAPCTL_THREE_ARGS. static _Bool report_by_device = 0; /* #endif HAVE_SWAPCTL && HAVE_SWAPCTL_TWO_ARGS */ -@@ -114,7 +117,7 @@ static int swap_config (oconfig_item_t * +@@ -117,7 +120,7 @@ static int swap_config (oconfig_item_t * { oconfig_item_t *child = ci->children + i; if (strcasecmp ("ReportBytes", child->key) == 0) @@ -28,7 +28,7 @@ reporting for HAVE_SWAPCTL_THREE_ARGS. cf_util_get_boolean (child, &report_bytes); #else WARNING ("swap plugin: The \"ReportBytes\" option " -@@ -147,7 +150,7 @@ static int swap_init (void) /* {{{ */ +@@ -150,7 +153,7 @@ static int swap_init (void) /* {{{ */ pagesize = (derive_t) sysconf (_SC_PAGESIZE); /* #endif KERNEL_LINUX */ @@ -37,7 +37,7 @@ reporting for HAVE_SWAPCTL_THREE_ARGS. /* getpagesize(3C) tells me this does not fail.. */ pagesize = (derive_t) getpagesize (); /* #endif HAVE_SWAPCTL */ -@@ -213,7 +216,7 @@ static void swap_submit_usage (char cons +@@ -216,7 +219,7 @@ static void swap_submit_usage (char cons other_name, other_value, NULL); } /* }}} void swap_submit_usage */ @@ -46,7 +46,7 @@ reporting for HAVE_SWAPCTL_THREE_ARGS. __attribute__((nonnull(1))) static void swap_submit_derive (char const *type_instance, /* {{{ */ derive_t value) -@@ -614,6 +617,43 @@ static int swap_read (void) /* {{{ */ +@@ -618,6 +621,43 @@ static int swap_read (void) /* {{{ */ /* #endif HAVE_SWAPCTL && HAVE_SWAPCTL_TWO_ARGS */ #elif HAVE_SWAPCTL && HAVE_SWAPCTL_THREE_ARGS @@ -90,14 +90,14 @@ reporting for HAVE_SWAPCTL_THREE_ARGS. static int swap_read (void) /* {{{ */ { struct swapent *swap_entries; -@@ -660,23 +700,53 @@ static int swap_read (void) /* {{{ */ +@@ -663,12 +703,33 @@ static int swap_read (void) /* {{{ */ * swap_entries[i].se_path */ - for (i = 0; i < swap_num; i++) + for (int i = 0; i < swap_num; i++) { + char path[PATH_MAX]; + gauge_t this_used; + gauge_t this_total; -+ ++ if ((swap_entries[i].se_flags & SWF_ENABLE) == 0) continue; @@ -108,8 +108,8 @@ reporting for HAVE_SWAPCTL_THREE_ARGS. + * C_SWAP_BLOCK_SIZE; + this_total = ((gauge_t) swap_entries[i].se_nblks) + * C_SWAP_BLOCK_SIZE; -+ -+ ++ ++ + /* Shortcut for the "combined" setting (default) */ + if (!report_by_device) + { @@ -122,26 +122,21 @@ reporting for HAVE_SWAPCTL_THREE_ARGS. + escape_slashes (path, sizeof (path)); + + swap_submit_usage (path, this_used, this_total - this_used, -+ NULL, NAN); ++ NULL, NAN); + } /* for (swap_num) */ -+ if (total < used) { - ERROR ("swap plugin: Total swap space (%g) is less than used swap space (%g).", - total, used); -+ sfree (swap_entries); - return (-1); +@@ -679,8 +740,15 @@ static int swap_read (void) /* {{{ */ } -- swap_submit_usage (NULL, used, total - used, NULL, NAN); + swap_submit_usage (NULL, used, total - used, NULL, NAN); + /* If the "separate" option was specified (report_by_device == 1), all + * values have already been dispatched from within the loop. */ + if (!report_by_device) + swap_submit_usage (NULL, used, total - used, NULL, NAN); sfree (swap_entries); -+ +#if KERNEL_NETBSD + swap_read_io (); +#endif diff --git a/sysutils/collectd/patches/patch-version-gen.sh b/sysutils/collectd/patches/patch-version-gen.sh deleted file mode 100644 index 6ca0cc93fd2..00000000000 --- a/sysutils/collectd/patches/patch-version-gen.sh +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-version-gen.sh,v 1.1 2015/08/11 13:19:21 he Exp $ - -For work in pkgsrc, also strip '.git' suffix. - ---- version-gen.sh.orig 2015-05-26 20:23:28.000000000 +0000 -+++ version-gen.sh -@@ -8,6 +8,6 @@ if test -z "$VERSION"; then - VERSION="$DEFAULT_VERSION" - fi - --VERSION="`echo \"$VERSION\" | sed -e 's/-/./g'`" -+VERSION="`echo \"$VERSION\" | sed -e 's/-/./g' | sed -e 's/.git//'`" - - printf "%s" "$VERSION" |