Merged branch 'master' of git://git.tokkee.org/pkg-collectd.

diff --git a/debian/README.Debian b/debian/README.Debian
index b53ab9f5d9bcf9aa1fa025334c9c4518caeaccd7..65b543d44f4245e2a5775bd01e0a4e4c84547179 100644 (file)
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -117,6 +117,9 @@ Examples:
   protocol in pure Python. It currently supports to receive data and
   notifications from collectd.
 
+- collectd-unixsock.py: Python module providing an interface to collect's
+  unixsock 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 bcbe7eedc2119b575cc762a34348011029fa044c..c02aacda2fb659176eeac816b1e707b9100b97c4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+collectd (4.7.0-1) unstable; urgency=low
+
+  * New upstream release.
+    New plugins:
+    - Connection tracking table size: conntrack
+    - Linux file-system based caching framework statistics: fscache
+    - Receive and interpret Ganglia multicast traffic: gmond (disabled in
+      Debian, libganglia >= 3 is required)
+    - Embedded Java Virtual Machine: java
+    - Query and parse data from a memcache daemon: memcachec (disabled in
+      Debian, libmemcached is not available)
+    - Information about network protocols: protocols
+    - Parse table-like structured files: table
+    - Power consumption measurements from "The Energy Detective" (TED): ted
+    - System uptime: uptime
+  * debian/rules:
+    - Install collectd-unixsock.py to /usr/share/doc/collectd/examples/.
+    - Pass CPPFLAGS and CFLAGS as arguments to configure instead of setting
+      them in the environment - this is the recommended way.
+
+ -- Sebastian Harl <sh@tokkee.org>  Sun, 10 May 2009 19:57:25 +0200
+
 collectd (4.6.3-1) unstable; urgency=low
 
   * New upstream release.

diff --git a/debian/collectd.conf b/debian/collectd.conf
index 31ac1cdb8220a0fcc555cf4fc62fabe592387db9..8b5ca60e444aa033d6c5a9429a81fa4f28bcddaa 100644 (file)
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -10,7 +10,7 @@
 FQDNLookup true
 #BaseDir "/var/lib/collectd"
 #PluginDir "/usr/lib/collectd"
-#TypesDB "/usr/lib/collectd/types.db" "/etc/collectd/my_types.db"
+#TypesDB "/usr/share/collectd/types.db" "/etc/collectd/my_types.db"
 #Interval 10
 #ReadThreads 5
 
@@ -32,6 +32,7 @@ LoadPlugin syslog
 #LoadPlugin ascent
 LoadPlugin battery
 #LoadPlugin bind
+#LoadPlugin conntrack
 LoadPlugin cpu
 #LoadPlugin cpufreq
 #LoadPlugin csv
@@ -44,12 +45,14 @@ LoadPlugin disk
 LoadPlugin entropy
 #LoadPlugin exec
 #LoadPlugin filecount
+#LoadPlugin fscache
 #LoadPlugin hddtemp
 LoadPlugin interface
 #LoadPlugin ipmi
 #LoadPlugin iptables
 #LoadPlugin ipvs
 LoadPlugin irq
+#LoadPlugin java
 #LoadPlugin libvirt
 LoadPlugin load
 #LoadPlugin mbmon
@@ -71,16 +74,20 @@ LoadPlugin memory
 #LoadPlugin postgresql
 #LoadPlugin powerdns
 LoadPlugin processes
+#LoadPlugin protocols
 LoadPlugin rrdtool
 #LoadPlugin sensors
 #LoadPlugin serial
 #LoadPlugin snmp
 LoadPlugin swap
+#LoadPlugin table
 #LoadPlugin tail
 #LoadPlugin tcpconns
 #LoadPlugin teamspeak2
+#LoadPlugin ted
 #LoadPlugin thermal
 #LoadPlugin unixsock
+#LoadPlugin uptime
 LoadPlugin users
 #LoadPlugin uuid
 #LoadPlugin vmem
@@ -105,14 +112,16 @@ LoadPlugin users
 #      URL "http://localhost/ascent/status/"
 #      User "www-user"
 #      Password "secret"
+#      VerifyPeer false
+#      VerifyHost false
 #      CACert "/etc/ssl/ca.crt"
 #</Plugin>
 
 #<Plugin "bind">
 #      URL "http://localhost:8053/"
+#
 #      OpCodes true
 #      QTypes true
