Update collectd to 5.4.2.

- Build system: Numerous fixes.
- collectd: A use-after-free has been fixed in the parse_value() function.
- collectd: Fix carriage return sign in types_list
- collectd: Fix programming error in {{GitFile|src/configfile.c}}
- collectd: An off-by-one error has been fixed in the strstripnewline()
  function.
- collectd: Use the complain mechanism to report filter chain write failures.
- collectd: Spelling and grammar of error messages have been fixed.
- collectdctl: Fixed buffering issues which caused trouble on AIX and
  Solaris.
- Documentation: Details and example about multi-instance filterchain targets
  have been added.
- Documentation: The CollectStatistics option of the RRDCacheD plugin has
  been documented.
- Documentation: The Write Redis plugin has been documented.
- Documentation: The GraphiteSeparateInstances and GraphiteAlwaysAppendDS
  options of the AMQP plugin have been documented.
- Documentation: Documentation of the AutoLoadPlugin option has been improved.
- Aggregation plugin: utils_vl_lookup: A race when creating user objects has
  been fixed.
- CPU plugin: Temperature code for Mac OS X has been removed.
- cURL, cURL-JSON, cURL-XML and Write HTTP plugins: Call curl_global_init()
  in the plugins' init() callback.
- cURL and memcachec plugins: Fix calculation of gauge, average, minimum
  and maximum. Previously, they were calculated from the start of the daemon,
  which is not the documented behavior.
- cURL-JSON plugin: A bug, which triggered when two URLs with a long common
  prefix were configured, was fixed.
- DBI plugin: Compatibility with new versions of libdbi has been restored.
- Exec, UnixSock plugins: Fix parsing of the time option of the PUTNOTIF
  command.
- IPMI plugin: A conflict with the Java plugin over the SIGUSR2 signal
  has been fixed.
- Java plugin: Conversion from Java's time representation to collectd's
  representation has been fixed.
- Java plugin: Make sure cjni_thread_detach() is called on all paths.
- LogFile and SysLog plugins: Avoid total silence in case of
  a misconfiguration.
- Network plugin: Support for recent versions of gcrypt has been added.
- Network plugin: Robustness of the client connecting behavior has been
  improved.
- Python plugin: Don't create empty meta_data_t objects.
- Python plugin: Fix Py list length check in cpy_build_meta().
- Python plugin: The interval member was fixed to export seconds as a double.
- RRDtool and RRDCacheD plugins: A memory leak when creating RRD files
  has been fixed.
- SNMP plugin: Fix a memory leak.
- Statsd plugin: Support for samplerates in timer metrics was added.
- Swap plugin: Fix behavior under OpenVZ by making cached optional.
- Threshold plugin: Population of the time field in notifications has been
  added.
- libvirt plugin: Only gather stats for running domains.
- LVM plugin: An issue with Volume Groups (VGs) without Logical Volumes
  (LVs) has been fixed.
- Write Graphite plugin: Escape characters not supported by Graphite.
- Write HTTP plugin: Make callback names context-dependent.
- Write Redis plugin: A formatting bug, which resulted in totally unusable
  numbers being transmitted to Redis, was fixed.
- Write Riemann plugin: Receive acknowledge message when using TCP.

6 files changed, 33 insertions, 17 deletions

diff --git a/sysutils/collectd-rrdtool/Makefile b/sysutils/collectd-rrdtool/Makefile
index 41d88069ef6..8aa33beb70c 100644
--- a/sysutils/collectd-rrdtool/Makefile
+++ b/sysutils/collectd-rrdtool/Makefile
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/05/05 00:48:19 ryoon Exp $
-
-PKGREVISION=		1
+# $NetBSD: Makefile,v 1.3 2015/04/07 13:20:41 fhajny Exp $
 
 COLLECTD_PACKAGE=	rrdtool
 COLLECTD_PLUGINS=	rrdtool rrdcached
diff --git a/sysutils/collectd/Makefile b/sysutils/collectd/Makefile
index 2e36ab8f0e5..a064b4d673e 100644
--- a/sysutils/collectd/Makefile
+++ b/sysutils/collectd/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2014/07/30 12:28:18 fhajny Exp $
+# $NetBSD: Makefile,v 1.4 2015/04/07 13:20:41 fhajny Exp $
 
 .include "../../sysutils/collectd/Makefile.common"
 
-PKGREVISION=	2
 COMMENT=	Statistics collection daemon base
 
 RCD_SCRIPTS=	collectd
diff --git a/sysutils/collectd/Makefile.common b/sysutils/collectd/Makefile.common
index 327ca5a9762..dd57d9f8473 100644
--- a/sysutils/collectd/Makefile.common
+++ b/sysutils/collectd/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2015/02/24 13:14:05 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.6 2015/04/07 13:20:41 fhajny Exp $
 #
 # used by sysutils/collectd/Makefile
 # used by sysutils/collectd-amqp/Makefile
@@ -13,7 +13,7 @@
 # used by sysutils/collectd-rrdtool/Makefile
 # used by sysutils/collectd-snmp/Makefile
 
-DISTNAME=	collectd-5.4.1
+DISTNAME=	collectd-5.4.2
 MASTER_SITES=	http://collectd.org/files/
 CATEGORIES=	sysutils
 
