patches: add dpdkstat_goto_label.patch

diff --git a/debian/changelog b/debian/changelog
index 434f19b05c67daa6bd4949c597c4258e650d8d62..e65c862d5dc73ca35e65a36b6680e1a9ce2d0e45 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ collectd (5.7.1-1) UNRELEASED; urgency=medium
     - add mqtt_resource_leak.patch, fixing a connection leak.
     - add mqtt_invalid_symbols.patch, stripping out invalid characters from
       MQTT topic names.
     - add mqtt_resource_leak.patch, fixing a connection leak.
     - add mqtt_invalid_symbols.patch, stripping out invalid characters from
       MQTT topic names.

+    - add dpdkstat_goto_label.patch, fixing a small mistake which prevented
+      the dpdkstat from building.

 
  -- Marc Fournier <marc@bl.uem.li>  Mon, 23 Jan 2017 09:23:07 +0100
 
 
  -- Marc Fournier <marc@bl.uem.li>  Mon, 23 Jan 2017 09:23:07 +0100
 

diff --git a/debian/patches/dpdkstat_goto_label.patch b/debian/patches/dpdkstat_goto_label.patch
new file mode 100644 (file)
index 0000000..fe0958a
--- /dev/null
+++ b/debian/patches/dpdkstat_goto_label.patch
@@ -0,0 +1,23 @@
+Description: dpdkstat plugin: jump to the right label
+Author: Ruben Kerkhof <ruben@rubenkerkhof.com>
+
+diff --git a/src/dpdkstat.c b/src/dpdkstat.c
+index 2686be151..d1383458d 100644
+--- a/src/dpdkstat.c
++++ b/src/dpdkstat.c
+@@ -289,13 +289,13 @@ static int dpdk_shm_init(size_t size) {
+   if (err) {
+     ERROR("dpdkstat semaphore init failed: %s",
+           sstrerror(errno, errbuf, sizeof(errbuf)));
+-    goto close;
++    goto fail;
+   }
+   err = sem_init(&g_configuration->sema_stats_in_shm, 1, 0);
+   if (err) {
+     ERROR("dpdkstat semaphore init failed: %s",
+           sstrerror(errno, errbuf, sizeof(errbuf)));
+-    goto close;
++    goto fail;
+   }
+ 
+   g_configuration->xstats = NULL;

diff --git a/debian/patches/series b/debian/patches/series
index afc72edf62c18448e85ea0e74b46b5f0a7c1b2e2..196b7393ce2fce1a476b2bc64c983047ef3c0f85 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ myplugin_includes.patch
 nagios-debian-paths.patch
 mqtt_resource_leak.patch
 mqtt_invalid_symbols.patch
 nagios-debian-paths.patch
 mqtt_resource_leak.patch
 mqtt_invalid_symbols.patch

+dpdkstat_goto_label.patch