[package] collectd: update to 4.10.6

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
SVN-Revision: 31184

diff --git a/utils/collectd/Makefile b/utils/collectd/Makefile
index 80c0dd53156eaa602fa6162d6b9420c8ebb77d0b..b57b1df5c3e0049669d86066c5978698a375a24c 100644 (file)
--- a/utils/collectd/Makefile
+++ b/utils/collectd/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=collectd
-PKG_VERSION:=4.10.2
-PKG_RELEASE:=6
+PKG_VERSION:=4.10.6
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://collectd.org/files/
-PKG_MD5SUM:=85d9d8d0a1327782661e3c89800aa70e
+PKG_MD5SUM:=d446c399d839a32f2f581111d7256f8b
 
 PKG_FIXUP:=autoreconf
 PKG_REMOVE_FILES:=aclocal.m4 libltdl/aclocal.m4

diff --git a/utils/collectd/patches/004-version-gen-shell.sh b/utils/collectd/patches/004-version-gen-shell.sh
deleted file mode 100644 (file)
index 1aafab2..0000000
--- a/utils/collectd/patches/004-version-gen-shell.sh
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/version-gen.sh
-+++ b/version-gen.sh
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/usr/bin/env bash
- 
- DEFAULT_VERSION="4.10.2.git"
- 

diff --git a/utils/collectd/patches/100-rrdtool-add-rrasingle-option.patch b/utils/collectd/patches/100-rrdtool-add-rrasingle-option.patch
index fae96d011d245d54dffb68e717e3815e27f90d95..ce1daa473fa4bb1b83ba2abea10d0eecbe500102 100644 (file)
--- 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
  };
-@@ -1027,6 +1030,14 @@ static int rrd_config (const char *key, 
+@@ -1027,6 +1030,14 @@ static int rrd_config (const char *key,
  
                free (value_copy);
        }

diff --git a/utils/collectd/patches/200-fix-git-describe-error.patch b/utils/collectd/patches/200-fix-git-describe-error.patch
index b5f6e4c23c4b33ed7366ac3ec13278f0f375a839..422e108601aafb325ade0376a203611601db8056 100644 (file)
--- 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="4.10.2.git"
+ DEFAULT_VERSION="4.10.6.git"
  
 -VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"
 +#VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"

diff --git a/utils/collectd/patches/300-fix-modbus.patch b/utils/collectd/patches/300-fix-modbus.patch
deleted file mode 100644 (file)
index b935728..0000000
--- a/utils/collectd/patches/300-fix-modbus.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/src/modbus.c
-+++ b/src/modbus.c
-@@ -281,10 +281,8 @@ static int mb_init_connection (mb_host_t
- 
-   modbus_set_debug (&host->connection, 1);
- 
--#if 0
-   /* We'll do the error handling ourselves. */
-   modbus_set_error_handling (&host->connection, NOP_ON_ERROR);
--#endif
- 
-   if ((host->port < 1) || (host->port > 65535))
-     host->port = MODBUS_TCP_DEFAULT_PORT;
-@@ -293,10 +291,8 @@ static int mb_init_connection (mb_host_t
-       host->node, host->port);
- 
-   modbus_init_tcp (&host->connection,
--      /* host = */ host->node);
--#if 0
-+      /* host = */ host->node,
-       /* port = */ host->port);
--#endif
- 
-   status = modbus_connect (&host->connection);
-   if (status != 0)
-@@ -325,7 +321,7 @@ static int mb_init_connection (mb_host_t
- static int mb_read_data (mb_host_t *host, mb_slave_t *slave, /* {{{ */
-     mb_data_t *data)
- {
--  int values[2];
-+  uint16_t values[2];
-   int values_num;
-   const data_set_t *ds;
-   int status;

diff --git a/utils/collectd/patches/900-add-iwinfo-plugin.patch b/utils/collectd/patches/900-add-iwinfo-plugin.patch
index f195c1b18de5484195b143c13fe8b4bb311e9410..4d9696cb674f5c8086799c1d462290feb9a61668 100644 (file)
--- a/utils/collectd/patches/900-add-iwinfo-plugin.patch
+++ b/utils/collectd/patches/900-add-iwinfo-plugin.patch
@@ -1,6 +1,6 @@
 --- a/configure.in
 +++ b/configure.in
-@@ -471,6 +471,9 @@ AC_CHECK_HEADERS(netinet/if_ether.h, [],
+@@ -490,6 +490,9 @@ AC_CHECK_HEADERS(netinet/if_ether.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.
  #
-@@ -3985,6 +3988,7 @@ plugin_interface="no"
+@@ -4006,6 +4009,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"
-@@ -4292,6 +4296,7 @@ AC_PLUGIN([ipmi],        [$plugin_ipmi],
+@@ -4313,6 +4317,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])
-@@ -4570,6 +4575,7 @@ Configuration:
+@@ -4591,6 +4596,7 @@ Configuration:
      protobuf-c  . . . . . $have_protoc_c
      oracle  . . . . . . . $with_oracle
      python  . . . . . . . $with_python
@@ -34,7 +34,7 @@
  
    Features:
      daemon mode . . . . . $enable_daemon
-@@ -4609,6 +4615,7 @@ Configuration:
+@@ -4630,6 +4636,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
-@@ -372,6 +373,12 @@ FQDNLookup   true
+@@ -376,6 +377,12 @@ FQDNLookup   true
  #     IgnoreSelected true
  #</Plugin>
  
@@ -249,7 +249,7 @@
 +}
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -452,6 +452,15 @@ collectd_LDADD += "-dlopen" irq.la
+@@ -454,6 +454,15 @@ collectd_LDADD += "-dlopen" irq.la
  collectd_DEPENDENCIES += irq.la
  endif