patches: add libcollectdclient_error_buffer.patch

diff --git a/debian/changelog b/debian/changelog
index 3ed78e39dc4d7748b95584284aa63edd4669a9eb..eda67d4b070100f3c7e388903b3f73fa814dbdff 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ collectd (5.7.2-1) UNRELEASED; urgency=medium
     - drop drop_lssl_lcrypto_from_linking.patch; included upstream.
     - drop mqtt_invalid_symbols.patch; included upstream.
     - drop mqtt_resource_leak.patch; included upstream.
+    - add libcollectdclient_error_buffer.patch, fixing a build error with
+      GCC 7 (Closes: #871062). Thanks to Steve Langasek and Ruben Kerkhof.
 
  -- Marc Fournier <marc@bl.uem.li>  Wed, 23 Aug 2017 15:58:47 +0200
 

diff --git a/debian/patches/libcollectdclient_error_buffer.patch b/debian/patches/libcollectdclient_error_buffer.patch
new file mode 100644 (file)
index 0000000..de6707e
--- /dev/null
+++ b/debian/patches/libcollectdclient_error_buffer.patch
@@ -0,0 +1,16 @@
+Author: Ruben Kerkhof <ruben@rubenkerkhof.com>
+Subject: libcollectdclient: increase error buffer
+
+diff --git a/src/libcollectdclient/client.c b/src/libcollectdclient/client.c
+index 51a4ab238..3ae2e714b 100644
+--- a/src/libcollectdclient/client.c
++++ b/src/libcollectdclient/client.c
+@@ -99,7 +99,7 @@
+  */
+ struct lcc_connection_s {
+   FILE *fh;
+-  char errbuf[1024];
++  char errbuf[2048];
+ };
+ 
+ struct lcc_response_s {

diff --git a/debian/patches/series b/debian/patches/series
index 8c3f46b2e3722b791529ef4ad0b272c6927927ab..d4f39762996e684296e6b1783c0e068c016ff6a4 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
 nagios-debian-paths.patch
+libcollectdclient_error_buffer.patch