patches/: Added rtnl_dump_filter.dpatch.

This patch updates the rtnl_dump_filter() signature to recent versions of
iproute2.

diff --git a/debian/changelog b/debian/changelog
index b805b7fbd0cfb7d08eeb4e081476b9efc4177f70..b2119511a5a8a95fe6eee27185048f0cce3d76e0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ collectd (4.10.7-1) unstable; urgency=low
       (Closes: #664429).
   * debian/patches/:
     - Removed ipvs_h_include.dpatch -- applied upstream.
+    - Added rtnl_dump_filter.dpatch, updating the rtnl_dump_filter() signature
+      to recent versions of iproute2.
   * debian/rules:
     - Use dpkg-buildflags to determine compiler/linker flags; this also
       enables hardening build flags; thanks to Moritz Muehlenhoff for

diff --git a/debian/patches/00list b/debian/patches/00list
index 070e1e06050c5577e7ac7cea3251b636e5404a1a..6321d1f38ad0d5568d4ddc75062041b7b953b090 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,4 @@
 rrd_filter_path.dpatch
 collection_conf_path.dpatch
 bts559801_plugin_find_fix.dpatch
+rtnl_dump_filter.dpatch

diff --git a/debian/patches/rtnl_dump_filter.dpatch b/debian/patches/rtnl_dump_filter.dpatch
new file mode 100644 (file)
index 0000000..948ac31
--- /dev/null
+++ b/debian/patches/rtnl_dump_filter.dpatch
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## rtnl_dump_filter.dpatch by Gaetan Bisson
+##
+## DP: netlink: Updated the signature of rtnl_dump_filter to recent iproute2.
+
+@DPATCH@
+
+diff -Naur old/src/netlink.c new/src/netlink.c
+--- old/src/netlink.c   2012-01-22 22:10:04.000000000 +1100
++++ new/src/netlink.c   2012-02-01 17:22:54.362752065 +1100
+@@ -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;