-#
 #      ServerStats true
 #      ZoneMaintStats true
 #      ResolverStats false
@@ -137,6 +146,9 @@ LoadPlugin users
 #              URL "http://finance.google.com/finance?q=NYSE%3AAMD"
 #              User "foo"
 #              Password "bar"
+#              VerifyPeer false
+#              VerifyHost false
+#              CACert "/etc/ssl/ca.crt"
 #              <Match>
 #                      Regex "<span +class=\"pr\"[^>]*> *([0-9]*\\.[0-9]+) *</span>"
 #                      DSType "GaugeAverage"
@@ -150,8 +162,11 @@ LoadPlugin users
 #      <Query "num_of_customers">
 #              Statement "SELECT 'customers' AS c_key, COUNT(*) AS c_value \
 #                              FROM customers_tbl"
+#              MinVersion 40102
+#              MaxVersion 50042
 #              <Result>
 #                      Type "gauge"
+#                      InstancePrefix "customer"
 #                      InstancesFrom "c_key"
 #                      ValuesFrom "c_value"
 #              </Result>
@@ -163,9 +178,9 @@ LoadPlugin users
 #              DriverOption "username" "collectd"
 #              DriverOption "password" "secret"
 #              DriverOption "dbname" "custdb0"
-#              #SelectDB "custdb0"
+#              SelectDB "custdb0"
 #              Query "num_of_customers"
-#              #Query "..."
+#              Query "..."
 #      </Database>
 #</Plugin>
 
@@ -189,6 +204,7 @@ LoadPlugin users
 #</Plugin>
 
 #<Plugin email>
+#      SocketFile "/var/run/collectd-email"
 #      SocketGroup "collectd"
 #      SocketPerms "0770"
 #      MaxConns 5
@@ -206,6 +222,7 @@ LoadPlugin users
 #              Name "*.conf"
 #              MTime "-5m"
 #              Size "+10k"
+#              Recursive true
 #      </Directory>
 #</Plugin>
 
@@ -220,6 +237,15 @@ LoadPlugin users
 #      IgnoreSelected false
 #</Plugin>
 
+#<Plugin ipmi>
+#      Sensor "some_sensor"
+#      Sensor "another_one"
+#      IgnoreSelected false
+#      NotifySensorAdd false
+#      NotifySensorRemove true
+#      NotifySensorNotPresent false
+#</Plugin>
+
 #<Plugin iptables>
 #      Chain "table" "chain"
 #</Plugin>
@@ -231,6 +257,15 @@ LoadPlugin users
 #      IgnoreSelected true
 #</Plugin>
 
+#<Plugin java>
+#      JVMArg "-verbose:jni"
+#
+#      LoadPlugin "org.collectd.java.Foobar"
+#      <Plugin "org.collectd.java.Foobar">
+#              Foo "Bar"
+#      </Plugin>
+#</Plugin>
+
 #<Plugin libvirt>
 #      Connection "xen:///"
 #      RefreshInterval 60
@@ -252,10 +287,21 @@ LoadPlugin users
 #</Plugin>
 
 #<Plugin mysql>
-#      Host "database.serv.er"
-#      User "db_user"
-#      Password "secret"
-#      Database "db_name"
+#      <Database db_name>
+#              Host "database.serv.er"
+#              Port "3306"
+#              User "db_user"
+#              Password "secret"
+#              Database "db_name"
+#              MasterStats true
+#      </Database>
+#
+#      <Database db_name2>
+#              Host "localhost"
+#              Socket "/var/run/mysql/mysqld.sock"
+#              SlaveStats true
+#              SlaveNotifications true
+#      </Database>
 #</Plugin>
 
 #<Plugin netlink>
@@ -335,15 +381,37 @@ LoadPlugin users
 #<Plugin ping>
 #      Host "host.foo.bar"
 #      Host "host.baz.qux"
+#      Interval 1.0
+#      Timeout 0.9
 #      TTL 255
 #</Plugin>
 
 #<Plugin postgresql>
 #      <Query magic>
-#              Query "SELECT magic, spells FROM wizard WHERE host = $1;"
+#              Statement "SELECT magic FROM wizard WHERE host = $1;"
 #              Param hostname