diff --git a/sysutils/collectd/distinfo b/sysutils/collectd/distinfo
index d8d0e10a7d3..11199eb9241 100644
--- a/sysutils/collectd/distinfo
+++ b/sysutils/collectd/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.5 2015/03/19 13:50:30 jperkin Exp $
+$NetBSD: distinfo,v 1.6 2015/04/07 13:20:41 fhajny Exp $
 
-SHA1 (collectd-5.4.1.tar.gz) = faaccac4daf48449bcefc9d6f9236f98a5dd5b4b
-RMD160 (collectd-5.4.1.tar.gz) = a98ff2d845238d4792f732aa7518effdc95e24f9
-Size (collectd-5.4.1.tar.gz) = 1894132 bytes
+SHA1 (collectd-5.4.2.tar.gz) = 2664808997dd186609ee542895c37bb692d557b6
+RMD160 (collectd-5.4.2.tar.gz) = 5ee7af2d88699d70e57f5106e22e02d6d5479ea2
+Size (collectd-5.4.2.tar.gz) = 2024679 bytes
 SHA1 (patch-Makefile.in) = 197307399312fa26c71ca168b92bbe41d31d556d
-SHA1 (patch-configure) = 34bb022fbe3b3b072a6ea5d86de0711a37ebfa0f
 SHA1 (patch-src_Makefile.in) = 3d227fa1c483944f44b11e49cabb6390ab3b8338
 SHA1 (patch-src_collectd-tg.c) = f9f41dfb0b1b55a62202128a165d5c9943faf5bc
 SHA1 (patch-src_collectd.c) = 31106ca27dd4911c40285fece48f76a1c36e2407
 SHA1 (patch-src_collectd.conf.in) = 97400dbc16a31a440750beed0bc16927afdcb570
 SHA1 (patch-src_df.c) = 19cca888b183a90759b359702e4d65c8afa6e58d
 SHA1 (patch-src_libcollectclient_network__buffer.c) = e07d403d299613fa0885a0e7285849eb85510253
-SHA1 (patch-src_network.c) = b07c206406642b37788dd8d0aefe437158473b97
+SHA1 (patch-src_network.c) = ba4a1083bd3dd6ac4cf94e95c24833125fc8c5f0
 SHA1 (patch-src_tcpconns.c) = a1ad8fa2eb9e899375b7b99d12becb4e98ac4e10
+SHA1 (patch-src_utils__dns.c) = c3782dc9127f42da30e3142b853aa2cb2259af94
diff --git a/sysutils/collectd/patches/patch-src_network.c b/sysutils/collectd/patches/patch-src_network.c
index 77c57edeea1..8e7f5aa60e3 100644
--- a/sysutils/collectd/patches/patch-src_network.c
+++ b/sysutils/collectd/patches/patch-src_network.c
@@ -1,9 +1,9 @@
-$NetBSD: patch-src_network.c,v 1.2 2014/06/14 12:21:02 fhajny Exp $
+$NetBSD: patch-src_network.c,v 1.3 2015/04/07 13:20:41 fhajny Exp $
 
 Remove libgcrypt deprecation logic. Patch by joerg.
---- src/network.c.orig	2014-01-26 08:09:23.000000000 +0000
+--- src/network.c.orig	2015-02-26 11:49:16.681659031 +0000
 +++ src/network.c
-@@ -58,25 +58,7 @@
+@@ -58,27 +58,7 @@
  #endif
  
  #if HAVE_LIBGCRYPT
@@ -25,11 +25,13 @@ Remove libgcrypt deprecation logic. Patch by joerg.
 -/* Re enable deprecation warnings */
 -#  pragma GCC diagnostic warning "-Wdeprecated-declarations"
 -# endif
+-# if GCRYPT_VERSION_NUMBER < 0x010600
 -GCRY_THREAD_OPTION_PTHREAD_IMPL;
+-# endif
  #endif
  
  #ifndef IPV6_ADD_MEMBERSHIP
-@@ -501,17 +483,9 @@ static void network_init_gcrypt (void) /
+@@ -503,19 +483,9 @@ static void network_init_gcrypt (void) /
    if (gcry_control (GCRYCTL_ANY_INITIALIZATION_P))
      return;
  
@@ -40,7 +42,9 @@ Remove libgcrypt deprecation logic. Patch by joerg.
 -  * above doesn't count, as it doesn't implicitly initalize Libgcrypt.
 -  *
 -  * tl;dr: keep all these gry_* statements in this exact order please. */
+-# if GCRYPT_VERSION_NUMBER < 0x010600
 -  gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
+-# endif
    gcry_check_version (NULL);
    gcry_control (GCRYCTL_INIT_SECMEM, 32768);
 -  gcry_control (GCRYCTL_INITIALIZATION_FINISHED);
diff --git a/sysutils/collectd/patches/patch-src_utils__dns.c b/sysutils/collectd/patches/patch-src_utils__dns.c
new file mode 100644
index 00000000000..32dbc604b62
--- /dev/null
+++ b/sysutils/collectd/patches/patch-src_utils__dns.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_utils__dns.c,v 1.1 2015/04/07 13:20:41 fhajny Exp $
+
+Resolve conflict with pkgsrc PCAP on NetBSD 7.
+--- src/utils_dns.c.orig	2015-02-26 10:43:48.496180984 +0000
++++ src/utils_dns.c
+@@ -96,6 +96,9 @@
+ #endif
+ 
+ #if HAVE_PCAP_H
++# if defined(DLT_MATCHING_MAX)
++#  undef DLT_MATCHING_MAX
++# endif
+ # include <pcap.h>
+ #endif
+