Update sysutils/collectd to 5.7.2.

- Build system: The Notify Email plugin is no longer linked with
  indirect dependencies.
- collectd: A race condition when calculating a metric's rate has been
  fixed.
- AMQP, Exec, UnixSock, Write Kafka plugins: Parsing of the PUTVAL
  command with multiple values has been fixed.
- AMQP plugin: The "ExchangeType" option is now also valid for
  publishers.
- BIND plugin: Fix parsing of the sample time provided by BIND.
  Previously, the time was assumed to be in the local timezone when in
  fact it was in UTC.
- BIND plugin: Memory leaks have been fixed.
- cURL-JSON plugin: Handling of arrays has been fixed.
- DPDKStat plugin: Error handling during initialization has been
  improved.
- DPDKStat plugin: Handling of a number of metrics has been improved,
  for example "rx_q0bytes".
- Intel RDT plugin: Configuration handling has been changed to be more
  graceful.
- Log Logstash plugin: If writing the log entry fails, print it to
  "STDERR" instead.
- LogFile plugin: If writing to the file fails, print log messages on
  "STDERR" instead.
- memcachec, Tail plugins: A resource leak in the matching
  infrastructure has been fixed.
- MQTT plugin: Invalid symbols in topic names are now replaced and a
  resource leak has been fixed.
- Network plugin: A potential endless-loop has been fixed. This can be
  triggered remotely by sending a signed network packet to a server
  which is not set up to check signatures.
- Perl plugin: A potential double-free has been fixed.
- Processes plugin: A compilation error on AIX has been fixed.
- SMART plugin: A check for the "CAP_SYS_RAWIO" capability has been
  added.
- Write Graphite plugin: Error handling in the case that calculating a
  metric's rate fails has been improved. Previously, the raw counter
  values were sent to Graphite.
- Write Prometheus plugin: An incorrect use of "realloc(3)" has been
  fixed.

8 files changed, 12 insertions, 59 deletions

diff --git a/sysutils/collectd-curl/Makefile b/sysutils/collectd-curl/Makefile
index 5db1c660119..8c17386801d 100644
--- a/sysutils/collectd-curl/Makefile
+++ b/sysutils/collectd-curl/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2017/04/30 01:22:00 ryoon Exp $
+# $NetBSD: Makefile,v 1.8 2017/06/14 13:42:53 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=		1
 
 .include "../../sysutils/collectd/Makefile.common"
 
diff --git a/sysutils/collectd-network/Makefile b/sysutils/collectd-network/Makefile
index 9ca531102f9..ccd7fb5976e 100644
--- a/sysutils/collectd-network/Makefile
+++ b/sysutils/collectd-network/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2017/04/13 17:48:27 fhajny Exp $
+# $NetBSD: Makefile,v 1.3 2017/06/14 13:42:53 fhajny Exp $
 
 COLLECTD_PACKAGE=	network
-PKGREVISION=		1
 
 COMMENT=		Statistics collection daemon - network plugin
 
diff --git a/sysutils/collectd-rrdtool/Makefile b/sysutils/collectd-rrdtool/Makefile
index 4969018082c..47244b1ae73 100644
--- a/sysutils/collectd-rrdtool/Makefile
+++ b/sysutils/collectd-rrdtool/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2017/02/12 06:25:58 ryoon Exp $
+# $NetBSD: Makefile,v 1.8 2017/06/14 13:42:53 fhajny Exp $
 
 COLLECTD_PACKAGE=	rrdtool
 COLLECTD_PLUGINS=	rrdtool rrdcached
 
 COMMENT=		Statistics collection daemon - rrdtool plugins
-PKGREVISION=		2
 
 .include "../../sysutils/collectd/Makefile.common"
 
diff --git a/sysutils/collectd/Makefile b/sysutils/collectd/Makefile
index 54904466bbc..f80ad7ad4c2 100644
--- a/sysutils/collectd/Makefile
+++ b/sysutils/collectd/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2017/04/06 09:12:02 fhajny Exp $
+# $NetBSD: Makefile,v 1.22 2017/06/14 13:42:53 fhajny Exp $
 
 .include "../../sysutils/collectd/Makefile.common"
 
-PKGREVISION=	1
 COMMENT=	Statistics collection daemon base
 
 RCD_SCRIPTS=	collectd
diff --git a/sysutils/collectd/Makefile.common b/sysutils/collectd/Makefile.common
index ed0662633ca..b7b7de0c195 100644
--- a/sysutils/collectd/Makefile.common
+++ b/sysutils/collectd/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2017/01/25 14:10:18 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.15 2017/06/14 13:42:53 fhajny Exp $
 #
 # used by sysutils/collectd/Makefile
 # used by sysutils/collectd-amqp/Makefile
@@ -16,7 +16,7 @@
 # used by sysutils/p5-collectd/Makefile
 # used by sysutils/py-collectd/Makefile
 
-DISTNAME=	collectd-5.7.1
+DISTNAME=	collectd-5.7.2
 MASTER_SITES=	http://collectd.org/files/
 CATEGORIES=	sysutils
 EXTRACT_SUFX=	.tar.bz2