-#              Column gauge magic
-#              Column counter spells
+#
+#              <Result>
+#                      Type gauge
+#                      InstancePrefix "magic"
+#                      ValuesFrom "magic"
+#              </Result>
+#      </Query>
+#
+#      <Query rt36_tickets>
+#              Statement "SELECT COUNT(type) AS count, type \
+#                                FROM (SELECT CASE \
+#                                             WHEN resolved = 'epoch' THEN 'open' \
+#                                             ELSE 'resolved' END AS type \
+#                                             FROM tickets) type \
+#                                GROUP BY type;"
+#
+#              <Result>
+#                      Type counter
+#                      InstancePrefix "rt36_tickets"
+#                      InstancesFrom "type"
+#                      ValuesFrom "count"
+#              </Result>
 #      </Query>
 #
 #      <Database foo>
@@ -360,6 +428,9 @@ LoadPlugin users
 #
 #      <Database bar>
 #              Service "service_name"
+#
+#              Query backend # predefined
+#              Query rt36_tickets
 #      </Database>
 #</Plugin>
 
@@ -379,12 +450,19 @@ LoadPlugin users
 
 #<Plugin processes>
 #      Process "name"
+#      ProcessMatch "foobar" "/usr/bin/perl foobar\\.pl.*"
+#</Plugin>
+
+#<Plugin protocols>
+#      Value "/^Tcp:/"
+#      IgnoreSelected false
 #</Plugin>
 
 <Plugin rrdtool>
        DataDir "/var/lib/collectd/rrd"
 #      CacheTimeout 120
 #      CacheFlush 900
+#      WritesPerSecond 30
 #
 # The following settings are rather advanced
 # and should usually not be touched:
@@ -409,17 +487,20 @@ LoadPlugin users
 #              Type "voltage"
 #              Table false
 #              Instance "input_line1"
+#              Scale 0.1
 #              Values "SNMPv2-SMI::enterprises.6050.5.4.1.1.2.1"
 #      </Data>
 #      <Data "hr_users">
 #              Type "users"
 #              Table false
 #              Instance ""
+#              Shift -1
 #              Values "HOST-RESOURCES-MIB::hrSystemNumUsers.0"
 #      </Data>
 #      <Data "std_traffic">
 #              Type "if_octets"
 #              Table true
+#              InstancePrefix "traffic"
 #              Instance "IF-MIB::ifDescr"
 #              Values "IF-MIB::ifInOctets" "IF-MIB::ifOutOctets"
 #      </Data>
@@ -446,6 +527,25 @@ LoadPlugin users
 #      </Host>
 #</Plugin>
 
+#<Plugin table>
+#      <Table "/proc/slabinfo">
+#              Instance "slabinfo"
+#              Separator " "
+#              <Result>
+#                      Type gauge
+#                      InstancePrefix "active_objs"
+#                      InstancesFrom 0
+#                      ValuesFrom 1
+#              </Result>
+#              <Result>
+#                      Type gauge
+#                      InstancePrefix "objperslab"
+#                      InstancesFrom 0
+#                      ValuesFrom 4
+#              </Result>
+#      </Table>
+#</Plugin>
+
 #<Plugin "tail">
 #      <File "/var/log/exim4/mainlog">
 #              Instance "exim"
@@ -476,6 +576,11 @@ LoadPlugin users
 #      Server "8767"
 #</Plugin>
 
+#<Plugin ted>
+#      Device "/dev/ttyUSB0"
+#      Retries 0
+#</Plugin>
+
 #<Plugin thermal>
 #      ForceUseProcfs false
 #      Device "THRM"

diff --git a/debian/control b/debian/control
index bfc9d37bbe7aa25aafc8483d1a916640a6a92fff..e0582f8b9d00fdfc839d9e3cafa6806be23c2dce 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -40,6 +40,7 @@ Description: statistics collection and monitoring daemon
    * Ascent server statistics: ascent
    * battery status: battery
    * bind9 name-server and zone statistics: bind
+   * connection tracking table size: conntrack
    * CPU utilization: cpu
    * CPU frequency: cpufreq
    * output to comma separated values (CSV) files: csv
@@ -52,12 +53,14 @@ Description: statistics collection and monitoring daemon
    * amount of available entropy: entropy
    * execution of external programs: exec
    * count the number of files in directories: filecount
+   * Linux file-system based caching framework statistics: fscache
    * harddisk temperature: hddtemp
    * network traffic: interface
    * IPMI sensors information: ipmi
    * iptables statistics: iptables
    * IPVS connection statistics: ipvs
    * IRQ counters: irq
