Merged commit 'collectd-4.8.2-1' into etch-backports.

diff --cc debian/changelog
index cfa635eac2bac7ebe70166481777185123b95322,f9963ca291739ffbdc1ffcc229d4d4fc86e8eb7e..06dc7ed27b9f9386953940f7cd5aa2cdaa267ccd
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,28 -1,207 +1,232 @@@
+ collectd (4.8.2-1) unstable; urgency=medium
+ 
+   * New upstream release:
+     - Now using libtool 2.
+   * Set urgency to medium because of the fix for #559801.
+   * Split the "collectd" binary package into "collectd-core" and "collectd".
+     The former provides the main program file and the plugins while the latter
+     provides the configuration. This allows for much more flexible setups
+     (e.g. providing customizations on top of "collectd-core" without modifying
+     the "collectd" package) and, amongst others, removes the hard dependency
+     on librrd (Closes: #495936, #544311).
+   * debian/collectd-core.collectd.init.d:
+     - Do not (try to) start collectd if the config file does not exist. Else,
+       installation of "collectd-core" (which does not provide configuration)
+       would fail.
+   * debian/collectd.postinst:
+     - Let the "collectd" package restart the daemon, since it provides the
+       config file.
+   * debian/collectd.links:
+     - Symlink /u/s/d/collectd/examples to /u/s/d/collectd-core/examples.
+   * debian/control:
+     - Build-depend on the right combination of libsnmp-dev and perl. Perl's
+       CFLAGS (included in net-snmp's CFLAGS) introduced '-fstack-protector' in
+       version 5.10.1 on some architectures (those supporting that features).
+       net-snmp has been fixed to handle that correctly in 5.4.2.1~dfsg-4;
+       thanks to Lamont Jones and Dann Frazier for reporting this
+       (Closes: #559087).
+     - Build-depend on libsensors4-dev rather than libsensors-dev. libsnmp-dev,
+       starting with version 5.4.2.1~dfsg-5, supports libsensors4, thus making
+       that possible. This restores the full functionality of the "sensors"
+       plugin, which does not work well with libsensors3 and lm-sensors-3;
+       thanks to Anssi Kolehmainen for reporting this (Closes: #538795).
+     - Build-depend on libltdl-dev to make it possible to use the system-wide
+       libltdl.
+     - No longer conflict/provide/replace the pre-Lenny "collectd-$plugin"
+       packages.
+     - Update the list of collectd-core's suggestions: added various services
+       providing data that may be collected by collectd. Downgraded lm-sensors
+       from a recommendation to a suggestion.
+   * debian/patches:
+     - Removed gmond-fix-compile-error.dpatch -- included upstream.
+     - Added bts561577_collectd2html_recursive_fix.dpatch -- fixed
+       collectd2html.pl's recursive mode and improved some defaults; thanks to
+       Yuri D'Elia for reporting this and providing a patch (Closes: #561577).
+     - Added bts557599_powerdns_fix.dpatch -- fixed communication to pdns
+       versions 2.9.22 and above; thanks to <tm@iprog.com> for reporting this
+       and Luke Heberling for providing the patch (Closes: #557599).
+     - Added bts559801_plugin_find_fix.dpatch -- make collectd resistant
+       against copies of libltdl affected by CVE-2009-3736. This fixes a
+       potential but very unlikely security issue, e.g. found in the embedded
+       copy. For details about how collectd might be affected, see
+       <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559801#15>; thanks to
+       Michael Gilbert for reporting this (Closes: #559801).
+   * debian/rules:
+     - Pass --without-included-ltdl to configure to tell libtool 2 to not use
+       the shipped libltdl but rather the one available in the system. Thus,
+       in the future, libltdl related issues do no longer require updated
+       collectd packages.
+     - Pass --disable-static to configure to tell libtool 2 to not build any
+       static libraries.
+     - Install debian/collectd.conf as an example into "collectd-core".
+     - Output the content of config.log if configure fails -- this might help
+       debugging.
+   * debian/README.Debian:
+     - Added a short explanation of the package split.
+ 
+  -- Sebastian Harl <tokkee@debian.org>  Sat, 26 Dec 2009 12:06:46 +0100
+ 
+ collectd (4.8.1-2) unstable; urgency=low
+ 
+   * debian/rules:
+     - Disabled the "java" plugin on hppa for now to work around a backlog in
+       the buildds that currently prevents a transition to testing.
+   * debian/control:
+     - Do not build-depend on openjdk-6-jdk on hppa.
+ 
+  -- Sebastian Harl <tokkee@debian.org>  Thu, 19 Nov 2009 10:55:33 +0100
+ 
+ collectd (4.8.1-1) unstable; urgency=medium
+ 
+   * New upstream release:
+     - Fixed a build issue with libiptc that caused a segfault in the iptables
+       plugin; thanks to Rodrigo Campos for reporting this (Closes: #535786).
+     - Updated the powerdns plugin to support pdns 2.9.22 (and above) as well;
+       thanks to Thomas Morgan for reporting this and Luke Heberling for
+       providing a patch (Closes: #535787).
+     New plugins:
+     - Parse JSON files: curl_json
+     - Query data from Java processes using JMX: GenericJMX (Java based plugin)
+     - Atheros wireless LAN chipset statistics: madwifi
+     - Optimized Link State Routing daemon statistics: olsrd
+     - Tokyo Tyrant server statistics: tokyotyrant (disabled in Debian,
+       libtokyotyrant is not available)
+     - Send collected values to a web-server: write_http
+     - ZFS Adaptive Replacement Cache statistics: zfs_arc (disabled in Debian,
+       libkstat is not available)
+     New matches:
+     - Match zero COUNTER values: empty_counter
+   * Set urgency to medium because of the fix for #535786.
+   * debian/rules:
+     - Install contrib/GenericJMX.conf to /usr/share/doc/collectd/examples/.
+     - Disabled the tokyotyrant and zfs_arc plugins - their dependencies are
+       not available.
+   * 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.
+     - Removed java-fix-jvm-start.dpatch - included upstream.
+     - Removed libvirt-reconnect.dpatch - included upstream.
+     - Removed network-fix-cacheflush.dpatch - included upstream.
+     - Removed plugin-fix-unregister.dpatch - included upstream.
+     - Added gmond-fix-compile-error.dpatch - upstream patch fixing a compile
+       error in the gmond plugin.
+   * debian/control:
+     - Build depend on libyajl-dev, which is required by the curl_json plugin.
+   * Added debian/README.source:
+     - The file includes a pointer to /usr/share/doc/dpatch/README.source.gz.
+   * New debconf template translations:
+     - ja.po, thanks to Hideki Yamane (Closes: #550968).
+ 
+  -- Sebastian Harl <tokkee@debian.org>  Thu, 15 Oct 2009 20:54:46 +0200
+ 
+ collectd (4.7.2-1) unstable; urgency=low
+ 
+   * New upstream release (Closes: #541887).
+     - collectd2html.pl now supports the creation of SVG images; thanks to Ivan
+       Shmakov for providing a patch (Closes: #482185).
+     New plugins:
+     - Connection tracking table size: conntrack
+     - Linux file-system based caching framework statistics: fscache
+     - Receive and interpret Ganglia multicast traffic: gmond
+     - Embedded Java Virtual Machine: java
+     - Query and parse data from a memcache daemon: memcachec
+     - 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.
+     - Pass appropriate JAVAC, JAVA_CPPFLAGS and JAVA_LDFLAGS variables to
+       configure, using OpenJDK found in /usr/lib/jvm/java-6-openjdk. The
+       archdir mapping used by the openjdk-6 Debian package is used to find
+       libjvm.so in JAVA_HOME/jre/lib/ARCHDIR/server.
+     - Use -rpath to tell the "java" plugin where to find libjvm.so.
+     - Pass --enable-all-plugins to configure to make sure that the build fails
+       if any prerequisites are missing.
+   * debian/control:
+     - Build-depend on openjdk-6-jdk.
+     - Build-depend on libganglia1-dev (>= 3), required by the gmond plugin.
+     - Build-depend on libgcrypt11-dev, used by the network plugin.
+     - Updated Standards-Version to 3.8.3 (no changes).
+     - Changed build-dependency libmysqlclient15-dev to libmysqlclient-dev -
+       this allows transitions to be handled thru binNMUs if possible.
+   * debian/collectd.install:
+     - Install collectd-java.5.
+   * debian/patches:
+     - Removed libcollectdclient_static_sstrerror.dpatch - included upstream.
+     - Added network-fix-cacheflush.dpatch - upstream patch to fix the handling
+       of the 'CacheFlush' config option of the "network" plugin.
+     - Added libvirt-reconnect.dpatch - upstream patch to let the "libvirt"
+       plugin re-connect to libvirtd if connecting fails.
+     - Added plugin-fix-unregister.dpatch - upstream patch to make
+       'plugin_unregister_read()' functional again, thus fixing a failed
+       assertion in some cases.
+     - Added java-fix-jvm-start.dpatch - upstream patch to fix the JVM startup.
+     - Added bts541953-curl-followlocation.dpatch - upstream patch to let
+       plugins using libcurl follow HTTP redirects; thanks to Joey Hess for
+       reporting this (Closes: #541953).
+     - Added bts535787-powerdns-fix-localsocket.dpatch - upstream patch fixing
+       the handling of the 'LocalSocket' config option of the "powerdns"
+       plugin; thanks to Thomas Morgan for reporting this and Luke Heberling
+       for providing a patch (references: #535787).
+     - Added bts542859-df-fix-ignorelist.dpatch - upstream patch to fix the
+       handling of the ignorelist in the "df" plugin; thanks to Joey Hess for
+       reporting this (Closes: #542859).
+   * debian/README.Debian:
+     - Removed the note about how to get collectd2html.pl working with
+       version 4 of collectd - the script now supports the --recursive option
+       which takes care of that.
+   * debian/collectd.overrides:
+     - Documented the 'binary-or-shlib-defines-rpath' warning - the rpath is
+       required by the "java" plugin.
+   * New debconf template translations:
+     - cs.po, thanks to Martin Sin (Closes: #534206).
+     - ru.po, thanks to Yuri Kozlov (Closes: #539467).
+   * debian/control, debian/rules:
+     - No not limit the "libvirt" plugin to amd64, i386, powerpc - libvirt-dev
+       seems to be available on all architectures now.
+     - Reintroduced a work around for #474087 (broken openipmi .pc files) by
+       providing a fixed version of OpenIPMIpthread.pc in debian/pkgconfig and
+       adding that path to PKG_CONFIG_PATH. Removed the version from the
+       libopenipmi-dev build dependency for now.
+   * debian/collectd.conf:
+     - Set the "apache" plugin's URL according to the default used by Debian's
+       Apache; thanks to Joey Hess for reporting this (Closes: #541888).
+   * debian/libcollectdclient-dev.install, debian/rules:
+     - Do not install libcollectdclient's .la file in favor of the Squeeze
+       release goal to remove those files (for details see
+       <http://lists.debian.org/debian-devel/2009/08/msg00783.html>).
+ 
+  -- Sebastian Harl <tokkee@debian.org>  Sat, 29 Aug 2009 12:42:15 +0200
+ 
 +collectd (4.6.3-1~bpo40+1) etch-backports; urgency=low
 +
 +  * Rebuild for etch-backports.
 +  * debian/control:
 +    - Removed dpkg-dev build-dependency - we don't care about Vcs-* and
 +      Homepage fields in backports.org.
 +    - Removed optional build-dependencies libcurl4-gnutls-dev, librrd-dev and
 +      libsnmp-dev - they are not available in Etch and might confuse buildds.
 +    - Switch back to build-depend on nut-dev - libupsclient1-dev is not
 +      available in Etch and limit the "nut" plugin to [!alpha !amd64 !hppa
 +      !ia64 !ppc64 !mips !mipsel].
 +    - Replaced linux-libc-dev build-dependency with linux-kernel-headers.
 +    - Build-conflict with iptables-dev to force the use of the shipped libiptc
 +      (this allows building the iptables plugin on all architectures).
 +  * debian/control, debian/rules:
 +    - Added a work around for #474087 (broken openipmi .pc files) by providing
 +      a fixed version of OpenIPMIpthread.pc in debian/pkgconfig and adding
 +      that path to PKG_CONFIG_PATH. Removed the version from the
 +      libopenipmi-dev build dependency - Etch does not include a fixed version
 +      of openipmi.
 +    - Removed libdbi0-dev build-dependency and disabled the "dbi" plugin -
 +      libdbi is not available on Etch.
 +
 + -- Sebastian Harl <tokkee@debian.org>  Sun, 14 Jun 2009 13:52:04 +0200
 +
  collectd (4.6.3-1) unstable; urgency=low
  
    * New upstream release.

diff --cc debian/collectd.conf
index 2b042a9f0aece91001670b01767624c6ff3686b0,19ccebc7ebf9cc61666d9419cb5425d0c7f6e996..8ee6f11b5eec595b2114377f1b825575fffdf0b8
--- 1/debian/collectd.conf
--- 2/debian/collectd.conf
+++ b/debian/collectd.conf
@@@ -36,6 -37,8 +37,7 @@@ LoadPlugin cp
  #LoadPlugin cpufreq
  #LoadPlugin csv
  #LoadPlugin curl
 -#LoadPlugin dbi
+ #LoadPlugin curl_json
  LoadPlugin df
  LoadPlugin disk
  #LoadPlugin dns
@@@ -145,6 -173,63 +172,37 @@@ LoadPlugin user
  #     </Page>
  #</Plugin>
  
 -#<Plugin dbi>
 -#     <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>
 -#     </Query>
 -#
 -#     <Database "customers_db">
 -#             Driver "mysql"
 -#             DriverOption "host" "localhost"
 -#             DriverOption "username" "collectd"
 -#             DriverOption "password" "secret"
 -#             DriverOption "dbname" "custdb0"
 -#             SelectDB "custdb0"
 -#             Query "num_of_customers"
 -#             Query "..."
 -#     </Database>
 -#</Plugin>
 -
+ #<Plugin curl_json>
+ ## See: http://wiki.apache.org/couchdb/Runtime_Statistics
+ #  <URL "http://localhost:5984/_stats">
+ #    Instance "httpd"
+ #    <Key "httpd/requests/count">
+ #      Type "http_requests"
+ #    </Key>
+ #
+ #    <Key "httpd_request_methods/*/count">
+ #      Type "http_request_methods"
+ #    </Key>
+ #
+ #    <Key "httpd_status_codes/*/count">
+ #      Type "http_response_codes"
+ #    </Key>
+ #  </URL>
+ ## Database status metrics:
+ #  <URL "http://localhost:5984/_all_dbs">
+ #    Instance "dbs"
+ #    <Key "*/doc_count">
+ #      Type "gauge"
+ #    </Key>
+ #    <Key "*/doc_del_count">
+ #      Type "counter"
+ #    </Key>
+ #    <Key "*/disk_size">
+ #      Type "bytes"
+ #    </Key>
+ #  </URL>
+ #</Plugin>
+ 
  #<Plugin df>
  #     Device "/dev/sda1"
  #     Device "192.168.0.2:/mnt/nfs"

diff --cc debian/control
index c91ad8aedc6893b5033d0e9ba13aca45ca8eefd5,9cdc142d34cfeade334bcaae275b1d4c4d2c2a70..93fef185a9198c58180269bc0d0748a13172152e
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -2,9 -2,38 +2,34 @@@ Source: collect
  Section: utils
  Priority: optional
  Maintainer: Sebastian Harl <tokkee@debian.org>
- Build-Depends: debhelper (>= 5), po-debconf, dpatch, bison, flex, autotools-dev, pkg-config, linux-kernel-headers, libcurl3-gnutls-dev, libmysqlclient15-dev, librrd2-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap0.8-dev | libpcap-dev, nut-dev [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel], libperl-dev, iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel], libsnmp9-dev, libvirt-dev (>= 0.4.0-6) [amd64 i386 powerpc], libxml2-dev, libhal-dev, libopenipmi-dev, libglib2.0-dev, libnotify-dev, libesmtp-dev, libpq-dev
 -Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
++Build-Depends: debhelper (>= 5), po-debconf, dpatch,
+  bison, flex, autotools-dev, libltdl-dev, pkg-config,
+  iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel],
 - iptables-dev (>= 1.4.3.2-2),
 - libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev,
 - libdbi0-dev,
++ libcurl3-gnutls-dev,
+  libesmtp-dev,
+  libganglia1-dev (>= 3),
+  libgcrypt11-dev,
+  libglib2.0-dev,
+  libhal-dev,
+  libmemcached-dev,
+  libmysqlclient-dev,
+  libnotify-dev,
+  libopenipmi-dev,
+  liboping-dev (>= 0.3.3),
+  libpcap0.8-dev | libpcap-dev,
+  libperl-dev,
+  libpq-dev,
 - librrd-dev | librrd2-dev,
++ librrd2-dev,
+  libsensors4-dev,
 -# libsnmp-dev (>= 5.4.2.1~dfsg-4~) | (libsnmp-dev & perl (<< 5.10.1~rc2-1~))
 - libsnmp-dev (>= 5.4.2.1~dfsg-4~) | libsnmp-dev | libsnmp9-dev,
 - libsnmp-dev (>= 5.4.2.1~dfsg-4~) | perl (<< 5.10.1~rc2-1~),
 - libupsclient1-dev,
++ libsnmp9-dev,
+  libvirt-dev (>= 0.4.0-6),
+  libxml2-dev,
+  libyajl-dev,
 - linux-libc-dev (>= 2.6.25-4) | linux-libc-dev (<< 2.6.25-1),
++ linux-kernel-headers,
++ nut-dev [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel],
+  openjdk-6-jdk [!hppa]
 -Build-Conflicts: libpthread-dev
 +Build-Conflicts: libpthread-dev, iptables-dev
- Standards-Version: 3.8.1
+ Standards-Version: 3.8.3
  Homepage: http://collectd.org/
  Vcs-Git: git://git.tokkee.org/pkg-collectd.git
  Vcs-Browser: http://git.tokkee.org/?p=pkg-collectd.git
@@@ -44,6 -80,8 +76,7 @@@ Description: statistics collection and 
     * CPU frequency: cpufreq
     * output to comma separated values (CSV) files: csv
     * parse statistics from websites: curl
 -   * query data from a relational database: dbi
+    * parse JSON files: curl_json
     * disk space usage: df
     * disk and partition throughput: disk
     * DNS traffic information: dns

diff --cc debian/rules
index b0ca029add6a3c2bc09474e8b2458d8d7d3aa70f,01adc9ed069e2eafaa467de4d313beba2dd2f5be..553fea130d1d690101e6edea2de9fceda93bfeb7
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -46,21 -60,36 +60,40 @@@ confflags = --host=$(DEB_HOST_GNU_TYPE
  # These plugins do not provide any functionality under Linux.
  confflags += --disable-apple_sensors --disable-tape
  
- # The static libraries netstat and upsclient cannot be linked into shared
- # objects on some architectures (see bugs #358637 and #419684 for more
- # details).
+ # 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
+ 
+ # libtokyotyrant is required for the tokyotyrant plugin.
+ confflags += --disable-tokyotyrant
+ 
+ # xmms1 is required for the xmms plugin.
+ confflags += --disable-xmms
+ 
+ # libkstat is required for the xfs_arc plugin.
+ confflags += --disable-zfs-arc
+ 
 -# The static library netstat cannot be linked into shared objects on some
 -# architectures (see bugs #358637, #419684 and #524593 for more details).
++# libdbi is not available on Etch
++confflags += --disable-dbi
++
++# The static library netstat and upsclient cannot be linked into shared
++# objects on some 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
 +      confflags += --disable-netlink --disable-nut
  endif
  
- # libvirt is only available on amd64, i386 and powerpc.
- ifeq (,$(findstring $(DEB_BUILD_ARCH),amd64 i386 powerpc))
-       confflags += --disable-libvirt
+ # The hppa buildds currently do not keep up with Java related stuff, thus
+ # prevending testing transitions.
+ ifneq (,$(findstring $(DEB_BUILD_ARCH),hppa))
+       confflags += --disable-java
  endif
  
- # libdbi is not available on Etch
- confflags += --disable-dbi
- 
  config.status: configure $(DPATCH_STAMPFN)
        dh_testdir