Merged commit 'collectd-4.10.1-1' into lenny-backports.

diff --git a/debian/changelog b/debian/changelog
index f39cd818b660c44912ca30b32ba591acc394e291..7c3a1c0e03b55b4861b2d2d3d4786e30ef6cb26d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,49 @@
+collectd (4.10.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/patches:
+    - Removed bts561577_collectd2html_recursive_fix -- applied upstream.
+    - Removed bts575029-collectd2html-xhtml -- applied upstream.
+    - Removed bts557599_powerdns_fix -- applied upstream.
+  * debian/control:
+    - Updated standards-version to 3.9.1 -- no changes.
+
+ -- Sebastian Harl <tokkee@debian.org>  Wed, 28 Jul 2010 18:45:31 +0200
+
+collectd (4.10.0-1) unstable; urgency=low
+
+  * New upstream release:
+    New plugins:
+    - Parse XML data: curl_xml
+    - Parse values from Modbus/TCP enabled devices: modbus (disabled in
+      Debian; libmodbus is not available)
+    - Timing values from Pinba: pinba
+  * debian/control:
+    - Build-depend on libprotobuf-c0-dev and protobuf-c-compiler required by
+      the 'pinba' plugin.
+    - Updated to standards-version 3.8.4 -- no changes.
+  * debian/patches:
+    - Removed bts566199_collection_hide_types -- applied upstream.
+    - Removed typo_fixes -- applied upstream.
+    - Added bts575029-collectd2html-xhtml, adding support for XHTML to
+      collectd2html.pl; thanks to Ivan Shmakov for reporting this and Max
+      Henkel and Timur Kirilichev for providing patches (Closes: #575029).
+  * debian/rules:
+    - Define (and pass to configure) $JAR, required by current versions of the
+      Java bindings.
+    - Added support for Renesas SH4 to the Java arch mapping; thanks to
+      Nobuhiro Iwamatsu for the patch (Closes: #564165).
+  * debian/collectd.postinst:
+    - Manually replace /usr/share/doc/collectd/examples/ with a symlink when
+      upgrading from versions << 4.10.0-1~ -- this is not handled by dpkg
+      according to policy 6.6; thanks to Joey Hess for reporting this
+      (Closes: #569268).
+  * debian/collectd-core.overrides:
+    - Override 'capitalization-error-in-description python Python' -- all
+      plugin names are spelled in lower-case letters.
+
+ -- Sebastian Harl <tokkee@debian.org>  Tue, 08 Jun 2010 00:42:56 +0200
+
 collectd (4.9.1-2~bpo50+2) lenny-backports; urgency=low
 
   * debian/control:

diff --git a/debian/collectd-core.overrides b/debian/collectd-core.overrides
index 46040ec63db18961baafd7cd32d5e69b66fe26b2..1d380904b6c234be012c785d78f973bd90b8a402 100644 (file)
--- a/debian/collectd-core.overrides
+++ b/debian/collectd-core.overrides
@@ -5,6 +5,7 @@ collectd-core: shlib-with-non-pic-code usr/lib/collectd/netlink.so
 collectd-core: capitalization-error-in-description apache Apache
 collectd-core: capitalization-error-in-description mysql MySQL
 collectd-core: capitalization-error-in-description postgresql PostgreSQL
+collectd-core: capitalization-error-in-description python Python
 
 # The "java" plugin uses libjvm.so which can only be found in a non-standard
 # directory. According to the Java guys the path name and the ABI is stable

diff --git a/debian/collectd.conf b/debian/collectd.conf
index b138a50175dda35263ed89f03d291fb79c3c32c7..a05694aaa0ce11ba5df14ed337327afb355d7958 100644 (file)
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -12,6 +12,7 @@ FQDNLookup true
 #PluginDir "/usr/lib/collectd"
 #TypesDB "/usr/share/collectd/types.db" "/etc/collectd/my_types.db"
 #Interval 10
+#Timeout 2
 #ReadThreads 5
 
 #LoadPlugin logfile
@@ -21,6 +22,7 @@ LoadPlugin syslog
 #      LogLevel "info"
 #      File STDOUT
 #      Timestamp true
+#      PrintSeverity false
 #</Plugin>
 
 <Plugin syslog>
@@ -38,6 +40,7 @@ LoadPlugin cpu
 #LoadPlugin cpufreq
 #LoadPlugin csv
 #LoadPlugin curl
+#LoadPlugin curl_xml
 #LoadPlugin dbi
 LoadPlugin df
 LoadPlugin disk
@@ -73,6 +76,7 @@ LoadPlugin memory
 #LoadPlugin olsrd
 #LoadPlugin openvpn
 #LoadPlugin perl
+#LoadPlugin pinba
 #LoadPlugin ping
 #LoadPlugin postgresql
 #LoadPlugin powerdns
@@ -173,6 +177,25 @@ LoadPlugin users
 #      </Page>
 #</Plugin>
 
+#<Plugin "curl_xml">
+#      <URL "http://localhost/stats.xml">
+#              Host "my_host"
+#              Instance "some_instance"
+#              User "collectd"
+#              Password "thaiNg0I"
+#              VerifyPeer true
+#              VerifyHost true
+#              CACert "/path/to/ca.crt"
+#
+#              <XPath "table[@id=\"magic_level\"]/tr">
+#                      Type "magic_level"
+#                      InstancePrefix "prefix-"
+#                      InstanceFrom "td[1]"
+#                      ValuesFrom "td[2]/span[@class=\"level\"]"
+#              </XPath>
+#      </URL>
+#</Plugin>
+
 #<Plugin dbi>
 #      <Query "num_of_customers">
 #              Statement "SELECT 'customers' AS c_key, COUNT(*) AS c_value \
@@ -242,6 +265,7 @@ LoadPlugin users
 #              MTime "-5m"
 #              Size "+10k"
 #              Recursive true
+#              IncludeHidden false
 #      </Directory>
 #</Plugin>
 
@@ -278,6 +302,7 @@ LoadPlugin users
 
 #<Plugin java>
 #      JVMArg "-verbose:jni"
+#      JVMArg "-Djava.class.path=/usr/share/collectd/java/collectd-api.jar"
 #
 #      LoadPlugin "org.collectd.java.GenericJMX"
 #      <Plugin "GenericJMX">
@@ -353,6 +378,7 @@ LoadPlugin users
 #              SecurityLevel Encrypt
 #              Username "user"
 #              Password "secret"
+#              Interface "eth0"
 #      </Server>
 #      TimeToLive "128"
 #
@@ -361,6 +387,7 @@ LoadPlugin users
 #      <Listen "239.192.74.66" "25826">
 #              SecurityLevel Sign
 #              AuthFile "/etc/collectd/passwd"
+#              Interface "eth0"
 #      </Listen>
 #      MaxPacketSize 1024
 #
@@ -369,6 +396,9 @@ LoadPlugin users
 #
 #      # statistics about the network plugin itself
 #      ReportStats false
+#
+#      # "garbage collection"
+#      CacheFlush 1800
 #</Plugin>
 
 #<Plugin nginx>
@@ -419,11 +449,15 @@ LoadPlugin users
 
 #<Plugin openvpn>
 #      StatusFile "/etc/openvpn/openvpn-status.log"
+#      ImprovedNamingSchema false
+#      CollectCompression true
+#      CollectIndividualUsers true
+#      CollectUserCount false
 #</Plugin>
 
 #<Plugin perl>
 #      IncludeDir "/my/include/path"
-#      BaseName "Collectd::Plugin"
+#      BaseName "Collectd::Plugins"
 #      EnableDebugger ""
 #      LoadPlugin Monitorus
 #      LoadPlugin OpenVZ
@@ -434,6 +468,16 @@ LoadPlugin users
 #      </Plugin>
 #</Plugin>
 
+#<Plugin pinba>
+#      Address "::0"
+#      Port "30002"
+#      <View "name">
+#              Host "host name"
+#              Server "server name"
+#              Script "script name"
+#      <View>
+#</Plugin>
+
 #<Plugin ping>
 #      Host "host.foo.bar"
 #      Host "host.baz.qux"
@@ -486,6 +530,7 @@ LoadPlugin users
 #      </Database>
 #
 #      <Database bar>
+#              Interval 60
 #              Service "service_name"
 #
 #              Query backend # predefined
@@ -628,6 +673,7 @@ LoadPlugin users
 #              </Match>
 #              <Match>
 #                      Regex "\\<R=local_user\\>"
+#                      ExcludeRegex "\\<R=local_user\\>.*mail_spool defer"
 #                      DSType "CounterInc"
 #                      Type "counter"
 #                      Instance "local_user"
@@ -676,6 +722,11 @@ LoadPlugin users
 #      <URL "http://example.com/collectd-post">
 #              User "collectd"
 #              Password "secret"
+#              VerifyPeer true
+#              VerifyHost true
+#              CACert "/etc/ssl/ca.crt"
+#              Format "Command"
+#              StoreRates false
 #      </URL>
 #</Plugin>
 

diff --git a/debian/collectd.postinst b/debian/collectd.postinst
index 8fe504880823c3baacc76207cd25e5adba672823..99bfabf4279d96d30892926100d747c0f516e403 100644 (file)
--- a/debian/collectd.postinst
+++ b/debian/collectd.postinst
@@ -25,6 +25,17 @@ if [ -x "/etc/init.d/collectd" ]; then
        fi
 fi
 
+# replace the directory provided by older versions of the package with a
+# symlink; dpkg does not handle that according to policy 6.6
+if [ "$1" = "configure" ] \
+               && dpkg --compare-versions "$2" lt-nl "4.10.0-1~"; then
+       if [ -d "/usr/share/doc/collectd/examples" ]; then
+               ! rmdir /usr/share/doc/collectd/examples > /dev/null 2>&1 \
+                       || ln -s ../collectd-core/examples \
+                               /usr/share/doc/collectd/examples
+       fi
+fi
+
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.
 

diff --git a/debian/control b/debian/control
index 9f607a05c6628672604c74963525cae433674fb7..54bbabbf4ab4c9037839824fbb784bf6756dee49 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,7 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
  libpcap0.8-dev | libpcap-dev,
  libperl-dev,
  libpq-dev,
+ libprotobuf-c0-dev,
  librrd-dev,
  libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64],
  libsnmp-dev | libsnmp9-dev,
@@ -26,9 +27,10 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
  libxml2-dev,
  linux-libc-dev (>= 2.6.25-4) [!kfreebsd-i386 !kfreebsd-amd64] | linux-libc-dev (<< 2.6.25-1) [!kfreebsd-i386 !kfreebsd-amd64],
  openjdk-6-jdk [!hppa !kfreebsd-i386 !kfreebsd-amd64],
+ protobuf-c-compiler,
  python-dev
 Build-Conflicts: libpthread-dev, iptables-dev
-Standards-Version: 3.8.3
+Standards-Version: 3.9.1
 Homepage: http://collectd.org/
 Vcs-Git: git://git.tokkee.org/pkg-collectd.git
 Vcs-Browser: http://git.tokkee.org/?p=pkg-collectd.git
@@ -71,10 +73,12 @@ Description: statistics collection and monitoring daemon (core system)
    * battery status: battery
    * bind9 name-server and zone statistics: bind
    * connection tracking table size: conntrack
+   * number of context switches done by the operating system: contextswitch
    * CPU utilization: cpu
    * CPU frequency: cpufreq
    * output to comma separated values (CSV) files: csv
    * parse statistics from websites: curl
+   * parse XML data: curl_xml
    * query data from a relational database: dbi
    * disk space usage: df
    * disk and partition throughput: disk
@@ -99,6 +103,7 @@ Description: statistics collection and monitoring daemon (core system)
    * motherboard monitor: mbmon
    * statistics of the memcached distributed caching system: memcached
    * memory usage: memory
+   * statistics from mon.itor.us: Monitorus (Perl based plugin)
    * multimeter statistics: multimeter
    * MySQL statistics provided by MySQL's "show status" command: mysql
    * detailed Linux network interface and routing statistics: netlink
@@ -109,15 +114,18 @@ Description: statistics collection and monitoring daemon (core system)
    * send notification E-mails: notify_email
    * NTP daemon's local clock drift, offset to peers, etc.: ntpd
    * UPS information: nut
-   * OpenVPN traffic and compression statistics: openvpn
    * Optimized Link State Routing daemon statistics: olsrd
+   * OpenVPN traffic and compression statistics: openvpn
+   * OpenVZ statistics: OpenVZ (Perl based plugin)
+   * embedded Perl interpreter: perl
+   * timing values from Pinba: pinba
+   * network latency statistics: ping
    * PostgreSQL database statistics: postgresql
    * PowerDNS name server statistics: powerdns
    * number of processes: processes
-   * output to RRD files: rrdtool
-   * embedded Perl interpreter: perl
-   * network latency statistics: ping
    * information about network protocols: protocols
+   * embedded Python interpreter: python
+   * output to RRD files: rrdtool
    * lm_sensors information (e.g. CPU temperature, fan speeds): sensors
    * serial port traffic: serial
    * values from SNMP enabled network devices: snmp
@@ -126,9 +134,9 @@ Description: statistics collection and monitoring daemon (core system)
    * parse table-like structured files: table
    * incremental parsing of logfiles: tail
    * number of TCP connections to specific ports: tcpconns
+   * TeamSpeak2 server statistics: teamspeak2
    * 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
@@ -192,7 +200,7 @@ Description: statistics collection and monitoring daemon (debugging symbols)
 
 Package: collectd-dev
 Architecture: all
-Depends: collectd-core (>= ${source:Version}), collectd-core (<< 4.10~),
+Depends: collectd-core (>= ${source:Version}), collectd-core (<< 4.11~),
  ${misc:Depends}
 Description: statistics collection and monitoring daemon (development files)
  collectd is a small daemon which collects system information periodically and

diff --git a/debian/copyright b/debian/copyright
index ed42f9db4c003644874753f73d6901cd25af6d23..507244a391eb92d3b15eb695217635ce995c1ba9 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -23,11 +23,13 @@ Copyright Holders (in alphabetical order):
        Bruno Prémont <bonbons@linux-vserver.org>
        C-Ware, Inc.
        Clay Loveless <clay@killersoft.com>
+       Clément Stenac <clement.stenac@diwi.org>
        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>
+       Fabian Schuh <mail@xeroc.org>
        Flavio Stanchina <flavio@stanchina.net>
        Florent Monbillard <eppo@darox.net>
        Florent Usseil <swiip81@free.fr>
@@ -65,6 +67,7 @@ Copyright Holders (in alphabetical order):
        Pavel Shramov <shramov@mexmat.net>
        Peter Holik <peter@holik.at>
        Peter Kese <peter.kese@ijs.si>
+       Phoenix Kayo <kayo.k11.4@gmail.com>
        Red Hat Inc.
        Rodolphe Quiédeville <rquiedeville@bearstech.com>
        Scott Garrett <sgarrett@technomancer.com>
@@ -176,7 +179,6 @@ Licenses:
              src/logfile.c
              src/match_regex.c
              src/nginx.c
-             src/postgresql.c
              src/scanner.l
              src/utils_cmd_flush.c
              src/utils_complain.c
@@ -216,6 +218,10 @@ Licenses:
        Copyright © 2009 Aman Gupta <aman@tmm1.net>
        License: GNU General Public License
 
+       File src/curl_xml.c
+       Copyright © 2009-2010 Amit Gupta <amit.gupta221@gmail.com>
+       License: GNU General Public License
+
        Files src/csv.c
              src/curl_json.c
        Copyright © 2006-2009 Florian Forster <octo@verplant.org>
@@ -240,7 +246,7 @@ Licenses:
        License: GNU General Public License
 
        File src/exec.c
-       Copyright © 2007-2008 Florian Forster <octo@verplant.org>
+       Copyright © 2007-2010 Florian Forster <octo@verplant.org>
        Copyright © 2007-2009 Sebastian Harl <sh@tokkee.org>
        Copyright © 2008 Peter Holik <peter@holik.at>
        License: GNU General Public License
@@ -299,7 +305,6 @@ Licenses:
        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>
        Copyright © 2009 Marco Chiappero <marco@absence.it>
@@ -318,6 +323,11 @@ Licenses:
        Copyright © 2009 Manuel Sanmartin
        License: GNU General Public License
 
+       File src/modbus.c
+       Copyright © 2010 noris network AG
+       Author: Florian Forster <octo@noris.net>
+       License: GNU General Public License
+
        File src/mysql.c
        Copyright © 2006-2009 Florian Forster <octo@verplant.org>
        Copyright © 2008 Mirko Buffoni <briareos@eswat.org>
@@ -334,10 +344,23 @@ Licenses:
        Copyright © 2008 Oleg King <king2@kaluga.ru>
        License: GNU General Public License
 
+       File src/openvpn.c
+       Copyright © 2008-2009 Doug MacEachern <dougm@hyperic.com>
+       Copyright © 2006-2009 Florian Forster <octo@verplant.org>
+       Copyright © 2009 Marco Chiappero <marco@absence.it>
+       Copyright © 2009 Fabian Schuh <mail@xeroc.org>
+       License: GNU General Public License
+
        Files src/owniptc/*
        Copyright © 1999-2008 Netfilter Core Team
        License: GNU General Public License
 
+       File src/pinba.c
+       Copyright © 2007-2009 Antony Dovgal <tony@daylessday.org>
+       Copyright © 2010 Phoenix Kayo <kayo.k11.4@gmail.com>
+       Copyright © 2010 Florian Forster <octo@verplant.org>
+       License: GNU General Public License
+
        Files src/powerdns.c
              src/utils_tail.c
              src/utils_tail_match.c
@@ -353,6 +376,7 @@ Licenses:
        Copyright © 2009 Sebastian Harl <sh@tokkee.org>
        Copyright © 2009 Andrés J. Díaz <ajdiaz@connectical.com>
        Copyright © 2009 Manuel Sanmartin
+       Copyright © 2010 Clément Stenac <clement.stenac@diwi.org>
        License: GNU General Public License
 
        File src/rrdtool.c
@@ -443,9 +467,9 @@ Licenses:
        Copyright © 2009 Doug MacEachern <dougm@hyperic.com>
        License: GNU General Public License
 
-       All other files (except libltdl/*, src/network.c, src/utils_dns.* and
-               contrib/SpamAssassin/*):
-       Copyright © 2005-2009 Florian Forster <octo@verplant.org>
+       All other files (except libltdl/*, src/network.c, src/postgresql.c,
+               src/utils_dns.* and contrib/SpamAssassin/*):
+       Copyright © 2005-2010 Florian Forster <octo@verplant.org>
        License: GNU General Public License
 
        This package is free software; you can redistribute it and/or modify
@@ -567,6 +591,36 @@ can be found in `/usr/share/common-licenses/LGPL'.
        ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
        POSSIBILITY OF SUCH DAMAGE.
 
+       File src/postgresql.c
+       Copyright © 2008-2009 Sebastian Harl <sh@tokkee.org>
+       Copyright © 2009 Florian Forster <octo@verplant.org>
+       License: 2-clause BSD License
+
+       All rights reserved.
+
+       Redistribution and use in source and binary forms, with or without
+       modification, are permitted provided that the following conditions
+       are met:
+
+       - Redistributions of source code must retain the above copyright
+         notice, this list of conditions and the following disclaimer.
+
+       - Redistributions in binary form must reproduce the above copyright
+         notice, this list of conditions and the following disclaimer in the
+         documentation and/or other materials provided with the distribution.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+       AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+       IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+       ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+       LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+       INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+       CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+       ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+       POSSIBILITY OF SUCH DAMAGE.
+
        Files src/cpython.h
              src/netapp.c
              src/pyconfig.c

diff --git a/debian/filters.conf b/debian/filters.conf
index ecc7c75762de9d90e8a9e922b35f4b626b58118b..1304b6ff0c375560e3423461ca2e12e462ca133d 100644 (file)
--- a/debian/filters.conf
+++ b/debian/filters.conf
@@ -20,6 +20,7 @@
 #      <Rule "no_fqdn">
 #              <Match "regex">
 #                      Host "^[^\.]*$"
+#                      Invert false
 #              </Match>
 #              Target "stop"
 #      </Rule>

diff --git a/debian/patches/00list b/debian/patches/00list
index 51fdf6c8ee1016487a2be336709b32f8c2f28b61..de365fe478a465b354f7565e8c3615cfe40017d5 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,8 +1,4 @@
 rrd_filter_path.dpatch
 collection_conf_path.dpatch
-typo_fixes.dpatch
-bts561577_collectd2html_recursive_fix.dpatch
-bts557599_powerdns_fix.dpatch
 bts559801_plugin_find_fix.dpatch
-bts566199_collection_hide_types.dpatch
 

diff --git a/debian/patches/bts557599_powerdns_fix.dpatch b/debian/patches/bts557599_powerdns_fix.dpatch
deleted file mode 100755 (executable)
index 72b26c9..0000000
--- a/debian/patches/bts557599_powerdns_fix.dpatch
+++ /dev/null
@@ -1,73 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## bts557599_powerdns_fix.dpatch by Luke Heberling <collectd@c-ware.com>
-##
-## DP: powerdns plugin: Fixed communication when talking to pdns 2.9.22.
-## DP:
-## DP: powerdns version 2.9.22 (and above) require a newline at the end of
-## DP: commands sent to the server.
-
-@DPATCH@
-
-diff a/src/powerdns.c b/src/powerdns.c
---- a/src/powerdns.c
-+++ b/src/powerdns.c
-@@ -46,12 +46,12 @@
- #define FUNC_ERROR(func) do { char errbuf[1024]; ERROR ("powerdns plugin: %s failed: %s", func, sstrerror (errno, errbuf, sizeof (errbuf))); } while (0)
- 
- #define SERVER_SOCKET  LOCALSTATEDIR"/run/pdns.controlsocket"
--#define SERVER_COMMAND "SHOW *"
-+#define SERVER_COMMAND "SHOW * \n"
- 
- #define RECURSOR_SOCKET  LOCALSTATEDIR"/run/pdns_recursor.controlsocket"
- #define RECURSOR_COMMAND "get noerror-answers nxdomain-answers " \
-   "servfail-answers sys-msec user-msec qa-latency cache-entries cache-hits " \
--  "cache-misses questions"
-+  "cache-misses questions\n"
- 
- struct list_item_s;
- typedef struct list_item_s list_item_t;
-@@ -437,6 +437,11 @@ static int powerdns_get_data_stream (lis
-     return (-1);
-   }
- 
-+  struct timeval timeout;
-+  timeout.tv_sec=5;
-+  timeout.tv_usec=0;
-+  status = setsockopt (sd, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof (timeout));
-+
-   status = connect (sd, (struct sockaddr *) &item->sockaddr,
-       sizeof (item->sockaddr));
-   if (status != 0)
-@@ -529,7 +534,7 @@ static int powerdns_read_server (list_it
-   int fields_num;
- 
-   if (item->command == NULL)
--    item->command = strdup ("SHOW *");
-+    item->command = strdup (SERVER_COMMAND);
-   if (item->command == NULL)
-   {
-     ERROR ("powerdns plugin: strdup failed.");
-@@ -610,7 +615,7 @@ static int powerdns_update_recursor_comm
-   else
-   {
-     sstrncpy (buffer, "get ", sizeof (buffer));
--    status = strjoin (&buffer[4], sizeof (buffer) - strlen ("get "),
-+    status = strjoin (&buffer[strlen("get ")], sizeof (buffer) - strlen ("get "),
-       li->fields, li->fields_num,
-       /* seperator = */ " ");
-     if (status < 0)
-@@ -618,6 +623,14 @@ static int powerdns_update_recursor_comm
-       ERROR ("powerdns plugin: strjoin failed.");
-       return (-1);
-     }
-+    buffer[sizeof (buffer) - 1] = 0;
-+    int i = strlen (buffer);
-+    if (i < sizeof (buffer) - 2)
-+    {
-+      buffer[i++] = ' ';
-+      buffer[i++] = '\n';
-+      buffer[i++] = '\0';
-+    }
-   }
- 
-   buffer[sizeof (buffer) - 1] = 0;

