patches: Removed bts542859-df-fix-ignorelist.dpatch.

This patch has been included upstream.

diff --git a/debian/changelog b/debian/changelog
index b600e83ea5ff346fdee59ec7cc21f167b3861a53..52a71a54e85549db4953f7112d641079f9956a55 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,8 +18,9 @@ collectd (4.8.1-1) unstable; urgency=low
   * debian/patches:
     - Removed bts535787-powerdns-fix-localsocket.dpatch - included upstream.
     - Removed bts541953-curl-followlocation.dpatch - included upstream.
+    - Removed bts542859-df-fix-ignorelist.dpatch - included upstream.
 
- -- Sebastian Harl <tokkee@debian.org>  Sun, 11 Oct 2009 19:13:42 +0200
+ -- Sebastian Harl <tokkee@debian.org>  Sun, 11 Oct 2009 19:15:33 +0200
 
 collectd (4.7.2-1) unstable; urgency=low
 

diff --git a/debian/patches/00list b/debian/patches/00list
index be95bdfffa32276655f9eab1bb7f2a2c517dfa28..7297c986cedfaceb709d43dd4d12529dd9a0f2dc 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -4,5 +4,4 @@ network-fix-cacheflush.dpatch
 libvirt-reconnect.dpatch
 plugin-fix-unregister.dpatch
 java-fix-jvm-start.dpatch
-bts542859-df-fix-ignorelist.dpatch
 

diff --git a/debian/patches/bts542859-df-fix-ignorelist.dpatch b/debian/patches/bts542859-df-fix-ignorelist.dpatch
deleted file mode 100755 (executable)
index 8a55f8c..0000000
--- a/debian/patches/bts542859-df-fix-ignorelist.dpatch
+++ /dev/null
@@ -1,56 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## bts542859-df-fix-ignorelist.dpatch by Florian Forster <octo@verplant.org>
-##
-## DP: df plugin: Check ignorelists before stat'ing the filesystem.
-
-@DPATCH@
-
-diff a/src/df.c b/src/df.c
---- a/src/df.c
-+++ b/src/df.c
-@@ -155,22 +155,6 @@ static int df_read (void)
- 
-       for (mnt_ptr = mnt_list; mnt_ptr != NULL; mnt_ptr = mnt_ptr->next)
-       {
--              if (STATANYFS (mnt_ptr->dir, &statbuf) < 0)
--              {
--                      char errbuf[1024];
--                      ERROR ("statv?fs failed: %s",
--                                      sstrerror (errno, errbuf,
--                                              sizeof (errbuf)));
--                      continue;
--              }
--
--              if (!statbuf.f_blocks)
--                      continue;
--
--              blocksize = BLOCKSIZE(statbuf);
--              df_free = statbuf.f_bfree * blocksize;
--              df_used = (statbuf.f_blocks - statbuf.f_bfree) * blocksize;
--
-               if (strcmp (mnt_ptr->dir, "/") == 0)
-               {
-                       sstrncpy (mnt_name, "root", sizeof (mnt_name));
-@@ -197,6 +181,22 @@ static int df_read (void)
-               if (ignorelist_match (il_fstype, mnt_ptr->type))
-                       continue;
- 
-+              if (STATANYFS (mnt_ptr->dir, &statbuf) < 0)
-+              {
-+                      char errbuf[1024];
-+                      ERROR ("statv?fs failed: %s",
-+                                      sstrerror (errno, errbuf,
-+                                              sizeof (errbuf)));
-+                      continue;
-+              }
-+
-+              if (!statbuf.f_blocks)
-+                      continue;
-+
-+              blocksize = BLOCKSIZE(statbuf);
-+              df_free = statbuf.f_bfree * blocksize;
-+              df_used = (statbuf.f_blocks - statbuf.f_bfree) * blocksize;
-+
-               df_submit (mnt_name, df_used, df_free);
-       }
-