pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils Update sysutils/collectd and subpackages to 5...
details: https://anonhg.NetBSD.org/pkgsrc/rev/cf81f516274f
branches: trunk
changeset: 353798:cf81f516274f
user: fhajny <fhajny%pkgsrc.org@localhost>
date: Thu Oct 13 15:17:28 2016 +0000
description:
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:
sysutils/collectd-amqp/Makefile | 3 +-
sysutils/collectd-curl/Makefile | 3 +-
sysutils/collectd-notify-email/Makefile | 3 +-
sysutils/collectd-postgresql/Makefile | 3 +-
sysutils/collectd-riemann/Makefile | 6 +-
sysutils/collectd-snmp/Makefile | 3 +-
sysutils/collectd/Makefile | 5 +-
sysutils/collectd/Makefile.common | 18 +-
sysutils/collectd/PLIST | 8 +-
sysutils/collectd/distinfo | 31 +-
sysutils/collectd/options.mk | 12 +-
sysutils/collectd/patches/patch-Makefile.in | 159 --
sysutils/collectd/patches/patch-configure | 324 -----
sysutils/collectd/patches/patch-configure.ac | 151 +-
sysutils/collectd/patches/patch-src_Makefile.am | 41 +-
sysutils/collectd/patches/patch-src_Makefile.in | 616 ----------
sysutils/collectd/patches/patch-src_collectd-tg.c | 19 -
sysutils/collectd/patches/patch-src_config.h.in | 52 -
sysutils/collectd/patches/patch-src_cpu.c | 42 +-
sysutils/collectd/patches/patch-src_daemon_Makefile.am | 15 +
sysutils/collectd/patches/patch-src_irq.c | 14 +-
sysutils/collectd/patches/patch-src_libcollectclient_network__buffer.c | 12 +-
sysutils/collectd/patches/patch-src_memory.c | 20 +-
sysutils/collectd/patches/patch-src_swap.c | 35 +-
sysutils/collectd/patches/patch-version-gen.sh | 14 -
sysutils/p5-collectd/Makefile | 3 +-
sysutils/py-collectd/Makefile | 5 +-
27 files changed, 162 insertions(+), 1455 deletions(-)
diffs (truncated from 2110 to 300 lines):
diff -r b3adb8acd0d0 -r cf81f516274f sysutils/collectd-amqp/Makefile
--- a/sysutils/collectd-amqp/Makefile Thu Oct 13 14:31:58 2016 +0000
+++ b/sysutils/collectd-amqp/Makefile Thu Oct 13 15:17:28 2016 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2016/03/05 11:29:28 jperkin Exp $
+# $NetBSD: Makefile,v 1.3 2016/10/13 15:17:28 fhajny Exp $
COLLECTD_PACKAGE= amqp
COMMENT= Statistics collection daemon - amqp plugin
-PKGREVISION= 1
.include "../../sysutils/collectd/Makefile.common"
diff -r b3adb8acd0d0 -r cf81f516274f sysutils/collectd-curl/Makefile
--- a/sysutils/collectd-curl/Makefile Thu Oct 13 14:31:58 2016 +0000
+++ b/sysutils/collectd-curl/Makefile Thu Oct 13 15:17:28 2016 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2016/10/07 18:26:10 adam Exp $
+# $NetBSD: Makefile,v 1.4 2016/10/13 15:17:28 fhajny Exp $
COLLECTD_PACKAGE= curl
COLLECTD_PLUGINS= curl curl_json curl_xml apache bind nginx write_http
COMMENT= Statistics collection daemon - curl-based plugins
-PKGREVISION= 2
.include "../../sysutils/collectd/Makefile.common"
diff -r b3adb8acd0d0 -r cf81f516274f sysutils/collectd-notify-email/Makefile
--- a/sysutils/collectd-notify-email/Makefile Thu Oct 13 14:31:58 2016 +0000
+++ b/sysutils/collectd-notify-email/Makefile Thu Oct 13 15:17:28 2016 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2016/03/05 11:29:29 jperkin Exp $
+# $NetBSD: Makefile,v 1.3 2016/10/13 15:17:28 fhajny Exp $
COLLECTD_PACKAGE= notify-email
COMMENT= Statistics collection daemon - notify_email plugin
-PKGREVISION= 1
.include "../../sysutils/collectd/Makefile.common"
diff -r b3adb8acd0d0 -r cf81f516274f sysutils/collectd-postgresql/Makefile
--- a/sysutils/collectd-postgresql/Makefile Thu Oct 13 14:31:58 2016 +0000
+++ b/sysutils/collectd-postgresql/Makefile Thu Oct 13 15:17:28 2016 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2016/10/09 21:42:03 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2016/10/13 15:17:28 fhajny Exp $
COLLECTD_PACKAGE= postgresql
PKGNAME= ${DISTNAME:S/collectd/collectd-${COLLECTD_PACKAGE}${PGSQL_VERSION}/}
-PKGREVISION= 1
COMMENT= Statistics collection daemon - postgresql plugin
.include "../../sysutils/collectd/Makefile.common"
diff -r b3adb8acd0d0 -r cf81f516274f sysutils/collectd-riemann/Makefile
--- a/sysutils/collectd-riemann/Makefile Thu Oct 13 14:31:58 2016 +0000
+++ b/sysutils/collectd-riemann/Makefile Thu Oct 13 15:17:28 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2015/10/28 11:44:52 jperkin Exp $
+# $NetBSD: Makefile,v 1.2 2016/10/13 15:17:28 fhajny Exp $
COLLECTD_PACKAGE= riemann
COLLECTD_PLUGINS= write_riemann
@@ -7,8 +7,6 @@
.include "../../sysutils/collectd/Makefile.common"
-# Work around incorrect dependencies in src/Makefile
-BUILD_TARGET= riemann.pb-c.lo write_riemann.la
-
.include "../../devel/protobuf-c/buildlink3.mk"
+.include "../../sysutils/riemann-client/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r b3adb8acd0d0 -r cf81f516274f sysutils/collectd-snmp/Makefile
--- a/sysutils/collectd-snmp/Makefile Thu Oct 13 14:31:58 2016 +0000
+++ b/sysutils/collectd-snmp/Makefile Thu Oct 13 15:17:28 2016 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2016/03/05 11:29:29 jperkin Exp $
+# $NetBSD: Makefile,v 1.3 2016/10/13 15:17:29 fhajny Exp $
COLLECTD_PACKAGE= snmp
COMMENT= Statistics collection daemon - snmp plugin
-PKGREVISION= 1
.include "../../sysutils/collectd/Makefile.common"
diff -r b3adb8acd0d0 -r cf81f516274f sysutils/collectd/Makefile
--- a/sysutils/collectd/Makefile Thu Oct 13 14:31:58 2016 +0000
+++ b/sysutils/collectd/Makefile Thu Oct 13 15:17:28 2016 +0000
@@ -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 @@
# 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 -r b3adb8acd0d0 -r cf81f516274f sysutils/collectd/Makefile.common
--- a/sysutils/collectd/Makefile.common Thu Oct 13 14:31:58 2016 +0000
+++ b/sysutils/collectd/Makefile.common Thu Oct 13 15:17:28 2016 +0000
@@ -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@localhost
HOMEPAGE= http://collectd.org/
@@ -26,7 +27,7 @@
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+= --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 @@
-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 -r b3adb8acd0d0 -r cf81f516274f sysutils/collectd/PLIST
--- a/sysutils/collectd/PLIST Thu Oct 13 14:31:58 2016 +0000
+++ b/sysutils/collectd/PLIST Thu Oct 13 15:17:28 2016 +0000
@@ -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.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_scale.la
lib/collectd/target_set.la
lib/collectd/target_v5upgrade.la
+${PLIST.tcpconns}lib/collectd/tcpconns.la
lib/collectd/teamspeak2.la
-${PLIST.tcpconns}lib/collectd/tcpconns.la
lib/collectd/threshold.la
lib/collectd/unixsock.la
${PLIST.uptime}lib/collectd/uptime.la
@@ -59,6 +59,7 @@
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/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 -r b3adb8acd0d0 -r cf81f516274f sysutils/collectd/distinfo
--- a/sysutils/collectd/distinfo Thu Oct 13 14:31:58 2016 +0000
+++ b/sysutils/collectd/distinfo Thu Oct 13 15:17:28 2016 +0000
@@ -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 -r b3adb8acd0d0 -r cf81f516274f sysutils/collectd/options.mk
--- a/sysutils/collectd/options.mk Thu Oct 13 14:31:58 2016 +0000
+++ b/sysutils/collectd/options.mk Thu Oct 13 15:17:28 2016 +0000
@@ -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_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 @@
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 -r b3adb8acd0d0 -r cf81f516274f sysutils/collectd/patches/patch-Makefile.in
--- a/sysutils/collectd/patches/patch-Makefile.in Thu Oct 13 14:31:58 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,159 +0,0 @@
Home |
Main Index |
Thread Index |
Old Index