+   * embedded Java Virtual Machine: java
    * CPU, disk, network statistics of guest systems: libvirt
    * system load averages: load
    * logging to files, STDOUT and STDERR: logfile
@@ -81,16 +84,20 @@ Description: statistics collection and monitoring daemon
    * output to RRD files: rrdtool
    * embedded Perl interpreter: perl
    * network latency statistics: ping
+   * information about network protocols: protocols
    * lm_sensors information (e.g. CPU temperature, fan speeds): sensors
    * serial port traffic: serial
    * values from SNMP enabled network devices: snmp
    * swap usage: swap
    * logging to syslog: syslog
+   * parse table-like structured files: table
    * incremental parsing of logfiles: tail
    * number of TCP connections to specific ports: tcpconns
+   * power consumption measurements from "The Energy Detective" (TED): ted
    * Linux ACPI thermal zone information: thermal
    * TeamSpeak2 server statistics: teamspeak2
    * external runtime interface: unixsock
+   * system uptime: uptime
    * number of users logged into the system: users
    * set the hostname to an unique identifier: uuid
    * detailed virtual memory statistics: vmem
@@ -132,7 +139,7 @@ Description: statistics collection and monitoring daemon (debugging symbols)
 
 Package: collectd-dev
 Architecture: all
-Depends: collectd (>= ${source:Version}), collectd (<< 4.7~), ${misc:Depends}
+Depends: collectd (>= ${source:Version}), collectd (<< 4.8~), ${misc:Depends}
 Description: statistics collection and monitoring daemon (development files)
  collectd is a small daemon which collects system information periodically and
  provides mechanisms to monitor and store the values in a variety of ways.

diff --git a/debian/copyright b/debian/copyright
index bc1bd461f8e2d5b86bb8951a787be8ea90fe7b65..2dde8149c79db7a4717a751eb7f125531d5aa9b3 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,30 +10,38 @@ Upstream Authors:
        For individual credits, see AUTHORS.
 
 Copyright Holders (in alphabetical order):
+       Adrian Perez <aperez@igalia.com>
        Alessandro Iurlano <alessandro.iurlano@gmail.com>
        Alexander Wirt <formorer@formorer.de>
        Américo Monteiro
+       Amit Gupta <amit.gupta221@gmail.com>
        Andre M. Hedrick <andre@suse.com>
        Anthony Gialluca <tonyabg@charter.net>
        Antony Dovgal <tony@daylessday.org>
        Bruno Prémont <bonbons@linux-vserver.org>
        C-Ware, Inc.
+       Clay Loveless <clay@killersoft.com>
        David Bacher <drbacher@gmail.com>
        Doug MacEachern <dougm@hyperic.com>
+       Edward Konetzko <konetzed@quixoticagony.com>
+       Eric Reed <ericr@reedhome.net>
        Eric Spreen <erispre@gmail.com>
        Flavio Stanchina <flavio@stanchina.net>
        Florent Monbillard <eppo@darox.net>
        Florent Usseil <swiip81@free.fr>
        Florian Forster <octo@verplant.org>
+       Franck Lombardi
        Free Software Foundation, Inc.
        Jacobo Tarrio <jtarrio@debian.org>
        Jason Pepas <cell@ices.utexas.edu>
        Juan Jose Ciarlante <jjciarla@raiz.uncu.edu.ar>
        Julian Anastasov <ja@ssi.bg>
+       Justo Alonso Achaques <justo.alonso@gmail.com>
        Kai Wasserbäch <debian@carbon-project.org>
        Kern Sibbald
        Lubos Stanek <lubek@users.sourceforge.net>
        Lyonel Vincent <lyonel@ezix.org>
+       Marco Chiappero <marco@absence.it>
        Martin Bagge <brother@bsnet.se>
        Michael Stapelberg <michael+git@stapelberg.de>
        Michał Mirosław <mirq-linux@rere.qmqm.pl>
@@ -45,6 +53,7 @@ Copyright Holders (in alphabetical order):
        Peter Holik <peter@holik.at>
        Peter Kese <peter.kese@ijs.si>
        Red Hat Inc.
+       Rodolphe Quiédeville <rquiedeville@bearstech.com>
        Scott Garrett <sgarrett@technomancer.com>
        Sebastian Harl <sh@tokkee.org>
        Simon Kuhnle <simon@blarzwurst.de>
