Changeset 34487


Ignore:
Timestamp:
2012-12-04T17:20:55+01:00 (5 years ago)
Author:
florian
Message:

collectd: 4.10.8 version bump

Collectd, the backbone for LuCI statistics, has been updated to 4.10.8 a few
weeks ago. I have already used it in my trunk build for some time.

Among other things 4.10.8 fixes a few memory leaks and a perl incompatibility
(see https://dev.archive.openwrt.org/ticket/12494.html ).

4.10.8 increases compatibility with current kernels and iproute2 reducing the
patch 130-fix_netlink_kernel_3.3-patch unnecessary. It can be removed.

I have also included a new patch 920-fix-ping-droprate.patch for fixing LuCI
ticket 462 (http://luci.subsignal.org/trac/ticket/462).

Signed-off-by: hannu.nyman@…
Signed-off-by: Florian Fainelli <florian@…>

Location:
packages/utils/collectd
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • packages/utils/collectd/Makefile

    r32205 r34487  
    99 
    1010PKG_NAME:=collectd 
    11 PKG_VERSION:=4.10.7 
    12 PKG_RELEASE:=2 
     11PKG_VERSION:=4.10.8 
     12PKG_RELEASE:=1 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
    1515PKG_SOURCE_URL:=http://collectd.org/files/ 
    16 PKG_MD5SUM:=f4193fdb5002ddac8159c88032a726bc 
     16PKG_MD5SUM:=7a60495208b9383225493c6dd6abb2f0 
    1717 
    1818PKG_FIXUP:=autoreconf 
  • packages/utils/collectd/patches/003-remove-werror.patch

    r30533 r34487  
    1212--- a/src/Makefile.in 
    1313+++ b/src/Makefile.in 
    14 @@ -1836,7 +1836,7 @@ top_build_prefix = @top_build_prefix@ 
     14@@ -1833,7 +1833,7 @@ top_build_prefix = @top_build_prefix@ 
    1515 top_builddir = @top_builddir@ 
    1616 top_srcdir = @top_srcdir@ 
     
    3434--- a/src/libcollectdclient/Makefile.in 
    3535+++ b/src/libcollectdclient/Makefile.in 
    36 @@ -329,7 +329,7 @@ top_build_prefix = @top_build_prefix@ 
     36@@ -327,7 +327,7 @@ top_build_prefix = @top_build_prefix@ 
    3737 top_builddir = @top_builddir@ 
    3838 top_srcdir = @top_srcdir@ 
     
    5656--- a/src/owniptc/Makefile.in 
    5757+++ b/src/owniptc/Makefile.in 
    58 @@ -298,7 +298,7 @@ top_builddir = @top_builddir@ 
     58@@ -296,7 +296,7 @@ top_builddir = @top_builddir@ 
    5959 top_srcdir = @top_srcdir@ 
    6060 AUTOMAKE_OPTIONS = foreign no-dependencies 
  • packages/utils/collectd/patches/130-fix_netlink_kernel_3.3-patch

    r32121 r34487  
    1 Index: collectd-4.10.7/src/netlink.c 
    2 =================================================================== 
    3 --- collectd-4.10.7.orig/src/netlink.c  2012-04-01 16:20:24.000000000 +0200 
    4 +++ collectd-4.10.7/src/netlink.c       2012-06-07 17:22:16.212616882 +0200 
    5 @@ -223,7 +223,7 @@ 
    6   
    7    msg = NLMSG_DATA (nmh); 
    8   
    9 -  msg_len = nmh->nlmsg_len - sizeof (struct ifinfomsg); 
    10 +  msg_len = nmh->nlmsg_len - NLMSG_LENGTH(sizeof (struct ifinfomsg)); 
    11    if (msg_len < 0) 
    12    { 
    13      ERROR ("netlink plugin: link_filter: msg_len = %i < 0;", msg_len); 
    14 @@ -554,24 +554,19 @@ 
    15   
    16  static int ir_read (void) 
    17  { 
    18 -  struct ifinfomsg im; 
    19    struct tcmsg tm; 
    20    int ifindex; 
    21   
    22    static const int type_id[] = { RTM_GETQDISC, RTM_GETTCLASS, RTM_GETTFILTER }; 
    23    static const char *type_name[] = { "qdisc", "class", "filter" }; 
    24   
    25 -  memset (&im, '\0', sizeof (im)); 
    26 -  im.ifi_type = AF_UNSPEC; 
    27 - 
    28 -  if (rtnl_dump_request (&rth, RTM_GETLINK, &im, sizeof (im)) < 0) 
    29 +  if (rtnl_wilddump_request (&rth, AF_UNSPEC, RTM_GETLINK) < 0) 
    30    { 
    31      ERROR ("netlink plugin: ir_read: rtnl_dump_request failed."); 
    32      return (-1); 
    33    } 
    34   
    35 -  if (rtnl_dump_filter (&rth, link_filter, /* arg1 = */ NULL, 
    36 -       NULL, NULL) != 0) 
    37 +  if (rtnl_dump_filter (&rth, link_filter, /* arg1 = */ NULL) != 0) 
    38    { 
    39      ERROR ("netlink plugin: ir_read: rtnl_dump_filter failed."); 
    40      return (-1); 
    41 @@ -608,8 +603,7 @@ 
    42         continue; 
    43        } 
    44   
    45 -      if (rtnl_dump_filter (&rth, qos_filter, (void *) &ifindex, 
    46 -           NULL, NULL) != 0) 
    47 +      if (rtnl_dump_filter (&rth, qos_filter, (void *) &ifindex) != 0) 
    48        { 
    49         ERROR ("netlink plugin: ir_read: rtnl_dump_filter failed."); 
    50         continue; 
  • packages/utils/collectd/patches/200-fix-git-describe-error.patch

    r31308 r34487  
    33@@ -2,7 +2,7 @@ 
    44  
    5  DEFAULT_VERSION="4.10.7.git" 
     5 DEFAULT_VERSION="4.10.8.git" 
    66  
    77-VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`" 
  • packages/utils/collectd/patches/900-add-iwinfo-plugin.patch

    r32167 r34487  
    1111 # Checks for typedefs, structures, and compiler characteristics. 
    1212 # 
    13 @@ -4008,6 +4011,7 @@ plugin_interface="no" 
     13@@ -4081,6 +4084,7 @@ plugin_interface="no" 
    1414 plugin_ipmi="no" 
    1515 plugin_ipvs="no" 
     
    1919 plugin_load="no" 
    2020 plugin_memory="no" 
    21 @@ -4315,6 +4319,7 @@ AC_PLUGIN([ipmi],        [$plugin_ipmi], 
     21@@ -4388,6 +4392,7 @@ AC_PLUGIN([ipmi],        [$plugin_ipmi], 
    2222 AC_PLUGIN([iptables],    [$with_libiptc],      [IPTables rule counters]) 
    2323 AC_PLUGIN([ipvs],        [$plugin_ipvs],       [IPVS connection statistics]) 
     
    2727 AC_PLUGIN([libvirt],     [$plugin_libvirt],    [Virtual machine statistics]) 
    2828 AC_PLUGIN([load],        [$plugin_load],       [System load]) 
    29 @@ -4593,6 +4598,7 @@ Configuration: 
     29@@ -4666,6 +4671,7 @@ Configuration: 
    3030     protobuf-c  . . . . . $have_protoc_c 
    3131     oracle  . . . . . . . $with_oracle 
     
    3535   Features: 
    3636     daemon mode . . . . . $enable_daemon 
    37 @@ -4632,6 +4638,7 @@ Configuration: 
     37@@ -4705,6 +4711,7 @@ Configuration: 
    3838     iptables  . . . . . . $enable_iptables 
    3939     ipvs  . . . . . . . . $enable_ipvs 
     
    6868--- a/src/collectd.conf.pod 
    6969+++ b/src/collectd.conf.pod 
    70 @@ -1468,6 +1468,27 @@ and all other interrupts are collected. 
     70@@ -1478,6 +1478,27 @@ and all other interrupts are collected. 
    7171  
    7272 =back 
     
    251251--- a/src/Makefile.am 
    252252+++ b/src/Makefile.am 
    253 @@ -454,6 +454,15 @@ collectd_LDADD += "-dlopen" irq.la 
     253@@ -453,6 +453,15 @@ collectd_LDADD += "-dlopen" irq.la 
    254254 collectd_DEPENDENCIES += irq.la 
    255255 endif 
Note: See TracChangeset for help on using the changeset viewer.