Merged branch 'jessie' into master.

diff --cc debian/changelog
index 84d0149393a2d06212ae0d4493ab519222b6e6c3,34d83ac4bbf5b4f409be3cee30b5668902adec7d..01e1dd07e9394bf996fee0f5a2d38b5b386bded5
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,199 -1,4 +1,199 @@@
- collectd (5.4.1-6+deb8u1) jessie-security; urgency=medium
 +collectd (5.5.2-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release.
 +    - Fix heap overflow in the network plugin. Emilien Gaspar has identified a
 +      heap overflow in parse_packet(), the function used by the network plugin
 +      to parse incoming network packets. Thanks to Florian Forster for
 +      reporting the bug in Debian. (Closes: #832507, CVE-2016-6254)
 +    - Fix improper usage of gcry_control. A team of security researchers at
 +      Columbia University and the University of Virginia discovered that
 +      GCrypt's gcry_control is sometimes called without checking its return
 +      value for an error. This may cause the program to be initialized without
 +      the desired, secure settings. (Closes: #832577)
 +  * debian/patches:
 +    - bts832577-gcry-control.patch: Update for 5.5.2. Mostly part of the new
 +      upstream release, except for: Don't abort() if gcrypt initialization
 +      failed.
 +
 + -- Sebastian Harl <tokkee@debian.org>  Thu, 28 Jul 2016 22:56:36 +0200
 +
 +collectd (5.5.1-5) unstable; urgency=low
 +
 +  * debian/control, debian/rules:
 +    - Disable the sigrok plugin on non-Linux; restrict build dependency to
 +      linux-any; thanks to Andreas Beckmann for reporting this
 +      (Closes: #825606).
 +  * debian/rules:
 +    - Fix failure to build twice in a row introduced by dh_autoreconf_clean;
 +      drop the separate config.status target and, hence, a dependency on the
 +      configure script.
 +  * debian/patches/:
 +    - Added gcc6.patch: Fix FTBFS with GCC 6; thanks to Lucas Nussbaum for
 +      reporting this (Closes: #831194).
 +
 + -- Sebastian Harl <tokkee@debian.org>  Sun, 17 Jul 2016 23:30:33 +0200
 +
 +collectd (5.5.1-4) unstable; urgency=medium
 +
 +  * debian/control:
 +    - Add dh-autoreconf to Build-Depends.
 +    - Update standards-version to 3.9.8 (no changes).
 +
 + -- Marc Fournier <marc@bl.uem.li>  Tue, 31 May 2016 18:16:43 +0200
 +
 +collectd (5.5.1-3) unstable; urgency=medium
 +
 +  * Re-enable gmond plugin. Thanks to Michael Tautschnig and Jean-Michel
 +    Vourgère for fixing #812462.
 +  * debian/patches:
 +    - Add bts823012_librrd8.patch. Properly detect thread safety with librrd8.
 +      Thanks to Jean-Michel Vourgère for the patch (Closes: #823012).
 +  * debian/collectd.conf:
 +    - Add missing example blocks in main configuration file (Closes: #806196).
 +
 + -- Marc Fournier <marc@bl.uem.li>  Wed, 25 May 2016 23:14:14 +0200
 +
 +collectd (5.5.1-2) unstable; urgency=medium
 +
 +  * Disable the gmond plugin for now. Ganglia is not available in testing
 +    (cf. #812462). Thanks to Santiago Vila for reporting this
 +    (Closes: #819241).
 +  * Update standards-version to 3.9.7 (no changes).
 +
 + -- Sebastian Harl <tokkee@debian.org>  Sat, 02 Apr 2016 11:02:49 +0200
 +
 +collectd (5.5.1-1) unstable; urgency=medium
 +
 +  * New upstream release:
 +    - The "LC_NUMERIC" locale is now forced to "C", preventing problems on
 +      environments where the locale uses a comma as decimal separator. Thanks
 +      to Hubert Jarosz for reporting this (Closes: #799289).
 +    - Fixed FTBFS with GCC 6.0; thanks to Martin Michlmayr for reporting this
 +      (Closes: #811580).
 +  * debian/patches:
 +    - Removed bts802249_varnish_41.patch; implemented upstream.
 +  * debian/collectd.conf:
 +    - Sync with upstream changes since 5.5.0.
 +
 + -- Marc Fournier <marc@bl.uem.li>  Fri, 22 Jan 2016 16:53:49 +0100
 +
 +collectd (5.5.0-4) unstable; urgency=medium
 +
 +  * debian/collectd-core.overrides:
 +    - Update 'binary-or-shlib-defines-rpath' lintian override.
 +  * debian/rules:
 +    - Strip out non-deterministic bits out of generated jar files.
 +    - Remove RTLD_GLOBAL workaround, which was fixed upstream.
 +  * debian/patches:
 +    - Add bts802249_varnish_41.patch (Closes: #802249)
 +
 + -- Marc Fournier <marc@bl.uem.li>  Mon, 16 Nov 2015 21:03:31 +0100
 +
 +collectd (5.5.0-3) unstable; urgency=medium
 +
 +  * debian/rules, debian/control:
 +    - Avoid hiding compiler options at build time, allowing the buildd log
 +      scanner to do it's job.
 +    - Disable smart plugin on non-linux platforms, due to missing
 +      libatasmart-dev build-dependency.
 +  * debian/collectd-core.overrides:
 +    - Update 'capitalization-error-in-description' lintian override.
 +  * debian/rules, debian/collectd-core.collectd.service:
 +    - Rename systemd service file to collectd-core.collectd.service, to honour
 +      debhelper's naming convention.
 +  * debian/collectd-core.collectd.service:
 +    - Check for configuration file presence before starting the daemon.
 +    - Check for configuration file validity before starting the daemon.
 +  * debian/control, debian/changelog:
 +    - Update my email address to match identity of current GPG key.
 +
 + -- Marc Fournier <marc@bl.uem.li>  Sun, 13 Sep 2015 21:42:53 +0200
 +
 +collectd (5.5.0-2) unstable; urgency=low
 +
 +  * debian/rules:
 +    - Disable the turbostat plugin on !amd64,!i386; it's Intel-hardware
 +      specific.
 +
 + -- Sebastian Harl <tokkee@debian.org>  Sun, 23 Aug 2015 15:35:26 +0200
 +
 +collectd (5.5.0-1) unstable; urgency=medium
 +
 +  [ Marc Fournier ]
 +  * New upstream release:
 +    - Battery plugin now prefers sysfs over (the deprecated) procfs for
 +      reading values; thanks to Witold Baryluk for reporting this
 +      (Closes: #630337).
 +    - The configuration supports unquoted IPv6 addresses now; thanks to Geoff
 +      Crompton for reporting this (Closes: #632713).
 +    - Fixed a FTBFS using clang; thanks to Arthur Marble for reporting this
 +      and providing a patch (Closes: #758481).
 +    - collection.cgi now supports the df_complex types; thanks to Joel Franco
 +      Guzmán for reporting this (Closes: #739625).
 +    - Fixed an off-by-one error in the AVL tree implementation that broke
 +      setups using only one threshold definition; thanks to Alexander Golovko
 +      for reporting this (Closes: #754230).
 +    - The disk plugin now (optionally) supports instance names based on a udev
 +      attribute; thanks to Trent W. Buck for reporting this (Closes: #632936).
 +  * debian/patches:
 +    - Removed bts559801_plugin_find_fix.dpatch; merged upstream.
 +    - Removed bts747093_lvm_segfault.dpatch; merged upstream.
 +    - Removed bts750440_config_segfault.dpatch; merged upstream.
 +    - Removed bts770681_riemann_ack.dpatch; merged upstream.
 +    - Removed bts770683_curl_init.dpatch; merged upstream.
 +    - Removed bts770688_snmp_memleak.dpatch; merged upstream.
 +    - Removed bts770690_java_jni_thread_detach.dpatch; merged upstream.
 +    - Removed bts770693_timestamps.dpatch; merged upstream.
 +    - Removed bts770694_loglevel.dpatch; merged upstream.
 +    - Removed collection.cgi.dpatch; merged upstream.
 +    - Removed myplugin_api.dpatch; merged upstream.
 +  * debian/rules, debian/collectd-dev.install, myplugin_includes.dpatch:
 +    - Update path to header files moved to daemon/ subdirectory upstream.
 +  * debian/rules, debian/control:
 +    - Enable redis, write_redis plugins and add Build-depend on
 +      libhiredis-dev (previous versions depended on credis which wasn't
 +      packaged in Debian).
 +    - Enable sigrok and uncomment Build-depend on libsigrok-dev.
 +    - Re-enable varnish and uncomment Build-depend on libvarnishapi-dev
 +      (support for varnish 4.x was added upstream).
 +    - Enable zfs_arc (support for ZFS on linux was added upstream).
 +    - Add Build-depend on libatasmart-dev (required to build new smart
 +      plugin).
 +    - Add Build-depend on libcap-dev (used to avoid running new turbostat
 +      plugin as root on Linux).
 +    - Add Build-depend on libi2c-dev (required to build new barometer plugin).
 +    - Add Build-depend on libldap2-dev (required to build new openldap
 +      plugin).
 +    - Add Build-depend on librdkafka-dev (required to build new write_kafka
 +      plugin).
 +    - Add Build-depend on libudev-dev (used by disk plugin to enable
 +      udev-based device renaming on Linux) (Closes: #588153, #632936).
 +  * debian/control, debian/rules, debian/collectd.service:
 +    - Add systemd service file (Closes: #762586)
 +  * debian/libcollectdclient1.symbols
 +    - Updated for 5.5.
 +
 +  [ Sebastian Harl ]
 +  * debian/control:
 +    - Add virtual-mysql-server as an alternative to the mysql-server suggests;
 +      thanks to Otto Kekäläinen for reporting this (Closes: 781980).
 +    - Add Marc to uploaders.
 +    - Update standards-version to 3.9.6 (no changes).
 +  * debian/po:
 +    - Update Dutch debconf template translation; thanks to Frans Spiesschaert
 +      (Closes: #763783).
 +  * Convert the package to "3.0 (quilt)" format; thanks to YunQiang Su for an
 +    initial patch (Closes: #688719):
 +    - Build-depend on debhelper (>= 7.0.50~) and drop dpatch.
 +    - Renamed patch files from *.dpatch to *.patch and drop the dpatch header.
 +    - Changed debian/patches/00list to debian/patches/series.
 +    - Drop all patch operations from debian/rules.
 +  * debian/collectd-core.overrides:
 +    - Update the JRE path for the rpath override.
 +
 + -- Marc Fournier <marc.fournier@camptocamp.com>  Fri, 21 Aug 2015 13:29:17 +0200
 +
+ collectd (5.4.1-6+deb8u1) jessie-security; urgency=high
  
    * debian/patches/CVE-2016-6254.dpatch: Fix heap overflow in the network
      plugin. Emilien Gaspar has identified a heap overflow in parse_packet(),