diff --git a/debian/patches/bts561577_collectd2html_recursive_fix.dpatch b/debian/patches/bts561577_collectd2html_recursive_fix.dpatch
deleted file mode 100755 (executable)
index ea8c7d3..0000000
--- a/debian/patches/bts561577_collectd2html_recursive_fix.dpatch
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## bts561577_collectd2html_recursive_fix.dpatch
-## by Yuri D'Elia <wavexx@thregr.org>
-##
-## DP: collectd2html: Fixed recursive mode.
-## DP:
-## DP: Also, improved default settings to match the collectd4 series.
-
-@DPATCH@
-
-diff a/contrib/collectd2html.pl b/contrib/collectd2html.pl
---- a/contrib/collectd2html.pl
-+++ b/contrib/collectd2html.pl
-@@ -44,7 +44,7 @@
- my $DIR       = "/var/lib/collectd";
- my $HOST      = undef;
- my $IMG_FMT   = "PNG";
--my $RECURSIVE = 0;
-+my $RECURSIVE = 1;
- 
- GetOptions (
-     "host=s"         => \$HOST,
-@@ -63,7 +63,7 @@
- 
- my @COLORS = (0xff7777, 0x7777ff, 0x55ff55, 0xffcc77, 0xff77ff, 0x77ffff,
-       0xffff77, 0x55aaff);
--my @tmp = `/bin/hostname`; chomp(@tmp);
-+my @tmp = `/bin/hostname -f`; chomp(@tmp);
- $HOST = $tmp[0] if (! defined $HOST);
- my $svg_p = ($IMG_FMT eq "SVG");
- my $IMG_SFX = $svg_p ? ".svg" : ".png";
-@@ -140,7 +140,8 @@
- }
- chomp(@list);
- 
--foreach my $rrd (sort @list){
-+@list = sort @list;
-+foreach my $rrd (@list){
-       $rrd =~ m/^$DIR\/(.*)\.rrd$/;
-       push(@rrds, $1);
- }

diff --git a/debian/patches/bts566199_collection_hide_types.dpatch b/debian/patches/bts566199_collection_hide_types.dpatch
deleted file mode 100755 (executable)
index 1851a70..0000000
--- a/debian/patches/bts566199_collection_hide_types.dpatch
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## bts566199_collection_hide_types.dpatch by Pavel Piatruk
-## <piatruk.p@gmail.com>
-##
-## DP: contrib/collection.cgi: Added ability to hide specified types.
-
-@DPATCH@
-
-diff a/contrib/collection.cgi b/contrib/collection.cgi
---- a/contrib/collection.cgi
-+++ b/contrib/collection.cgi
-@@ -13,6 +13,7 @@ use Data::Dumper ();
- 
- our $Config = "/etc/collection.conf";
- our @DataDirs = ();
-+our @DontShowTypes = ();
- our $LibDir;
- 
- our $ValidTimespan =
-@@ -78,6 +79,10 @@ sub read_config
-                       $value =~ s#/*$##;
-                       $LibDir = $value;
-               }
-+              elsif ($key eq 'dontshowtype')
-+              {
-+                push (@DontShowTypes, $value);
-+              }
-               else
-               {
-                       print STDERR "Unknown key: $key\n";
-@@ -239,6 +244,7 @@ sub _find_types
-       my $name = "$_";
-       $name =~ s/\.rrd$//i;
-       my ($type, $instance) = split (m/-/, $name, 2);
-+      if (grep { $_ eq $type } @DontShowTypes) { next; }
-       $types{$type} = [] if (!$types{$type});
-       push (@{$types{$type}}, $instance) if (defined ($instance));
-     }

