Reenabled the "iptables" plugin - libiptc is available in Etch.

diff --git a/debian/README.Debian b/debian/README.Debian
index 0c640a11d7ee0b01ac79c6178b10042d949f8679..654b5aa6dce4a9d8cde170acc4231517b1e92177 100644 (file)
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -94,6 +94,10 @@ Examples:
   documentation for information about setup and configuration: perldoc
   Collectd.pm.
 
+- iptables/: This directory contains a script which will setup iptables to do
+  global logging of all traffic going in and out of an interface. This
+  information can then be collected by collectd's iptables plugin.
+
 - cussh.pl: "Collectd Unix Socket SHell" is a small, interactive front-end for
   the unixsock plugin. See the embedded POD documentation for details: perldoc
   cussh.pl.

diff --git a/debian/changelog b/debian/changelog
index 48b8c2c9bfcf5904d0ea9783d93087731e334bf5..ad7adbf502ec1e20b021c4ba3eab46c2294c8080 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,9 @@ collectd (4.3.2-1~bpo40+1) etch-backports; urgency=low
     they are not available in Etch and might confuse buildds.
   * Removed version from libvirt-dev build-dependency - a version with Xen
     support is currently not available on backports.org.
+  * Reenabled the "iptables" plugin - libiptc is available in Etch.
 
- -- Sebastian Harl <sh@tokkee.org>  Sun, 27 Apr 2008 15:32:40 +0200
+ -- Sebastian Harl <sh@tokkee.org>  Sun, 27 Apr 2008 16:48:59 +0200
 
 collectd (4.3.2-1) unstable; urgency=low
 

diff --git a/debian/collectd.conf b/debian/collectd.conf
index 36774256fe71dfa2284f5a452d6b90da717e4c93..086820cabc06e003b90b2385b78af453686f5df6 100644 (file)
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -42,6 +42,7 @@ LoadPlugin entropy
 #LoadPlugin exec
 #LoadPlugin hddtemp
 LoadPlugin interface
+#LoadPlugin iptables
 #LoadPlugin ipvs
 LoadPlugin irq
 #LoadPlugin libvirt
@@ -125,6 +126,10 @@ LoadPlugin users
 #      IgnoreSelected false
 #</Plugin>
 
+#<Plugin iptables>
+#      Chain "table" "chain"
+#</Plugin>
+
 #<Plugin irq>
 #      Irq 7
 #      Irq 8

diff --git a/debian/collectd.overrides b/debian/collectd.overrides
index 9350ff0865b305d7b97370fff09c1ec7e56d2c05..5208c6a58d5bcc5025db1bcefdb3a512f81e8703 100644 (file)
--- a/debian/collectd.overrides
+++ b/debian/collectd.overrides
@@ -1,4 +1,5 @@
 collectd: shlib-with-non-pic-code usr/lib/collectd/nut.so
+collectd: shlib-with-non-pic-code usr/lib/collectd/iptables.so
 collectd: shlib-with-non-pic-code usr/lib/collectd/netlink.so
 collectd: spelling-error-in-description mysql MySQL
 

diff --git a/debian/control b/debian/control
index 0a25851c3e11055b01ca94ab7ff3a2a1a2f58c9d..aebf6dc6d77c62502fb748832f118eae0699800a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: collectd
 Section: utils
 Priority: optional
 Maintainer: Sebastian Harl <sh@tokkee.org>
-Build-Depends: debhelper (>= 5), po-debconf, dpatch, bison | byacc, flex, autotools-dev, libcurl3-gnutls-dev, libmysqlclient15-dev | libmysqlclient14-dev, librrd2-dev | librrd0-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap0.8-dev | libpcap-dev, nut-dev [!alpha !amd64 !hppa !ia64 !ppc64], libperl-dev, iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64], libsnmp9-dev, libvirt-dev [amd64 i386 powerpc], libxml2-dev, libhal-dev
+Build-Depends: debhelper (>= 5), po-debconf, dpatch, bison | byacc, flex, autotools-dev, libcurl3-gnutls-dev, libmysqlclient15-dev | libmysqlclient14-dev, librrd2-dev | librrd0-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap0.8-dev | libpcap-dev, iptables-dev [!alpha !amd64 !hppa !ia64 !ppc64], nut-dev [!alpha !amd64 !hppa !ia64 !ppc64], libperl-dev, iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64], libsnmp9-dev, libvirt-dev [amd64 i386 powerpc], libxml2-dev, libhal-dev
 Build-Conflicts: libpthread-dev
 Standards-Version: 3.7.3
 Homepage: http://collectd.org/
@@ -47,6 +47,7 @@ Description: statistics collection and monitoring daemon
    * execution of external programs: exec
    * harddisk temperature: hddtemp
    * network traffic: interface
+   * iptables statistics: iptables
    * IPVS connection statistics: ipvs
    * IRQ counters: irq
    * CPU, dist, network statistics of guest systems: libvirt

diff --git a/debian/rules b/debian/rules
index 568c9a6ac0acce68917d55abf6d927b16da586b2..83334b62fa12bbed0d5e65a38c124a54676673d6 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -36,16 +36,13 @@ confflags = --host=$(DEB_HOST_GNU_TYPE) \
                        --disable-xmms \
                        --without-libstatgrab
 
-# libiptc is no longer available on Debian (see #472655).
-confflags += --disable-iptables
-
 # These plugins do not provide any functionality under Linux.
 confflags += --disable-apple_sensors --disable-tape
 
 # The static libraries iptc, netstat and upsclient cannot be used on
 # 64bit systems (see bugs #358637 and #419684 for more details).
 ifneq (,$(findstring $(DEB_BUILD_ARCH),alpha amd64 hppa ia64 ppc64))
-       confflags += --disable-netlink --disable-nut
+       confflags += --disable-iptables --disable-netlink --disable-nut
 endif
 
 # libvirt is only available on amd64, i386 and powerpc.
@@ -143,7 +140,7 @@ binary-arch: build install-arch
        dh_installexamples -a contrib/collectd2html.pl contrib/collection.cgi \
                contrib/exec-munin.conf contrib/exec-munin.px contrib/exec-smartctl \
                contrib/exec-nagios.conf contrib/exec-nagios.px \
-               contrib/SpamAssassin/ contrib/cussh.pl \
+               contrib/SpamAssassin/ contrib/iptables/ contrib/cussh.pl \
                contrib/snmp-data.conf contrib/add_rra.sh contrib/network-proxy.py
        dh_installdebconf -a
        dh_installinit -a -- defaults 95