Merge branch 'master' into sid

diff --git a/debian/changelog b/debian/changelog
index e1e8963c9910a2a03ac7b0442f6a48e247cfff55..1c16a7222546ca113ed1e4b4f4f39cf5058d4e6f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+collectd (5.7.0-2) unstable; urgency=medium
+
+  * debian/patches: add dpdkstat-portable-format-string.patch, fixing the
+    build on i386.
+  * debian/rules: Disable dpdkstat plugin on non-Intel architectures.
+
+ -- Marc Fournier <marc@bl.uem.li>  Sun, 18 Dec 2016 17:05:10 +0100
+
 collectd (5.7.0-1) unstable; urgency=medium
 
   * New upstream release.

diff --git a/debian/patches/dpdkstat-portable-format-string.patch b/debian/patches/dpdkstat-portable-format-string.patch
new file mode 100644 (file)
index 0000000..965504f
--- /dev/null
+++ b/debian/patches/dpdkstat-portable-format-string.patch
@@ -0,0 +1,25 @@
+Description: Fix format string portability issue
+Author: Marc Fournier <marc@bl.uem.li>
+
+--- a/src/dpdkstat.c
++++ b/src/dpdkstat.c
+@@ -159,8 +159,8 @@ static int dpdk_shm_init(size_t size);
+ static void dpdk_config_init_default(void) {
+   g_configuration->interval = plugin_get_interval();
+   if (g_configuration->interval == cf_get_default_interval())
+-    WARNING("dpdkstat: No time interval was configured, default value %lu ms "
+-            "is set",
++    WARNING("dpdkstat: No time interval was configured, default value %" PRIu64
++            " ms is set",
+             CDTIME_T_TO_MS(g_configuration->interval));
+   /* Default is all ports enabled */
+   g_configuration->enabled_port_mask = ~0;
+@@ -413,7 +413,7 @@ static int dpdk_helper_spawn(enum DPDK_HELPER_ACTION action) {
+   if (pid > 0) {
+     close(g_configuration->helper_pipes[1]);
+     g_configuration->helper_pid = pid;
+-    DEBUG("dpdkstat: helper pid %lu", (long)g_configuration->helper_pid);
++    DEBUG("dpdkstat: helper pid %li", (long)g_configuration->helper_pid);
+     /* Kick helper once its alive to have it start processing */
+     sem_post(&g_configuration->sema_helper_get_stats);
+   } else if (pid == 0) {

diff --git a/debian/patches/series b/debian/patches/series
index 8c3f46b2e3722b791529ef4ad0b272c6927927ab..b13e8f2cf1caeb8f8be2be482e3b3672cfec2cd9 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ rrd_filter_path.patch
 collection_conf_path.patch
 myplugin_includes.patch
 nagios-debian-paths.patch
+dpdkstat-portable-format-string.patch

diff --git a/debian/rules b/debian/rules
index 2f31b1b7ed63b634886b24b12039aa5d1b7bcc8b..b3325ec7870a430c57e3f380e30fb5dca1fbbdbf 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -158,9 +158,10 @@ ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
                --disable-java
 endif
 
-# This plugin is Intel-hardware specific.
+# These plugins are Intel-hardware specific.
 ifeq (,$(filter amd64 i386, $(DEB_BUILD_ARCH)))
        confflags += \
+               --disable-dpdkstat \
                --disable-turbostat
 endif