From: Sebastian Harl Date: Sat, 19 May 2012 11:53:09 +0000 (+0200) Subject: Merged branch 'collectd-4'. X-Git-Tag: collectd-5.1.0-1~26 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0de336d56af712b8c5b153ee3a70e37da334b9aa;p=pkg-collectd.git Merged branch 'collectd-4'. --- 0de336d56af712b8c5b153ee3a70e37da334b9aa diff --cc debian/changelog index 573bc59,b211951..01d1782 --- a/debian/changelog +++ b/debian/changelog @@@ -1,26 -1,114 +1,137 @@@ +collectd (5.0.0-1) unstable; urgency=low + + * New upstream release: + New plugins: + - AMQP output plugin: amqp + - AIX logical partitions statistics: lpar (disabled in Debian; AIX only) + - Redis key-value database server statistics: redis (disabled in Debian; + libcredis is not available) + - Check thresholds and for missing values: threshold + - Varnish HTTP accelerator daemon statistics: varnish + - Write values to a Redis key-value database server: write_redis (disabled + in Debian; libcredis is not available) + New targets: + - Upgrade data-sets from v4 clients to v5: v5upgrade + * debian/rules: + - Disabled lpar plugin -- this requires AIX (perfstat). + - Disabled redis and write_redis plugins -- they require libcredis. + * debian/control: + - Added build-dep on librabbitmq-dev, required by the AMQP plugin. + - Added build-dep on libvarnish-dev, required by the varnish plugin. + + -- Sebastian Harl Sun, 05 Jun 2011 18:09:49 +0200 + + collectd (4.10.7-1) unstable; urgency=low + + * New upstream release. + - Fixed an endless loop in case the datadir is a symlink pointing to a + non-existent target; thanks to Michael Prokop for reporting this and + Jonathan Nieder for providing the patch (Closes: #619123). + - Use bsd/nlist.h rather than the deprecated nlist.h on FreeBSD fixing a + FTBFS on kfreebsd; thanks to Tobias Frost for reporting this + (Closes: #664429). + * debian/patches/: + - Removed ipvs_h_include.dpatch -- applied upstream. + - Added rtnl_dump_filter.dpatch, updating the rtnl_dump_filter() signature + to recent versions of iproute2. + * debian/rules: + - Use dpkg-buildflags to determine compiler/linker flags; this also + enables hardening build flags; thanks to Moritz Muehlenhoff for + providing the patch (Closes: #656271). + - Don't force building of the ipvs plugin. The ip_vs.h check has been + fixed in configure. + - Use /usr/share/javahelper/java-arch.sh to determine the Java + architecture directory, thus, making sure armhf and armel are supported + as well; thanks to peter green for reporting this and providing the + pointer (Closes: #656274). + - Work around #673431 (kvm.h requires sys/types.h) by forcing the processes + plugin on kfreebsd and manually defining HAVE_STRUCT_KINFO_PROC_FREEBSD. + * debian/README.Debian: + - Added section 'Cleanup of old data' explaining how to get rid of + out-dated data files (e.g. RRD files). + * debian/control: + - Updated to standards-version 3.9.3 -- no changes. + - Build depend on javahelper providing java-arch.sh. + - Use linux-any, kfreebsd-any, etc. rather than hardcoded list of + non-Linux architectures to make life of porters easier; thanks to Robert + Millan for reporting this and providing a pointer to the fix + (Closes: #634690). + - Explicitly build-depend on libkvm-dev on kfreebsd; this is required by + the processes, swap and tcpconns plugins. + * debian/collectd-core.postrm, debian/collectd-core.templates: + - Prompt the user (debconf priority high) when purging the collected data + providing an option to opt out. The question defaults to remove the + data; thanks to Trent W. Buck for reporting and discussing this + (Closes: #631167). + * debian/collectd-core.collectd.init.d: + - Added cpufrequtils to should-start, else collectd does not reliably + detect all CPUs; thanks to Mathias Bauer for reporting and debugging + this (Closes: #662040). + - Use the exit codes specified by LSB in 'status' command; thanks to + Michael Prokop for reporting this (Closes: #615840). + * debian/po/: + - Added Danish debconf template translation; thanks to Joe Dalton + (Closes: #660918). + - Added Brazilian Portuguese debconf template translation; thanks to + Adriano Rafael Gomes (Closes: #662174). + - Added Polish debconf template translation; thanks to Michał Kułach + (Closes: #672739). + + -- Sebastian Harl Thu, 17 May 2012 15:55:39 +0200 + + collectd (4.10.4-1) unstable; urgency=low + + * New upstream release. + - Added support for Yajl version 2; thanks to John Stamp for reporting + this (Closes: #653879). + - collectd.conf(5) now documents the "Globals" config option and that this + is required for the "perl" and "python" plugins; thanks to Jeff Green + for reporting this (Closes: #612784). + - Be more verbose about why loading a plugin fails; thanks to Martin + Steigerwald for reporting this (Closes: #585975). + - Don't abort if including a config file fails; thanks to Reinhard Tartler + for reporting this (Closes: #592880). + - Fixed FTBFS with GCC 4.6; thanks to Matthias Klose for reporting this + and Peter Green and Colin Watson for providing patches + (Closes: #625323). + - Added support for libnotify 0.7; thanks to Michael Biebl for reporting + this (Closes: #636818). + - Fixed FTBFS with current libiptc; thanks to Lucas Nussbaum for reporting + this (Closes: #614439). + * debian/patches: + - Removed bts595756-notify_email-segfault -- included upstream. + - Removed bts592623-curl_json-file -- included upstream. + - Removed bts596128-reheap-fix -- included upstream. + - Removed CVE-2010-4336 -- included upstream. + * debian/rules: + - Append DEB_BUILD_ARCH to JAVA_HOME; this is how it's done in the OpenJDK + package. + - Split 'build' target into 'build-arch' and 'build-indep' as recommended + by policy. + * debian/patches/ipvs_h_include, debian/rules: + - Let the ipvs plugin use linux/ip_vs.h rather than net/ip_vs.h. Also, + make sure to look for the header in /usr/include rather than the kernel + directory (which has been deprecated). + - Force building of the ipvs plugin since configure is not currently able + to correctly check for ip_vs.h. + * debian/control: + - Updated standards-version to 3.9.2 -- no changes. + * debian/collectd-core.collectd.init.d: + - Added a description LSB header field. + * debian/collectd-core.overrides: + - Updated entry for java's binary-or-shlib-defines-rpath. + + -- Sebastian Harl Mon, 09 Jan 2012 16:10:58 +0100 + + collectd (4.10.1-2.1) unstable; urgency=high + + * Non-maintainer upload by the security team + * Fix DoS in RRD file creation (Closes: #605092) + Fixes: CVE-2010-4336 + Thanks to Florian Forster + + -- Steffen Joeris Wed, 08 Dec 2010 17:45:50 +1100 + collectd (4.10.1-2) unstable; urgency=medium * debian/rules: diff --cc debian/control index fab9902,d67addd..251ccf9 --- a/debian/control +++ b/debian/control @@@ -22,21 -24,19 +24,21 @@@ Build-Depends: debhelper (>= 5), dpkg-d libperl-dev, libpq-dev, libprotobuf-c0-dev, + librabbitmq-dev, librrd-dev (>= 1.4~), - libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64], + libsensors4-dev [linux-any], # 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~), - libtokyocabinet-dev [!kfreebsd-i386 !kfreebsd-amd64], - libtokyotyrant-dev [!kfreebsd-i386 !kfreebsd-amd64], + libtokyocabinet-dev [linux-any], + libtokyotyrant-dev [linux-any], libupsclient1-dev, + libvarnish-dev, - libvirt-dev (>= 0.4.0-6) [!kfreebsd-i386 !kfreebsd-amd64], + libvirt-dev (>= 0.4.0-6) [linux-any], libxml2-dev, libyajl-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], + linux-libc-dev (>= 2.6.25-4) [linux-any] | linux-libc-dev (<< 2.6.25-1) [linux-any], + openjdk-6-jdk [!hppa !kfreebsd-any !hurd-any], protobuf-c-compiler, python-dev Build-Conflicts: libpthread-dev