@@ -52,6 +61,7 @@ Copyright Holders (in alphabetical order):
        Stefan Hacker <d0t@dbclan.de>
        Steven Clarke <steven@monmouth.demon.co.uk>
        The Regents of the University of California
+       Tomasz Pala <gotar@pld-linux.org>
        Vincent Stehlé <vincent.stehle@free.fr>
        Wensong Zhang <wensong@linuxvirtualserver.org>
        Wouter Gadeyne
@@ -69,6 +79,7 @@ Licenses:
              src/email.c
              src/notify_desktop.c
              src/perl.c
+             src/table.c
              src/types.db.pod
              src/utils_cmd_flush.h
              src/utils_subst.c
@@ -76,8 +87,15 @@ Licenses:
        Copyright © 2006-2008 Sebastian Harl <sh@tokkee.org>
        License: GNU General Public License
 
-       Files contrib/collectd2html.pl
-             src/hddtemp.c
+       File contrib/collectd-network.py
+       Copyright © 2009 Adrian Perez <aperez@igalia.com>
+       License: GNU General Public License
+
+       File contrib/collectd-unixsock.py
+       Copyright © 2008 Clay Loveless <clay@killersoft.com>
+       License: GNU General Public License
+
+       File contrib/collectd2html.pl
        Copyright © 2006 Vincent Stehlé <vincent.stehle@free.fr>
        License: GNU General Public License
 
@@ -98,8 +116,9 @@ Licenses:
        License: GNU General Public License
 
        File src/apache.c
-       Copyright © 2006-2008 Florian Forster <octo@verplant.org>
+       Copyright © 2006-2009 Florian Forster <octo@verplant.org>
        Copyright © 2007 Florent Monbillard <eppo@darox.net>
+       Copyright © 2009 Amit Gupta <amit.gupta221@gmail.com>
        License: GNU General Public License
 
        File src/apcups.c
@@ -133,6 +152,10 @@ Licenses:
        Copyright © 2006-2009 Sebastian Harl
        License: GNU General Public License
 
+       File src/conntrack.c
+       Copyright © 2009 Tomasz Pala <gotar@pld-linux.org>
+       License: GNU General Public License
+
        File src/cpu.c
        Copyright © 2005-2009 Florian Forster <octo@verplant.org>
        Copyright © 2008 Oleg King <king2@kaluga.ru>
@@ -161,6 +184,10 @@ Licenses:
        Copyright © 2008 Florian Forster <octo@verplant.org>
        License: GNU General Public License
 
+       File src/fscache.c
+       Copyright © 2009 Edward Konetzko <konetzed@quixoticagony.com>
+       License: GNU General Public License
+
        File src/hddtemp.c
        Copyright © 2005-2006 Vincent Stehlé <vincent.stehle@free.fr>
        Copyright © 2006-2007 Florian Forster <octo@verplant.org>
@@ -176,6 +203,7 @@ Licenses:
        File src/iptables.c
        Copyright © 2007 Sjoerd van der Berg <harekiet@users.sourceforge.net>
        Copyright © 2007 Florian Forster <octo@verplant.org>
+       Copyright © 2009 Marco Chiappero <marco@absence.it>
        License: GNU General Public License
 
        File src/ipvs.c
@@ -185,6 +213,11 @@ Licenses:
        Copyright © 2007 Sebastian Harl <sh@tokkee.org>
        License: GNU General Public License
 
