patches: drop dpdkstat-portable-format-string.patch

diff --git a/debian/changelog b/debian/changelog
index ab15a984a47271398cd2759bec71475e35f44635..f8563d95e16ad1d68421213146afd49f5f9e67a5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 collectd (5.7.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * debian/patches: drop dpdkstat-portable-format-string.patch, included
+    upstream.
 
  -- Marc Fournier <marc@bl.uem.li>  Mon, 23 Jan 2017 09:23:07 +0100
 

diff --git a/debian/patches/dpdkstat-portable-format-string.patch b/debian/patches/dpdkstat-portable-format-string.patch
deleted file mode 100644 (file)
index 965504f..0000000
--- a/debian/patches/dpdkstat-portable-format-string.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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 b13e8f2cf1caeb8f8be2be482e3b3672cfec2cd9..8c3f46b2e3722b791529ef4ad0b272c6927927ab 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@ rrd_filter_path.patch
 collection_conf_path.patch
 myplugin_includes.patch
 nagios-debian-paths.patch
-dpdkstat-portable-format-string.patch