collectd: update to 5.8.1

Update collectd to version 5.8.1

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 29eac13d8f)
This commit is contained in:
Hannu Nyman 2018-11-24 16:47:21 +02:00
parent 44458746f2
commit 1f2f177d3c
5 changed files with 9 additions and 9 deletions

View File

@ -8,13 +8,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=collectd PKG_NAME:=collectd
PKG_VERSION:=5.8.0 PKG_VERSION:=5.8.1
PKG_RELEASE:=6 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://collectd.org/files/ \ PKG_SOURCE_URL:=https://collectd.org/files/ \
https://github.com/collectd/collectd/releases/download/collectd-$(PKG_VERSION) https://github.com/collectd/collectd/releases/download/collectd-$(PKG_VERSION)
PKG_HASH:=b06ff476bbf05533cb97ae6749262cc3c76c9969f032bd8496690084ddeb15c9 PKG_HASH:=e796fda27ce06377f491ad91aa286962a68c2b54076aa77a29673d53204453da
PKG_FIXUP:=autoreconf PKG_FIXUP:=autoreconf
PKG_REMOVE_FILES:=aclocal.m4 libltdl/aclocal.m4 PKG_REMOVE_FILES:=aclocal.m4 libltdl/aclocal.m4

View File

@ -152,7 +152,7 @@ diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index dfd785a2c8..e9715126e6 100644 index dfd785a2c8..e9715126e6 100644
--- a/src/collectd.conf.pod --- a/src/collectd.conf.pod
+++ b/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<RegisterType> has been set to B<Uint32> or B<Float>, this and the next B<RegisterType> has been set to B<Uint32> or B<Float>, this and the next
register will be read (the register number is increased by one). register will be read (the register number is increased by one).

View File

@ -17,7 +17,7 @@
/* consolidation_functions = */ NULL, /* consolidation_functions = */ NULL,
/* consolidation_functions_num = */ 0, /* 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); /* compar = */ rrd_compare_numeric);
free(value_copy); free(value_copy);

View File

@ -54,7 +54,7 @@
#@BUILD_PLUGIN_JAVA_TRUE@LoadPlugin java #@BUILD_PLUGIN_JAVA_TRUE@LoadPlugin java
@BUILD_PLUGIN_LOAD_TRUE@@BUILD_PLUGIN_LOAD_TRUE@LoadPlugin load @BUILD_PLUGIN_LOAD_TRUE@@BUILD_PLUGIN_LOAD_TRUE@LoadPlugin load
#@BUILD_PLUGIN_LPAR_TRUE@LoadPlugin lpar #@BUILD_PLUGIN_LPAR_TRUE@LoadPlugin lpar
@@ -720,6 +721,12 @@ @@ -721,6 +722,12 @@
# IgnoreSelected true # IgnoreSelected true
#</Plugin> #</Plugin>
@ -69,7 +69,7 @@
# JVMArg "-Djava.class.path=@prefix@/share/collectd/java/collectd-api.jar" # JVMArg "-Djava.class.path=@prefix@/share/collectd/java/collectd-api.jar"
--- a/src/collectd.conf.pod --- a/src/collectd.conf.pod
+++ b/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 =back
@ -262,7 +262,7 @@
# Legacy types # Legacy types
--- a/Makefile.am --- a/Makefile.am
+++ b/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 irq_la_LIBADD = libignorelist.la
endif endif

View File

@ -1,6 +1,6 @@
--- a/src/ping.c --- a/src/ping.c
+++ b/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)))); ((double)(pkg_recv * (pkg_recv - 1))));
/* Calculate drop rate. */ /* Calculate drop rate. */