patches/: Removed rtnl_dump_filter.dpatch; merged upstream.

diff --git a/debian/changelog b/debian/changelog
index c06a08d11929b5406eeead34270d8981905fcbe0..10c4a5a0444236b2f2c05b0906032b9176ebc496 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ collectd (5.2.0-1) UNRELEASED; urgency=low
       the 'pf' plugin on non-kfreebsd systems.
   * debian/patches:
     - Removed migrate-4-5-df.dpatch; merged upstream.
+    - Removed rtnl_dump_filter.dpatch; merged upstream.
 
  -- Sebastian Harl <tokkee@debian.org>  Tue, 20 Nov 2012 11:35:22 +0100
 

diff --git a/debian/patches/00list b/debian/patches/00list
index 6321d1f38ad0d5568d4ddc75062041b7b953b090..070e1e06050c5577e7ac7cea3251b636e5404a1a 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,4 +1,3 @@
 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
deleted file mode 100644 (file)
index 948ac31..0000000
--- a/debian/patches/rtnl_dump_filter.dpatch
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /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;