From 1f2f177d3ca0606e1a1b53f7ff21ea6bd0dd423e Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Sat, 24 Nov 2018 16:47:21 +0200 Subject: [PATCH] collectd: update to 5.8.1 Update collectd to version 5.8.1 Signed-off-by: Hannu Nyman (cherry picked from commit 29eac13d8fe4b3147fd63840f1ff11875e87776d) --- utils/collectd/Makefile | 6 +++--- .../patches/050-backport-modbus-little-endian.patch | 2 +- .../collectd/patches/100-rrdtool-add-rrasingle-option.patch | 2 +- utils/collectd/patches/900-add-iwinfo-plugin.patch | 6 +++--- utils/collectd/patches/920-fix-ping-droprate.patch | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/utils/collectd/Makefile b/utils/collectd/Makefile index d734affa13..70013ff489 100644 --- a/utils/collectd/Makefile +++ b/utils/collectd/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=collectd -PKG_VERSION:=5.8.0 -PKG_RELEASE:=6 +PKG_VERSION:=5.8.1 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://collectd.org/files/ \ https://github.com/collectd/collectd/releases/download/collectd-$(PKG_VERSION) -PKG_HASH:=b06ff476bbf05533cb97ae6749262cc3c76c9969f032bd8496690084ddeb15c9 +PKG_HASH:=e796fda27ce06377f491ad91aa286962a68c2b54076aa77a29673d53204453da PKG_FIXUP:=autoreconf PKG_REMOVE_FILES:=aclocal.m4 libltdl/aclocal.m4 diff --git a/utils/collectd/patches/050-backport-modbus-little-endian.patch b/utils/collectd/patches/050-backport-modbus-little-endian.patch index 6cb9703933..26a589d6d6 100644 --- a/utils/collectd/patches/050-backport-modbus-little-endian.patch +++ b/utils/collectd/patches/050-backport-modbus-little-endian.patch @@ -152,7 +152,7 @@ diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod index dfd785a2c8..e9715126e6 100644 --- a/src/collectd.conf.pod +++ b/src/collectd.conf.pod -@@ -4128,11 +4128,19 @@ Configures the base register to read from the device. If the option +@@ -4139,11 +4139,19 @@ Configures the base register to read from the device. If the option B has been set to B or B, this and the next register will be read (the register number is increased by one). diff --git a/utils/collectd/patches/100-rrdtool-add-rrasingle-option.patch b/utils/collectd/patches/100-rrdtool-add-rrasingle-option.patch index b0ef7c4847..2820e07558 100644 --- a/utils/collectd/patches/100-rrdtool-add-rrasingle-option.patch +++ b/utils/collectd/patches/100-rrdtool-add-rrasingle-option.patch @@ -17,7 +17,7 @@ /* consolidation_functions = */ NULL, /* consolidation_functions_num = */ 0, -@@ -950,6 +953,12 @@ static int rrd_config(const char *key, c +@@ -949,6 +952,12 @@ static int rrd_config(const char *key, c /* compar = */ rrd_compare_numeric); free(value_copy); diff --git a/utils/collectd/patches/900-add-iwinfo-plugin.patch b/utils/collectd/patches/900-add-iwinfo-plugin.patch index 69aaf79128..360c417519 100644 --- a/utils/collectd/patches/900-add-iwinfo-plugin.patch +++ b/utils/collectd/patches/900-add-iwinfo-plugin.patch @@ -54,7 +54,7 @@ #@BUILD_PLUGIN_JAVA_TRUE@LoadPlugin java @BUILD_PLUGIN_LOAD_TRUE@@BUILD_PLUGIN_LOAD_TRUE@LoadPlugin load #@BUILD_PLUGIN_LPAR_TRUE@LoadPlugin lpar -@@ -720,6 +721,12 @@ +@@ -721,6 +722,12 @@ # IgnoreSelected true # @@ -69,7 +69,7 @@ # JVMArg "-Djava.class.path=@prefix@/share/collectd/java/collectd-api.jar" --- a/src/collectd.conf.pod +++ b/src/collectd.conf.pod -@@ -3503,6 +3503,27 @@ and all other interrupts are collected. +@@ -3521,6 +3521,27 @@ and all other interrupts are collected. =back @@ -262,7 +262,7 @@ # Legacy types --- a/Makefile.am +++ b/Makefile.am -@@ -983,6 +983,14 @@ irq_la_LDFLAGS = $(PLUGIN_LDFLAGS) +@@ -997,6 +997,14 @@ irq_la_LDFLAGS = $(PLUGIN_LDFLAGS) irq_la_LIBADD = libignorelist.la endif diff --git a/utils/collectd/patches/920-fix-ping-droprate.patch b/utils/collectd/patches/920-fix-ping-droprate.patch index b39207e35d..e32947dc96 100644 --- a/utils/collectd/patches/920-fix-ping-droprate.patch +++ b/utils/collectd/patches/920-fix-ping-droprate.patch @@ -1,6 +1,6 @@ --- a/src/ping.c +++ b/src/ping.c -@@ -635,7 +635,7 @@ static int ping_read(void) /* {{{ */ +@@ -633,7 +633,7 @@ static int ping_read(void) /* {{{ */ ((double)(pkg_recv * (pkg_recv - 1)))); /* Calculate drop rate. */ -- 2.30.2