diff --git a/utils/collectd/Makefile b/utils/collectd/Makefile index 4a5e74c3d..3bb19730c 100644 --- a/utils/collectd/Makefile +++ b/utils/collectd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=collectd PKG_VERSION:=5.5.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://collectd.org/files/ @@ -184,7 +184,6 @@ endif CONFIGURE_ARGS+= \ --disable-debug \ --enable-daemon \ - --enable-getifaddrs \ --with-nan-emulation \ --without-libgcrypt diff --git a/utils/collectd/patches/110-net-device-stats.patch b/utils/collectd/patches/110-net-device-stats.patch deleted file mode 100644 index 91e73aa37..000000000 --- a/utils/collectd/patches/110-net-device-stats.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- - src/interface.c | 33 ++++++++++++++++++++++++++++++++- - 1 file changed, 32 insertions(+), 1 deletion(-) - ---- a/src/interface.c -+++ b/src/interface.c -@@ -203,7 +203,38 @@ static int interface_read (void) - # define IFA_RX_ERROR rx_errors - # define IFA_TX_ERROR tx_errors - #else --# error "No suitable type for `struct ifaddrs->ifa_data' found." -+struct net_device_stats { -+ unsigned long rx_packets; -+ unsigned long tx_packets; -+ unsigned long rx_bytes; -+ unsigned long tx_bytes; -+ unsigned long rx_errors; -+ unsigned long tx_errors; -+ unsigned long rx_dropped; -+ unsigned long tx_dropped; -+ unsigned long multicast; -+ unsigned long collisions; -+ unsigned long rx_length_errors; -+ unsigned long rx_over_errors; -+ unsigned long rx_crc_errors; -+ unsigned long rx_frame_errors; -+ unsigned long rx_fifo_errors; -+ unsigned long rx_missed_errors; -+ unsigned long tx_aborted_errors; -+ unsigned long tx_carrier_errors; -+ unsigned long tx_fifo_errors; -+ unsigned long tx_heartbeat_errors; -+ unsigned long tx_window_errors; -+ unsigned long rx_compressed; -+ unsigned long tx_compressed; -+}; -+# define IFA_DATA net_device_stats -+# define IFA_RX_BYTES rx_bytes -+# define IFA_TX_BYTES tx_bytes -+# define IFA_RX_PACKT rx_packets -+# define IFA_TX_PACKT tx_packets -+# define IFA_RX_ERROR rx_errors -+# define IFA_TX_ERROR tx_errors - #endif - - struct IFA_DATA *if_data; diff --git a/utils/collectd/patches/150-fix-interface-af-link b/utils/collectd/patches/150-fix-interface-af-link deleted file mode 100644 index 806a6837b..000000000 --- a/utils/collectd/patches/150-fix-interface-af-link +++ /dev/null @@ -1,21 +0,0 @@ ---- a/src/interface.c -+++ b/src/interface.c -@@ -244,8 +244,8 @@ struct net_device_stats { - - for (if_ptr = if_list; if_ptr != NULL; if_ptr = if_ptr->ifa_next) - { -- if (if_ptr->ifa_addr != NULL && if_ptr->ifa_addr->sa_family == AF_LINK) { -- if_data = (struct IFA_DATA *) if_ptr->ifa_data; -+ if ((if_data = (struct IFA_DATA *) if_ptr->ifa_data) == NULL) -+ continue; - - if_submit (if_ptr->ifa_name, "if_octets", - if_data->IFA_RX_BYTES, -@@ -256,7 +256,6 @@ struct net_device_stats { - if_submit (if_ptr->ifa_name, "if_errors", - if_data->IFA_RX_ERROR, - if_data->IFA_TX_ERROR); -- } - } - - freeifaddrs (if_list);