commit af52f49858cb578901ff9766d82c530506b156ac parent 9cbc078e2c7607ec2c72d61cf84b9fb8b6c33c8e Author: Hannu Nyman <hannu.nyman@iki.fi> Date: Wed, 28 Dec 2016 23:51:45 +0200 Merge pull request #3689 from hnyman/c553 collectd: update to 5.5.3 Diffstat:
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/utils/collectd/Makefile b/utils/collectd/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=collectd -PKG_VERSION:=5.5.2 -PKG_RELEASE:=4 +PKG_VERSION:=5.5.3 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://collectd.org/files/ -PKG_MD5SUM:=40b83343f72089e0330f53965f1140bd +PKG_MD5SUM:=6f10633d0f73f99ef61472a8e377d4a058de161e80f3353b4b17d394c68f2f44 PKG_FIXUP:=autoreconf PKG_REMOVE_FILES:=aclocal.m4 libltdl/aclocal.m4 diff --git a/utils/collectd/patches/200-fix-git-describe-error.patch b/utils/collectd/patches/200-fix-git-describe-error.patch @@ -2,7 +2,7 @@ +++ b/version-gen.sh @@ -2,7 +2,7 @@ - DEFAULT_VERSION="5.5.2.git" + DEFAULT_VERSION="5.5.3.git" -VERSION="`git describe 2> /dev/null | grep collectd | sed -e 's/^collectd-//'`" +#VERSION="`git describe 2> /dev/null | grep collectd | sed -e 's/^collectd-//'`" diff --git a/utils/collectd/patches/600-fix-libmodbus-detection.patch b/utils/collectd/patches/600-fix-libmodbus-detection.patch @@ -18,7 +18,7 @@ Reversed patch to be applied: --- a/configure.ac +++ b/configure.ac -@@ -2626,7 +2626,7 @@ then +@@ -2627,7 +2627,7 @@ then SAVE_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $with_libmodbus_cflags" @@ -29,12 +29,12 @@ Reversed patch to be applied: fi --- a/src/modbus.c +++ b/src/modbus.c -@@ -27,7 +27,7 @@ - - #include <netdb.h> +@@ -26,7 +26,7 @@ + #include "configfile.h" + #include "plugin.h" -#include <modbus.h> +#include <modbus/modbus.h> + #include <netdb.h> + #include <sys/socket.h> - #ifndef LIBMODBUS_VERSION_CHECK - /* Assume version 2.0.3 */ diff --git a/utils/collectd/patches/900-add-iwinfo-plugin.patch b/utils/collectd/patches/900-add-iwinfo-plugin.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -704,6 +704,9 @@ AC_CHECK_HEADERS(net/pfvar.h, +@@ -705,6 +705,9 @@ AC_CHECK_HEADERS(net/pfvar.h, have_termios_h="no" AC_CHECK_HEADERS(termios.h, [have_termios_h="yes"]) @@ -67,7 +67,7 @@ # JVMArg "-Djava.class.path=@prefix@/share/collectd/java/collectd-api.jar" --- a/src/collectd.conf.pod +++ b/src/collectd.conf.pod -@@ -2606,6 +2606,27 @@ and all other interrupts are collected. +@@ -2612,6 +2612,27 @@ and all other interrupts are collected. =back diff --git 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 -@@ -658,7 +658,7 @@ static int ping_read (void) /* {{{ */ +@@ -655,7 +655,7 @@ static int ping_read (void) /* {{{ */ / ((double) (pkg_recv * (pkg_recv - 1)))); /* Calculate drop rate. */