OpenWrt
/
packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

collectd: update to 5.5.3 

Update collectd to 5.5.3

Release notes at https://github.com/collectd/collectd/releases/tag/collectd-5.5.3

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
This commit is contained in:
Hannu Nyman 2016-12-22 17:25:05 +02:00
parent 0f9bf14e66
commit ea44014936
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
utils/collectd/Makefile
View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=collectd PKG_NAME:=collectd
PKG_VERSION:=5.5.2 PKG_VERSION:=5.5.3
PKG_RELEASE:=4 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://collectd.org/files/ PKG_SOURCE_URL:=http://collectd.org/files/
PKG_MD5SUM:=40b83343f72089e0330f53965f1140bd PKG_MD5SUM:=6f10633d0f73f99ef61472a8e377d4a058de161e80f3353b4b17d394c68f2f44
PKG_FIXUP:=autoreconf PKG_FIXUP:=autoreconf
PKG_REMOVE_FILES:=aclocal.m4 libltdl/aclocal.m4 PKG_REMOVE_FILES:=aclocal.m4 libltdl/aclocal.m4

2
utils/collectd/patches/200-fix-git-describe-error.patch
View File

@ -2,7 +2,7 @@
+++ b/version-gen.sh +++ b/version-gen.sh
@@ -2,7 +2,7 @@ @@ -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-//'`"
+#VERSION="`git describe 2> /dev/null | grep collectd | sed -e 's/^collectd-//'`" +#VERSION="`git describe 2> /dev/null | grep collectd | sed -e 's/^collectd-//'`"

12
utils/collectd/patches/600-fix-libmodbus-detection.patch
View File

@ -18,7 +18,7 @@ Reversed patch to be applied:
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -2626,7 +2626,7 @@ then @@ -2627,7 +2627,7 @@ then
SAVE_CPPFLAGS="$CPPFLAGS" SAVE_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $with_libmodbus_cflags" CPPFLAGS="$CPPFLAGS $with_libmodbus_cflags"
@ -29,12 +29,12 @@ Reversed patch to be applied:
fi fi
--- a/src/modbus.c --- a/src/modbus.c
+++ b/src/modbus.c +++ b/src/modbus.c
@@ -27,7 +27,7 @@ @@ -26,7 +26,7 @@
#include "configfile.h"
#include <netdb.h> #include "plugin.h"
-#include <modbus.h> -#include <modbus.h>
+#include <modbus/modbus.h> +#include <modbus/modbus.h>
#include <netdb.h>
#include <sys/socket.h>
#ifndef LIBMODBUS_VERSION_CHECK
/* Assume version 2.0.3 */

4
utils/collectd/patches/900-add-iwinfo-plugin.patch
View File

@ -1,6 +1,6 @@
--- a/configure.ac --- a/configure.ac
+++ b/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" have_termios_h="no"
AC_CHECK_HEADERS(termios.h, [have_termios_h="yes"]) AC_CHECK_HEADERS(termios.h, [have_termios_h="yes"])
@ -67,7 +67,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
@@ -2606,6 +2606,27 @@ and all other interrupts are collected. @@ -2612,6 +2612,27 @@ and all other interrupts are collected.
=back =back

2
utils/collectd/patches/920-fix-ping-droprate.patch
View File

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