From bc42c002e814ad42bd2eda794911e08a813f9a9f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Mon, 23 Jan 2012 14:05:29 +0000 Subject: [PATCH] - up to 5.0.2 Changed files: collectd-netlink.patch -> 1.1 collectd.spec -> 1.118 --- collectd-netlink.patch | 22 ++++++++++++++++++++++ collectd.spec | 8 +++++--- 2 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 collectd-netlink.patch diff --git a/collectd-netlink.patch b/collectd-netlink.patch new file mode 100644 index 0000000..be25c2f --- /dev/null +++ b/collectd-netlink.patch @@ -0,0 +1,22 @@ +--- collectd-5.0.2/src/netlink.c~ 2012-01-22 12:10:04.000000000 +0100 ++++ collectd-5.0.2/src/netlink.c 2012-01-23 14:59:51.180465183 +0100 +@@ -570,8 +570,7 @@ + return (-1); + } + +- if (rtnl_dump_filter (&rth, link_filter, /* arg1 = */ NULL, +- NULL, NULL) != 0) ++ if (rtnl_dump_filter (&rth, link_filter, /* arg1 = */ NULL) != 0) + { + ERROR ("netlink plugin: ir_read: rtnl_dump_filter failed."); + return (-1); +@@ -608,8 +607,7 @@ + continue; + } + +- if (rtnl_dump_filter (&rth, qos_filter, (void *) &ifindex, +- NULL, NULL) != 0) ++ if (rtnl_dump_filter (&rth, qos_filter, (void *) &ifindex) != 0) + { + ERROR ("netlink plugin: ir_read: rtnl_dump_filter failed."); + continue; diff --git a/collectd.spec b/collectd.spec index c0528db..9646b9c 100644 --- a/collectd.spec +++ b/collectd.spec @@ -67,12 +67,12 @@ Summary: Collects system information in RRD files Summary(pl.UTF-8): Zbieranie informacji o systemie w plikach RRD Name: collectd -Version: 5.0.1 -Release: 4 +Version: 5.0.2 +Release: 2 License: GPL v2 Group: Daemons Source0: http://collectd.org/files/%{name}-%{version}.tar.bz2 -# Source0-md5: 9ad1e4334bd4a671284e8e92a3e3323e +# Source0-md5: 47f70ae20801f10be355dc8109d696aa Source1: %{name}.conf Source2: %{name}.init Source3: %{name}-http.conf @@ -84,6 +84,7 @@ Patch1: compile.patch Patch2: noquote.patch Patch3: libiptc.patch Patch4: pld.patch +Patch5: %{name}-netlink.patch URL: http://collectd.org/ %{?with_ipmi:BuildRequires: OpenIPMI-devel >= 2.0.14-3} BuildRequires: autoconf @@ -1202,6 +1203,7 @@ Perl files from Collectd package %patch2 -p1 %patch3 -p1 %patch4 -p0 +%patch5 -p1 %build %{__libtoolize} -- 2.43.0