diff --git a/debian/patches/typo_fixes.dpatch b/debian/patches/typo_fixes.dpatch
deleted file mode 100755 (executable)
index 78640ae..0000000
--- a/debian/patches/typo_fixes.dpatch
+++ /dev/null
@@ -1,152 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## typo_fixes.dpatch by Sebastian Harl <sh@tokkee.org>
-##
-## DP: collectd{-perl,.conf}(5), {my,postgre}sql plugins: Fixed some typos.
-## DP:
-## DP: Thanks to lintian(1) for catching (some of) those! :-)
-
-@DPATCH@
-
-diff a/src/collectd-perl.pod b/src/collectd-perl.pod
---- a/src/collectd-perl.pod
-+++ b/src/collectd-perl.pod
-@@ -163,7 +163,7 @@ and collectd:
- 
- =item Config-Item
- 
--A config-item is one structure which keeps the informations provided in the
-+A config-item is one structure which keeps the information provided in the
- configuration file. The array of children keeps one entry for each
- configuration option. Each such entry is another config-item structure, which
- may nest further if nested blocks are used.
-diff a/src/collectd-python.pod b/src/collectd-python.pod
---- a/src/collectd-python.pod
-+++ b/src/collectd-python.pod
-@@ -39,8 +39,8 @@ required.
- Loads the Python plugin I<Plugin>. Unlike most other LoadPlugin lines, this one
- should be a block containing the line "Globals true". This will cause collectd
- to export the name of all objects in the python interpreter for all plugins to
--see. If you don't do this or your platform does not support it, the embeded
--interpreter will start anywa but you won't be able to load certain python
-+see. If you don't do this or your platform does not support it, the embedded
-+interpreter will start anyway but you won't be able to load certain python
- modules, e.g. "time".
- 
- =item B<Encoding> I<Name>
-@@ -211,7 +211,7 @@ and collectd:
- 
- =head2 Config
- 
--The Config class is an object which keeps the informations provided in the
-+The Config class is an object which keeps the information provided in the
- configuration file. The sequence of children keeps one entry for each
- configuration option. Each such entry is another Config instance, which
- may nest further if nested blocks are used.
-@@ -631,7 +631,7 @@ dispatched by the python plugin after upgrades.
- =item
- 
- This plugin is not compatible with python3. Trying to compile it with python3
--will fail because of the ways string, unicode and bytearray bahavior was
-+will fail because of the ways string, unicode and bytearray behavior was
- changed.
- 
- =item
-diff a/src/collectd.conf.pod b/src/collectd.conf.pod
---- a/src/collectd.conf.pod
-+++ b/src/collectd.conf.pod
-@@ -112,7 +112,7 @@ a value higher than the number of plugins you've loaded is totally useless.
- =item B<Hostname> I<Name>
- 
- Sets the hostname that identifies a host. If you omit this setting, the
--hostname will be determinded using the L<gethostname(2)> system call.
-+hostname will be determined using the L<gethostname(2)> system call.
- 
- =item B<FQDNLookup> B<true|false>
- 
-@@ -443,7 +443,7 @@ The curl plugin uses the B<libcurl> (L<http://curl.haxx.se/>) to read web pages
- and the match infrastructure (the same code used by the tail plugin) to use
- regular expressions with the received data.
- 
--The following example will read the current value of AMD stock from google's
-+The following example will read the current value of AMD stock from Google's
- finance page and dispatch the value to collectd.
- 
-   <Plugin curl>
-@@ -921,7 +921,7 @@ is set to B<true>, all disks are collected B<except> the ones matched.
- 
- =item B<Interface> I<Interface>
- 
--The dns plugin uses B<libpcap> to capture dns traffic and analyses it. This
-+The dns plugin uses B<libpcap> to capture dns traffic and analyzes it. This
- option sets the interface that should be used. If this option is not set, or
- set to "any", the plugin will try to get packets from B<all> interfaces. This
- may not work on certain platforms, such as MacE<nbsp>OSE<nbsp>X.
-@@ -1673,7 +1673,7 @@ or SQL threads are not running.
- 
- =head2 Plugin C<netapp>
- 
--The netapp plugin can collect various performance and capacity informations
-+The netapp plugin can collect various performance and capacity information
- from a NetApp filer using the NetApp API.
- 
- Please note that NetApp has a wide line of products and a lot of different
-@@ -1709,7 +1709,7 @@ Here are some examples to help you understand the above text more easily:
- 
- =item B<IgnoreSelected>
- 
--The behaviour is the same as with all other similar plugins: If nothing is
-+The behavior is the same as with all other similar plugins: If nothing is
- selected at all, everything is collected. If some things are selected using the
- options described above, only these statistics are collected. If you set
- B<IgnoreSelected> to B<true>, this behavior is inverted, i.E<nbsp>e. the
-@@ -1721,7 +1721,7 @@ specified statistics will not be collected.
- 
- The Network plugin sends data to a remote instance of collectd, receives data
- from a remote instance, or both at the same time. Data which has been received
--from the network is usually not transmitted again, but this can be actived, see
-+from the network is usually not transmitted again, but this can be activated, see
- the B<Forward> option below.
- 
- The default IPv6 multicast group is C<ff18::efc0:4a42>. The default IPv4
-@@ -2007,7 +2007,7 @@ UDP-Port to connect to. Defaults to B<123>.
- 
- =item B<ReverseLookups> B<true>|B<false>
- 
--Sets wether or not to perform reverse lookups on peers. Since the name or
-+Sets whether or not to perform reverse lookups on peers. Since the name or
- IP-address may be used in a filename it is recommended to disable reverse
- lookups. The default is to do reverse lookups to preserve backwards
- compatibility, though.
-diff a/src/mysql.c b/src/mysql.c
---- a/src/mysql.c
-+++ b/src/mysql.c
-@@ -397,7 +397,7 @@ static MYSQL *getconnection (mysql_database_t *db)
-       }
-       else
-       {
--              INFO ("mysql plugin: Sucessfully connected to database %s "
-+              INFO ("mysql plugin: Successfully connected to database %s "
-                               "at server %s (server version: %s, protocol version: %d)",
-                               (db->database != NULL) ? db->database : "<none>",
-                               mysql_get_host_info (db->con),
-diff a/src/postgresql.c b/src/postgresql.c
---- a/src/postgresql.c
-+++ b/src/postgresql.c
-@@ -345,7 +345,7 @@ static int c_psql_exec_query (c_psql_database_t *db, udb_query_t *q)
-                * `BAIL_OUT'. */
-               column_names[col] = PQfname (res, col);
-               if (NULL == column_names[col]) {
--                      log_err ("Failed to resolv name of column %i.", col);
-+                      log_err ("Failed to resolve name of column %i.", col);
-                       BAIL_OUT (-1);
-               }
-       }
-@@ -496,7 +496,7 @@ static int c_psql_init (void)
- 
-               server_host    = PQhost (db->conn);
-               server_version = PQserverVersion (db->conn);
--              log_info ("Sucessfully connected to database %s (user %s) "
-+              log_info ("Successfully connected to database %s (user %s) "
-                               "at server %s%s%s (server version: %d.%d.%d, "
-                               "protocol version: %d, pid: %d)",
-                               PQdb (db->conn), PQuser (db->conn),

diff --git a/debian/po/cs.po b/debian/po/cs.po
index 6c0fc0802a2ad0f3a9bfb1351e2761e36c458a61..fa34faa10910c4ad2361b851685fb7af2752035a 100644 (file)
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -10,6 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2009-06-22 16:07+0200\n"
 "Last-Translator: Martin Sin <martin.sin@zshk.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/debian/po/de.po b/debian/po/de.po
index ba79956c8412648a7e364501b4c625886ff0b392..ebf4d7efe57635e111f6f0699b7443d36e9df5dc 100644 (file)
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2008-03-12 23:33+0100\n"
 "Last-Translator: Kai Wasserbäch <debian@carbon-project.org>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/debian/po/es.po b/debian/po/es.po
index 4937fd0dd23fc2c9691c1163ce26d4bd7fa8f39a..fa4619ed5c07d8b5f7c2a6ea89052977edc74aa0 100644 (file)
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -35,6 +35,7 @@ msgstr ""
 "PO-Revision-Date: 2009-03-21 23:09+0100\n"
 "Last-Translator: Francisco Javier Cuadrado <fcocuadrado@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -78,7 +79,8 @@ msgstr ""
 #. Description
 #: ../collectd-core.templates:1001 ../collectd-core.templates:2001
 msgid "See /usr/share/doc/collectd-core/NEWS.Debian for details."
-msgstr "Vea el archivo «/usr/share/doc/collectd-core/NEWS.Debian» para más detalles."
+msgstr ""
+"Vea el archivo «/usr/share/doc/collectd-core/NEWS.Debian» para más detalles."
 
 #. Type: boolean
 #. Description

diff --git a/debian/po/fr.po b/debian/po/fr.po
index 852868d172459fea142086847da345c296bd7453..de23a0a2d5dd59db56cad335a79930f81f0e5532 100644 (file)
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2008-03-14 01:00+0100\n"
 "Last-Translator: Florent USSEIL <swiip81@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/debian/po/gl.po b/debian/po/gl.po
index 64cbcedcb71f3127655472a5dfe30b657021fe53..810d93cd4b470ee75afc27aef9059920ea76909b 100644 (file)
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -10,6 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2008-05-24 11:24+0100\n"
 "Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/debian/po/ja.po b/debian/po/ja.po
index 20fe2fe9e6cfad570720dfc7a8c103b787a37931..b4290b4aed3b249ee10b0e8730aae25078f68c00 100644 (file)
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -9,6 +9,7 @@ msgstr ""
 "PO-Revision-Date: 2009-10-06 17:32+0900\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/debian/po/nl.po b/debian/po/nl.po
index cc88f2eecb210e3282627e4b513e9800c22f2bf6..150092e35fefdf390d800a5703fe6495571016d3 100644 (file)
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -10,6 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2008-09-28 15:22+0100\n"
 "Last-Translator: Eric Spreen <erispre@gmail.com>\n"
 "Language-Team: Dutch <debian-l10n-dutch@lists.debian.org>\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,8 +33,8 @@ msgid ""
 msgstr ""
 "De lay-out van de RRD-bestanden, die zijn gemaakt door collectd, is sterk "
 "gewijzigd sinds versie 3.x. Om uw oude gegevens te behouden zult u deze "
-"moeten migreren. Dit kunt u doen door /usr/lib/collectd-core/utils/migrate-3"
-"-4.px te gebruiken."
+"moeten migreren. Dit kunt u doen door /usr/lib/collectd-core/utils/"
+"migrate-3-4.px te gebruiken."
 
 #. Type: note
 #. Description

diff --git a/debian/po/pt.po b/debian/po/pt.po
index 3a8d6e516d125f83b92deed508bc7e9af38df7a6..299552c4e2e0b3dfdff47b4397bf1cef95ed81b3 100644 (file)
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2008-03-22 00:49+0000\n"
 "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/debian/po/ru.po b/debian/po/ru.po
index 81e03701d762fb790711ea9c9117c338df033a80..08fabffca38a06e03a65630da00eb3d2874034ff 100644 (file)
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -9,12 +9,13 @@ msgstr ""
 "PO-Revision-Date: 2009-07-26 16:00+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Type: note
 #. Description

diff --git a/debian/po/sv.po b/debian/po/sv.po
index 0d37732387f775e0f556d0e8383eb276e1d824df..0af64df9d658dc0382c3ddec0c9cd7cdd888803e 100644 (file)
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2008-11-02 05:17+0100\n"
 "Last-Translator: Martin Bagge <brother@bsnet.se>\n"
 "Language-Team: swedish <debian-l10n-swedish@lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -53,7 +54,8 @@ msgstr ""
 #: ../collectd-core.templates:1001 ../collectd-core.templates:2001
 msgid "See /usr/share/doc/collectd-core/NEWS.Debian for details."
 msgstr ""
-"Läs även /usr/share/doc/collectd-core/NEWS.Debian för ytterligare information."
+"Läs även /usr/share/doc/collectd-core/NEWS.Debian för ytterligare "
+"information."
 
 #. Type: boolean
 #. Description

diff --git a/debian/po/vi.po b/debian/po/vi.po
index 7db0c66073bbb6e16db6d9fd0ece0cb818756400..69efa34bf827ab72412599a7334d290be8276a10 100644 (file)
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -10,6 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2009-02-18 15:36+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
+"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -53,7 +54,8 @@ msgstr ""
 #: ../collectd-core.templates:1001 ../collectd-core.templates:2001
 msgid "See /usr/share/doc/collectd-core/NEWS.Debian for details."
 msgstr ""
-"Xem tài liệu Tin Tức « /usr/share/doc/collectd-core/NEWS.Debian » để tìm chi tiết."
+"Xem tài liệu Tin Tức « /usr/share/doc/collectd-core/NEWS.Debian » để tìm chi "
+"tiết."
 
 #. Type: boolean
 #. Description

diff --git a/debian/rules b/debian/rules
index fb9ad0a1ab965f6785a814d7798259a29425d22f..46fdbf8232ae58fd3f050652734e830f1e58eef8 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,7 @@ else
 endif
 
 # The archdir map has been copied from openjdk-6's debian/rules.
-JAVA_ARCHDIR_MAP = armel=arm hppa=parisc lpia=i386 powerpc=ppc
+JAVA_ARCHDIR_MAP = armel=arm hppa=parisc lpia=i386 powerpc=ppc sh4=sh
 JAVA_ARCHDIR = $(strip $(patsubst $(DEB_BUILD_ARCH)=%, %, \
                        $(filter $(DEB_BUILD_ARCH)=%, $(JAVA_ARCHDIR_MAP))))
 ifeq (,$(JAVA_ARCHDIR))
@@ -43,6 +43,7 @@ JAVA_HOME = /usr/lib/jvm/java-6-openjdk
 JAVA_LIBDIR = $(JAVA_HOME)/jre/lib/$(JAVA_ARCHDIR)/server
 
 JAVAC = $(JAVA_HOME)/bin/javac
+JAR = $(JAVA_HOME)/bin/jar
 JAVA_CPPFLAGS = -I$(JAVA_HOME)/include
 JAVA_LDFLAGS = -L$(JAVA_LIBDIR) -Wl,-rpath -Wl,$(JAVA_LIBDIR)
 
@@ -70,6 +71,9 @@ confflags += --disable-gmond
 # libmemcached is required for the memcachec plugin.
 confflags += --disable-memcachec
 
+# libmodbus is required for the modbus plugin.
+confflags += --disable-modbus
+
 # libnetapp is required for the netapp plugin.
 confflags += --disable-netapp
 
@@ -162,7 +166,7 @@ config.status: configure $(DPATCH_STAMPFN)
        
        PKG_CONFIG_PATH="$(CURDIR)/debian/pkgconfig:$$PKG_CONFIG_PATH" \
        ./configure $(confflags) CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" \
-               JAVAC="$(JAVAC)" JAVA_CPPFLAGS="$(JAVA_CPPFLAGS)" \
+               JAVAC="$(JAVAC)" JAR="$(JAR)" JAVA_CPPFLAGS="$(JAVA_CPPFLAGS)" \
                JAVA_LDFLAGS="$(JAVA_LDFLAGS)" \
                || ( status=$$?; cat config.log; exit $$status )