patches/: Added gcc6.patch: Fix FTBFS with GCC 6

Thanks to Lucas Nussbaum for reporting this.
Closes: #831194

diff --git a/debian/changelog b/debian/changelog
index 830362408967ed3a8415389a8c2df4deffb0ae57..0f3059131c76a098aa99df0e17259f60e5e85f8d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ collectd (5.5.1-5) UNRELEASED; urgency=medium
     - Fix failure to build twice in a row introduced by dh_autoreconf_clean;
       drop the separate config.status target and, hence, a dependency on the
       configure script.
+  * debian/patches/:
+    - Added gcc6.patch: Fix FTBFS with GCC 6; thanks to Lucas Nussbaum for
+      reporting this (Closes: #831194).
 
  -- Sebastian Harl <tokkee@debian.org>  Tue, 05 Jul 2016 13:58:29 +0200
 

diff --git a/debian/patches/gcc6.patch b/debian/patches/gcc6.patch
new file mode 100644 (file)
index 0000000..4cae581
--- /dev/null
+++ b/debian/patches/gcc6.patch
@@ -0,0 +1,13 @@
+Author: Sebastian Harl <tokkee@debian.org>
+Description: Fix GCC 6 issues.
+--- a/src/write_kafka.c
++++ b/src/write_kafka.c
+@@ -472,7 +472,7 @@
+       }
+     if (conf != NULL)
+         rd_kafka_conf_destroy(conf);
+-      return (0);
++    return (0);
+  errout:
+     if (conf != NULL)
+         rd_kafka_conf_destroy(conf);

diff --git a/debian/patches/series b/debian/patches/series
index 5861ece33cc06f9fd233c9bd9a2f403de74bed88..1d6631231709cb6a97b16c4d94275393ee1eff87 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
 bts823012_librrd8.patch
+gcc6.patch