From 40e963d79e2a42eedf5cbc31994b2fdaed5b81eb Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Sun, 17 Jul 2016 20:46:11 +0200 Subject: [PATCH] patches/: Added gcc6.patch: Fix FTBFS with GCC 6 Thanks to Lucas Nussbaum for reporting this. Closes: #831194 --- debian/changelog | 3 +++ debian/patches/gcc6.patch | 13 +++++++++++++ debian/patches/series | 1 + 3 files changed, 17 insertions(+) create mode 100644 debian/patches/gcc6.patch diff --git a/debian/changelog b/debian/changelog index 8303624..0f30591 100644 --- 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 Tue, 05 Jul 2016 13:58:29 +0200 diff --git a/debian/patches/gcc6.patch b/debian/patches/gcc6.patch new file mode 100644 index 0000000..4cae581 --- /dev/null +++ b/debian/patches/gcc6.patch @@ -0,0 +1,13 @@ +Author: Sebastian Harl +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 5861ece..1d66312 100644 --- 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 -- 2.30.2