Merge pull request #975 from hnyman/collectd542

collectd: update to 5.4.2

utils/collectd/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=collectd
-PKG_VERSION:=5.4.1
+PKG_VERSION:=5.4.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://collectd.org/files/
-PKG_MD5SUM:=6f56c71c96573a7f4f7fb3bfab185974
+PKG_MD5SUM:=feff9fd0ed89e956d7cf12ba18cfc248
 
 PKG_FIXUP:=autoreconf
 PKG_REMOVE_FILES:=aclocal.m4 libltdl/aclocal.m4

utils/collectd/patches/100-rrdtool-add-rrasingle-option.patch

@@ -34,7 +34,7 @@
  		double tmp = atof (value);
 --- a/src/utils_rrdcreate.c
 +++ b/src/utils_rrdcreate.c
-@@ -211,6 +211,9 @@ static int rra_get (char ***ret, const v
+@@ -212,6 +212,9 @@ static int rra_get (char ***ret, const v
      rts_num = rra_timespans_num;
    }
  

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

@@ -2,7 +2,7 @@
 +++ b/version-gen.sh
 @@ -2,7 +2,7 @@
  
- DEFAULT_VERSION="5.4.1.git"
+ DEFAULT_VERSION="5.4.2.git"
  
 -VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"
 +#VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"

utils/collectd/patches/900-add-iwinfo-plugin.patch

@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -568,6 +568,9 @@ AC_CHECK_HEADERS(net/pfvar.h,
+@@ -580,6 +580,9 @@ AC_CHECK_HEADERS(net/pfvar.h,
  have_termios_h="no"
  AC_CHECK_HEADERS(termios.h, [have_termios_h="yes"])
  
@@ -10,7 +10,7 @@
  #
  # Checks for typedefs, structures, and compiler characteristics.
  #
-@@ -4819,6 +4822,7 @@ plugin_interface="no"
+@@ -4841,6 +4844,7 @@ plugin_interface="no"
  plugin_ipmi="no"
  plugin_ipvs="no"
  plugin_irq="no"
@@ -18,7 +18,7 @@
  plugin_libvirt="no"
  plugin_load="no"
  plugin_memory="no"
-@@ -5157,6 +5161,7 @@ AC_PLUGIN([ipmi],        [$plugin_ipmi],
+@@ -5179,6 +5183,7 @@ AC_PLUGIN([ipmi],        [$plugin_ipmi],
  AC_PLUGIN([iptables],    [$with_libiptc],      [IPTables rule counters])
  AC_PLUGIN([ipvs],        [$plugin_ipvs],       [IPVS connection statistics])
  AC_PLUGIN([irq],         [$plugin_irq],        [IRQ statistics])
@@ -26,7 +26,7 @@
  AC_PLUGIN([java],        [$with_java],         [Embed the Java Virtual Machine])
  AC_PLUGIN([libvirt],     [$plugin_libvirt],    [Virtual machine statistics])
  AC_PLUGIN([load],        [$plugin_load],       [System load])
-@@ -5458,6 +5463,7 @@ Configuration:
+@@ -5480,6 +5485,7 @@ Configuration:
      protobuf-c  . . . . . $have_protoc_c
      oracle  . . . . . . . $with_oracle
      python  . . . . . . . $with_python
@@ -34,7 +34,7 @@
  
    Features:
      daemon mode . . . . . $enable_daemon
-@@ -5502,6 +5508,7 @@ Configuration:
+@@ -5524,6 +5530,7 @@ Configuration:
      iptables  . . . . . . $enable_iptables
      ipvs  . . . . . . . . $enable_ipvs
      irq . . . . . . . . . $enable_irq
@@ -52,7 +52,7 @@
  #@BUILD_PLUGIN_JAVA_TRUE@LoadPlugin java
  #@BUILD_PLUGIN_LIBVIRT_TRUE@LoadPlugin libvirt
  @BUILD_PLUGIN_LOAD_TRUE@@BUILD_PLUGIN_LOAD_TRUE@LoadPlugin load
-@@ -467,6 +468,12 @@
+@@ -502,6 +503,12 @@
  #	IgnoreSelected true
  #</Plugin>
  
@@ -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
-@@ -2056,6 +2056,27 @@ and all other interrupts are collected.
+@@ -2077,6 +2077,27 @@ and all other interrupts are collected.
  
  =back
  

utils/collectd/patches/905-fix-sigrok-upstream-patch-post-541

@@ -1,31 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -3825,18 +3825,20 @@ AC_ARG_WITH(libsigrok, [AS_HELP_STRING([--with-libsigrok@<:@=PREFIX@:>@], [Path
- 			with_libsigrok_ldflags="-L$withval/lib"
- 		fi
- 	fi
--],[])
-+],[with_libsigrok="yes"])
- 
- # libsigrok has a glib dependency
- if test "x$with_libsigrok" = "xyes"
- then
--	if test -z "m4_ifdef([AM_PATH_GLIB_2_0], [yes], [])"
--	then
--		with_libsigrok="no (glib not available)"
--	else
--		AM_PATH_GLIB_2_0([2.28.0],
--			[with_libsigrok_cflags="$with_libsigrok_cflags $GLIB_CFLAGS"; with_libsigrok_ldflags="$with_libsigrok_ldflags $GLIB_LIBS"])
--	fi
-+m4_ifdef([AM_PATH_GLIB_2_0],
-+	[
-+	 AM_PATH_GLIB_2_0([2.28.0],
-+	 	[with_libsigrok_cflags="$with_libsigrok_cflags $GLIB_CFLAGS"; with_libsigrok_ldflags="$with_libsigrok_ldflags $GLIB_LIBS"])
-+	],
-+	[
-+	 with_libsigrok="no (glib not available)"
-+	]
-+)
- fi
- 
- # libsigrok headers