+       File src/java.c
+       Copyright © 2008 Justo Alonso Achaques <justo.alonso@gmail.com>
+       Copyright © 2009 Florian Forster <octo@verplant.org>
+       License: GNU General Public License
+
        Files src/libiptc/*
        Copyright © 1999-2008 Netfilter Core Team
        License: GNU General Public License
@@ -199,15 +232,30 @@ Licenses:
        Copyright © 2006-2007 Florian Forster <octo@verplant.org>
        License: GNU General Public License
 
+       Files src/memcachec.c
+             src/openvpn.c
+       Copyright © 2008-2009 Doug MacEachern <dougm@hyperic.com>
+       Copyright © 2006-2009 Florian Forster <octo@verplant.org>
+       License: GNU General Public License
+
        File src/memcached.c
        Copyright © 2007 Antony Dovgal
        Copyright © 2007-2009 Florian Forster <octo@verplant.org>
        Copyright © 2009 Doug MacEachern <dougm@hyperic.com>
+       Copyright © Franck Lombardi
+       License: GNU General Public License
+
+       File src/memory.c
+       Copyright © 2005-2008 Florian Forster <octo@verplant.org>
+       Simon Kuhnle <simon@blarzwurst.de>
        License: GNU General Public License
 
        File src/mysql.c
        Copyright © 2006-2009 Florian Forster <octo@verplant.org>
        Copyright © 2008 Mirko Buffoni <briareos@eswat.org>
+       Copyright © 2009 Doug MacEachern <dougm@hyperic.com>
+       Copyright © 2009 Sebastian Harl <sh@tokkee.org>
+       Copyright © 2009 Rodolphe Quiédeville <rquiedeville@bearstech.com>
        License: GNU General Public License
 
        File src/nfs.c
@@ -218,11 +266,6 @@ Licenses:
        Copyright © 2008 Oleg King <king2@kaluga.ru>
        License: GNU General Public License
 
-       File src/openvpn.c
-       Copyright © 2008 Doug MacEachern <dougm@hyperic.com>
-       Copyright © 2009 Florian Forster <octo@verplant.org>
-       License: GNU General Public License
-
        Files src/powerdns.c
              src/utils_tail.c
              src/utils_tail_match.c
@@ -261,10 +304,18 @@ Licenses:
        Copyright © 2008 Florian Forster
        License: GNU General Public License
 
+       File src/ted.c
+       Copyright © 2009 Eric Reed <ericr@reedhome.net>
+       License: GNU General Public License
+
        File src/thermal.c
        Copyright © 2008 Michał Mirosław <mirq-linux@rere.qmqm.pl>
        License: GNU General Public License
 
+       File src/uptime.c
+       Copyright © 2009 Marco Chiappero <marco@absence.it>
+       License: GNU General Public License
+
        File src/users.c
        Copyright © 2005-2007 Sebastian Harl <sh@tokkee.org>
        Copyright © 2005 Niki W. Waibel <niki.waibel@newlogic.com>

diff --git a/debian/rules b/debian/rules
index c944ebe6ff8d6b653bda2d500100699841d57251..7ab0eb275964a277ac3b1f39bca6a3bdb28e3f72 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -39,15 +39,31 @@ confflags = --host=$(DEB_HOST_GNU_TYPE) \
                        --mandir=\$${prefix}/share/man \
                        --localstatedir=/var --sysconfdir=/etc \
                        --with-perl-bindings="INSTALLDIRS=vendor" \
-                       --disable-onewire \
-                       --disable-xmms \
                        --without-libstatgrab
 
 # These plugins do not provide any functionality under Linux.
 confflags += --disable-apple_sensors --disable-tape
 
+# libganglia >= 3 is required for the gmond plugin.
+confflags += --disable-gmond
+
+# libmemcached is required for the memcachec plugin.
+confflags += --disable-memcachec
+
+# libowcapi is required for the onewire plugin.
+confflags += --disable-onewire
+
+# libclntsh is required for the oracle plugin.
+confflags += --disable-oracle
+
+# rrdclient support in librrd is required for the rrdcached plugin.
+confflags += --disable-rrdcached
+
+# xmms1 is required for the xmms plugin.
+confflags += --disable-xmms
+
 # The static library netstat cannot be linked into shared objects on some
-# architectures (see bugs #358637 and #419684 for more details).
+# architectures (see bugs #358637, #419684 and #524593 for more details).
 ifneq (,$(findstring $(DEB_BUILD_ARCH),alpha amd64 hppa ia64 ppc64 mips mipsel))
        confflags += --disable-netlink
 endif
@@ -59,7 +75,7 @@ endif
 
 config.status: configure $(DPATCH_STAMPFN)
        dh_testdir
-       CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" ./configure $(confflags)
+       ./configure $(confflags) CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)"
 
 build: build-stamp
 
@@ -136,7 +152,7 @@ binary-arch: build install-arch
                contrib/exec-nagios.conf contrib/exec-nagios.px \
                contrib/SpamAssassin/ contrib/iptables/ contrib/cussh.pl \
                contrib/snmp-data.conf contrib/add_rra.sh contrib/network-proxy.py \
-               contrib/collectd-network.py \
+               contrib/collectd-network.py contrib/collectd-unixsock.py \
                contrib/snmp-probe-host.px
        dh_installdebconf -a
        dh_installinit -a -- defaults 95