diff --git a/sysutils/collectd/distinfo b/sysutils/collectd/distinfo
index 813da4035a1..b66d678d06e 100644
--- a/sysutils/collectd/distinfo
+++ b/sysutils/collectd/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.35 2017/04/06 09:12:02 fhajny Exp $
+$NetBSD: distinfo,v 1.36 2017/06/14 13:42:53 fhajny Exp $
 
-SHA1 (collectd-5.7.1.tar.bz2) = bc77d2493b26e5c38e167a8a44fedfe287742c09
-RMD160 (collectd-5.7.1.tar.bz2) = f743ebb21313ac0bae6a3ba78456e5c16f0d15cc
-SHA512 (collectd-5.7.1.tar.bz2) = f2edf4ecf3bbf5f4e10c797614a7ae39c18678601038574cec4f2ea6a8773444af4592e2872ed75a5afe5f746adaff2449df51443d98d2560a23722e46bef164
-Size (collectd-5.7.1.tar.bz2) = 1797725 bytes
+SHA1 (collectd-5.7.2.tar.bz2) = b27074fc363d942c8aee2f05baed0395a20c86d0
+RMD160 (collectd-5.7.2.tar.bz2) = 81860b4fba7cf05b8eca19913ffe05d06b37e1a2
+SHA512 (collectd-5.7.2.tar.bz2) = 8844b67159f8da2203b5ac57ef19fce0a01050a016174d196b48b5fb24925ad2935af9bdd9af06097ff663499abc496cdcc2d9e9a10f403f8d707c465c1a88f3
+Size (collectd-5.7.2.tar.bz2) = 1798777 bytes
 SHA1 (patch-Makefile.am) = ed45b75293a4ea2dd577d04eeb3b9017b8f47319
 SHA1 (patch-configure.ac) = f450d6b00e5c7c37214b4d90ca057c515ed08fa1
 SHA1 (patch-src_Makefile.am) = 1d5cc2f58ce776df04feab2afc937f12ee7b0765
@@ -17,7 +17,6 @@ SHA1 (patch-src_irq.c) = 78f1757ff2ed6db9fb1d0e773c2a01eb190d53a0
 SHA1 (patch-src_libcollectclient_network__buffer.c) = 62924943831e6d0585b103e567888f9af5c46f9e
 SHA1 (patch-src_memory.c) = 2934cd50e454fc14d0ec952854c88b0a830fa9a7
 SHA1 (patch-src_netstat__udp.c) = 30cb12d25f56c60959658dbd181783212e00cc61
-SHA1 (patch-src_network.c) = 38a537d4b5deef2162bb06c672f936a8aa443daf
 SHA1 (patch-src_processes.c) = 1a75fdaa42f37eef1a968d299c3549e640fb68b2
 SHA1 (patch-src_statsd.c) = 35f4349d2d2c9bddc0f4770344f969157cd012f6
 SHA1 (patch-src_swap.c) = 24da6e04e3006639311e8111f26f72e4fab4054a
diff --git a/sysutils/collectd/patches/patch-src_network.c b/sysutils/collectd/patches/patch-src_network.c
deleted file mode 100644
index d1ebd4c741b..00000000000
--- a/sysutils/collectd/patches/patch-src_network.c
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-src_network.c,v 1.5 2017/04/06 09:12:02 fhajny Exp $
-
-Backport fix for CVE-2017-7401.
-https://github.com/collectd/collectd/commit/f6be4f9b49b949b379326c3d7002476e6ce4f211
-
---- src/network.c.orig	2017-01-23 07:53:57.716449156 +0000
-+++ src/network.c
-@@ -1003,14 +1003,6 @@ static int parse_part_sign_sha256(socken
-   buffer_len = *ret_buffer_len;
-   buffer_offset = 0;
- 
--  if (se->data.server.userdb == NULL) {
--    c_complain(
--        LOG_NOTICE, &complain_no_users,
--        "network plugin: Received signed network packet but can't verify it "
--        "because no user DB has been configured. Will accept it.");
--    return (0);
--  }
--
-   /* Check if the buffer has enough data for this structure. */
-   if (buffer_len <= PART_SIGNATURE_SHA256_SIZE)
-     return (-ENOMEM);
-@@ -1027,6 +1019,18 @@ static int parse_part_sign_sha256(socken
-     return (-1);
-   }
- 
-+  if (se->data.server.userdb == NULL) {
-+    c_complain(
-+        LOG_NOTICE, &complain_no_users,
-+        "network plugin: Received signed network packet but can't verify it "
-+        "because no user DB has been configured. Will accept it.");
-+
-+    *ret_buffer = buffer + pss_head_length;
-+    *ret_buffer_len -= pss_head_length;
-+
-+    return (0);
-+  }
-+
-   /* Copy the hash. */
-   BUFFER_READ(pss.hash, sizeof(pss.hash));
- 
diff --git a/sysutils/p5-collectd/Makefile b/sysutils/p5-collectd/Makefile
index b8db027418b..2f38e445731 100644
--- a/sysutils/p5-collectd/Makefile
+++ b/sysutils/p5-collectd/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2017/06/05 14:24:38 ryoon Exp $
+# $NetBSD: Makefile,v 1.6 2017/06/14 13:42:54 fhajny Exp $
 
 PKGNAME=		p5-${DISTNAME}
-PKGREVISION=		1
 COLLECTD_PACKAGE=	perl
 
 COMMENT=		Statistics collection daemon - perl plugin