app-admin/collectd: Bump to v5.5.2

  - New upstream release (Fixes CVE-2016-6254)

  - Dependency on sys-fs/xfsprogs atom can now be controlled using the
    new "xfs" USE flag.
    If you don't enable "xfs" USE flag the df plugin will be unable to
    filter on XFS partitions.

  - Fixes build issues with sys-fs/xfsprogs-4.7.0 (#590998)

  - Cherry-picked patches for upstream issue "network plugin causes core
    dumps" (#1870)

Gentoo-Bug: https://bugs.gentoo.org/590998

Package-Manager: portage-2.3.0

2 files changed, 164 insertions, 0 deletions

diff --git a/app-admin/collectd/files/collectd-5.5.2-issue-1870.patch b/app-admin/collectd/files/collectd-5.5.2-issue-1870.patch
new file mode 100644
index 000000000000..649727105fe5
--- /dev/null
+++ b/app-admin/collectd/files/collectd-5.5.2-issue-1870.patch
@@ -0,0 +1,127 @@
+From 262915c450f3a45579069212560ca9715aa5bd4b Mon Sep 17 00:00:00 2001
+From: Florian Forster <octo@collectd.org>
+Date: Tue, 26 Jul 2016 08:54:42 +0200
+Subject: [PATCH] network plugin: Fix error message for GCRYCTL_INIT_SECMEM
+ failure.
+
+---
+ src/network.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/network.c b/src/network.c
+index b347f4a..45f2436 100644
+--- a/src/network.c
++++ b/src/network.c
+@@ -527,7 +527,7 @@ static void network_init_gcrypt (void) /* {{{ */
+   err = gcry_control (GCRYCTL_INIT_SECMEM, 32768);
+   if (err)
+   {
+-    ERROR ("network plugin: gcry_control (GCRYCTL_SET_THREAD_CBS) failed: %s", gcry_strerror (err));
++    ERROR ("network plugin: gcry_control (GCRYCTL_INIT_SECMEM) failed: %s", gcry_strerror (err));
+     abort ();
+   }
+ 
+--
+2.9.2
+
+
+From a3000cbe3a12163148a28c818269bbdabda1cf5c Mon Sep 17 00:00:00 2001
+From: Sebastian Harl <sh@tokkee.org>
+Date: Wed, 27 Jul 2016 09:45:48 +0200
+Subject: [PATCH] network plugin: Don't abort() if gcrypt initialization
+ failed.
+
+Instead, report an error and let plugin initialization fail.
+---
+ src/network.c | 31 +++++++++++++++++++++++--------
+ 1 file changed, 23 insertions(+), 8 deletions(-)
+
+diff --git a/src/network.c b/src/network.c
+index 45f2436..71eb1f2 100644
+--- a/src/network.c
++++ b/src/network.c
+@@ -496,7 +496,7 @@ static int network_dispatch_notification (notification_t *n) /* {{{ */
+ } /* }}} int network_dispatch_notification */
+ 
+ #if HAVE_LIBGCRYPT
+-static void network_init_gcrypt (void) /* {{{ */
++static int network_init_gcrypt (void) /* {{{ */
+ {
+   gcry_error_t err;
+ 
+@@ -504,7 +504,7 @@ static void network_init_gcrypt (void) /* {{{ */
+    * Because you can't know in a library whether another library has
+    * already initialized the library */
+   if (gcry_control (GCRYCTL_ANY_INITIALIZATION_P))
+-    return;
++    return (0);
+ 
+  /* http://www.gnupg.org/documentation/manuals/gcrypt/Multi_002dThreading.html
+   * To ensure thread-safety, it's important to set GCRYCTL_SET_THREAD_CBS
+@@ -518,7 +518,7 @@ static void network_init_gcrypt (void) /* {{{ */
+   if (err)
+   {
+     ERROR ("network plugin: gcry_control (GCRYCTL_SET_THREAD_CBS) failed: %s", gcry_strerror (err));
+-    abort ();
++    return (-1);
+   }
+ # endif
+ 
+@@ -528,11 +528,12 @@ static void network_init_gcrypt (void) /* {{{ */
+   if (err)
+   {
+     ERROR ("network plugin: gcry_control (GCRYCTL_INIT_SECMEM) failed: %s", gcry_strerror (err));
+-    abort ();
++    return (-1);
+   }
+ 
+   gcry_control (GCRYCTL_INITIALIZATION_FINISHED);
+-} /* }}} void network_init_gcrypt */
++  return (0);
++} /* }}} int network_init_gcrypt */
+ 
+ static gcry_cipher_hd_t network_get_aes256_cypher (sockent_t *se, /* {{{ */
+     const void *iv, size_t iv_size, const char *username)
+@@ -2066,7 +2067,12 @@ static int sockent_init_crypto (sockent_t *se) /* {{{ */
+ 	{
+ 		if (se->data.client.security_level > SECURITY_LEVEL_NONE)
+ 		{
+-			network_init_gcrypt ();
++			if (network_init_gcrypt () < 0)
++			{
++				ERROR ("network plugin: Cannot configure client socket with "
++						"security: Failed to initialize crypto library.");
++				return (-1);
++			}
+ 
+ 			if ((se->data.client.username == NULL)
+ 					|| (se->data.client.password == NULL))
+@@ -2086,7 +2092,12 @@ static int sockent_init_crypto (sockent_t *se) /* {{{ */
+ 	{
+ 		if (se->data.server.security_level > SECURITY_LEVEL_NONE)
+ 		{
+-			network_init_gcrypt ();
++			if (network_init_gcrypt () < 0)
++			{
++				ERROR ("network plugin: Cannot configure server socket with "
++						"security: Failed to initialize crypto library.");
++				return (-1);
++			}
+ 
+ 			if (se->data.server.auth_file == NULL)
+ 			{
+@@ -3519,7 +3530,11 @@ static int network_init (void)
+ 	have_init = 1;
+ 
+ #if HAVE_LIBGCRYPT
+-	network_init_gcrypt ();
++	if (network_init_gcrypt () < 0)
++	{
++		ERROR ("network plugin: Failed to initialize crypto library.");
++		return (-1);
++	}
+ #endif
+ 
+ 	if (network_config_stats != 0)
+--
+2.9.2
diff --git a/app-admin/collectd/files/collectd-5.5.2-issue-1877.patch b/app-admin/collectd/files/collectd-5.5.2-issue-1877.patch
new file mode 100644
index 000000000000..658dc1e66b00
--- /dev/null
+++ b/app-admin/collectd/files/collectd-5.5.2-issue-1877.patch
@@ -0,0 +1,37 @@
+[PATCH 5/5] Fix compilation against >=xfsprogs-4.7.0
+
+Gentoo-Bug: https://bugs.gentoo.org/590998
+Bug: https://github.com/collectd/collectd/issues/1877
+---
+ src/utils_mount.c | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/src/utils_mount.c b/src/utils_mount.c
+index da53b98..37b52d6 100644
+--- a/src/utils_mount.c
++++ b/src/utils_mount.c
+@@ -24,16 +24,17 @@
+ # include "config.h"
+ #endif
+ 
++#define _GNU_SOURCE
++
++#include "collectd.h"
++#include "utils_mount.h"
++
+ #if HAVE_XFS_XQM_H
+-# define _GNU_SOURCE
+ # include <xfs/xqm.h>
+ #define XFS_SUPER_MAGIC_STR "XFSB"
+ #define XFS_SUPER_MAGIC2_STR "BSFX"
+ #endif
+ 
+-#include "collectd.h"
+-#include "utils_mount.h"
+-
+ #include "common.h" /* sstrncpy() et alii */
+ #include "plugin.h" /* ERROR() macro */
+ 
+-- 
+2.9.2
+