From ff59ef6830d90067bb948e89e381bf9c7df21d57 Mon Sep 17 00:00:00 2001 From: Marc Fournier Date: Wed, 23 Aug 2017 16:06:45 +0200 Subject: [PATCH] patches: remove 4 patches merged upstream --- debian/changelog | 5 +++ debian/patches/dpdkstat_goto_label.patch | 23 ------------ .../drop_lssl_lcrypto_from_linking.patch | 37 ------------------- debian/patches/mqtt_invalid_symbols.patch | 26 ------------- debian/patches/mqtt_resource_leak.patch | 15 -------- debian/patches/series | 4 -- 6 files changed, 5 insertions(+), 105 deletions(-) delete mode 100644 debian/patches/dpdkstat_goto_label.patch delete mode 100644 debian/patches/drop_lssl_lcrypto_from_linking.patch delete mode 100644 debian/patches/mqtt_invalid_symbols.patch delete mode 100644 debian/patches/mqtt_resource_leak.patch diff --git a/debian/changelog b/debian/changelog index 8f400be..4a306cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,11 @@ collectd (5.7.2-1) UNRELEASED; urgency=medium * New upstream release. + * debian/patches: + - drop dpdkstat_goto_label.patch; included upstream. + - drop drop_lssl_lcrypto_from_linking.patch; included upstream. + - drop mqtt_invalid_symbols.patch; included upstream. + - drop mqtt_resource_leak.patch; included upstream. -- Marc Fournier Wed, 23 Aug 2017 15:58:47 +0200 diff --git a/debian/patches/dpdkstat_goto_label.patch b/debian/patches/dpdkstat_goto_label.patch deleted file mode 100644 index fe0958a..0000000 --- a/debian/patches/dpdkstat_goto_label.patch +++ /dev/null @@ -1,23 +0,0 @@ -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/drop_lssl_lcrypto_from_linking.patch b/debian/patches/drop_lssl_lcrypto_from_linking.patch deleted file mode 100644 index 5a2a6d9..0000000 --- a/debian/patches/drop_lssl_lcrypto_from_linking.patch +++ /dev/null @@ -1,37 +0,0 @@ -Author: Sebastian Andrzej Siewior -Subject: Remove SSL libs from libs - -The Makefile/Configure adds "-lssl -lcrypto" but does not depend libssl-dev -nor does it use any of its functions diretly. -Depending on those should not be needed unless for static compilation thus -removing them. - -BTS: https://bugs.debian.org/852924 - ---- - configure.ac | 2 +- - src/Makefile.am | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - ---- a/configure.ac -+++ b/configure.ac -@@ -3574,7 +3574,7 @@ then - - if test "x$LIBNETAPP_LIBS" = "x" - then -- LIBNETAPP_LIBS="$PTHREAD_LIBS -lxml -ladt -lssl -lm -lcrypto -lz" -+ LIBNETAPP_LIBS="$PTHREAD_LIBS -lxml -ladt -lm -lz" - fi - AC_MSG_NOTICE([netapp LIBS: $LIBNETAPP_LIBS]) - ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -825,7 +825,7 @@ if BUILD_PLUGIN_NOTIFY_EMAIL - pkglib_LTLIBRARIES += notify_email.la - notify_email_la_SOURCES = notify_email.c - notify_email_la_LDFLAGS = $(PLUGIN_LDFLAGS) --notify_email_la_LIBADD = -lesmtp -lssl -lcrypto -+notify_email_la_LIBADD = -lesmtp - endif - - if BUILD_PLUGIN_NOTIFY_NAGIOS diff --git a/debian/patches/mqtt_invalid_symbols.patch b/debian/patches/mqtt_invalid_symbols.patch deleted file mode 100644 index 5adce34..0000000 --- a/debian/patches/mqtt_invalid_symbols.patch +++ /dev/null @@ -1,26 +0,0 @@ -Description: mqtt plugin: Fix invalid symbols in topic name. -Author: Denys Fedoryshchenko - -diff --git a/src/mqtt.c b/src/mqtt.c -index 6b76af97b..8a24ccaa0 100644 ---- a/src/mqtt.c -+++ b/src/mqtt.c -@@ -462,6 +462,7 @@ static int format_topic(char *buf, size_t buf_len, data_set_t const *ds, - value_list_t const *vl, mqtt_client_conf_t *conf) { - char name[MQTT_MAX_TOPIC_SIZE]; - int status; -+ char *c; - - if ((conf->topic_prefix == NULL) || (conf->topic_prefix[0] == 0)) - return (FORMAT_VL(buf, buf_len, vl)); -@@ -474,6 +475,10 @@ static int format_topic(char *buf, size_t buf_len, data_set_t const *ds, - if ((status < 0) || (((size_t)status) >= buf_len)) - return (ENOMEM); - -+ while((c = strchr(buf, '#')) || (c = strchr(buf, '+'))) { -+ *c = '_'; -+ } -+ - return (0); - } /* int format_topic */ - diff --git a/debian/patches/mqtt_resource_leak.patch b/debian/patches/mqtt_resource_leak.patch deleted file mode 100644 index c07b29c..0000000 --- a/debian/patches/mqtt_resource_leak.patch +++ /dev/null @@ -1,15 +0,0 @@ -Description: mqtt plugin: Fix resource leak. -Author: Denys Fedoryshchenko - -diff --git a/src/mqtt.c b/src/mqtt.c -index 95deb0075..6b76af97b 100644 ---- a/src/mqtt.c -+++ b/src/mqtt.c -@@ -448,6 +448,7 @@ static int publish(mqtt_client_conf_t *conf, char const *topic, - * measure; we will try to reconnect the next time we have to publish a - * message */ - conf->connected = 0; -+ mosquitto_disconnect(conf->mosq); - - pthread_mutex_unlock(&conf->lock); - return (-1); diff --git a/debian/patches/series b/debian/patches/series index 74ad776..8c3f46b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,7 +2,3 @@ rrd_filter_path.patch collection_conf_path.patch myplugin_includes.patch nagios-debian-paths.patch -mqtt_resource_leak.patch -mqtt_invalid_symbols.patch -dpdkstat_goto_label.patch -drop_lssl_lcrypto_from_linking.patch -- 2.30.2