From 3cd8dd0ad81a67db6f71f856bae1ede3052da156 Mon Sep 17 00:00:00 2001 From: Marc Fournier Date: Mon, 23 Jan 2017 20:31:11 +0100 Subject: [PATCH] patches: add dpdkstat_goto_label.patch --- debian/changelog | 2 ++ debian/patches/dpdkstat_goto_label.patch | 23 +++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 26 insertions(+) create mode 100644 debian/patches/dpdkstat_goto_label.patch diff --git a/debian/changelog b/debian/changelog index 434f19b..e65c862 100644 --- 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 dpdkstat_goto_label.patch, fixing a small mistake which prevented + the dpdkstat from building. -- Marc Fournier 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 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 + +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 afc72ed..196b739 100644 --- 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 +dpdkstat_goto_label.patch -- 2.30.2