From: Sebastian Harl Date: Mon, 22 Mar 2010 17:27:56 +0000 (+0100) Subject: Merged commit 'collectd-4.9.1-2' into lenny-backports. X-Git-Tag: collectd-4.9.1-2--bpo50+1~9 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1eeceef14d180872c7aab2d9c96858d01f3070c9;p=pkg-collectd.git Merged commit 'collectd-4.9.1-2' into lenny-backports. --- 1eeceef14d180872c7aab2d9c96858d01f3070c9 diff --cc debian/changelog index 6b7e2e8,f746fe2..8ad5054 --- a/debian/changelog +++ b/debian/changelog @@@ -1,37 -1,283 +1,317 @@@ + collectd (4.9.1-2) unstable; urgency=low + + * debian/rules: + - Re-enabled non-kfreebsd plugins on i386 and amd64, which had been + disabled accidentally by using findstring (which does a substring match) + to compare DEB_BUILD_ARCH with kfreebsd-{amd64,i386}; thanks to ilia + kudirov for reporting this (Closes: #567259). + - Replaced all occurrences of 'findstring' with appropriate 'filter' + statements to make sure to match words rather than substrings. + + -- Sebastian Harl Thu, 28 Jan 2010 22:09:16 +0100 + + collectd (4.9.1-1) unstable; urgency=low + + * New upstream release: + New plugins: + - Number of context switches done by the OS: contextswitch + - Query statistics from mon.itor.us: Monitorus (Perl based plugin) + - Collect statistics from NetApp filers: netapp (disabled in Debian; + libnetapp is not available) + - OpenVZ statistics: OpenVZ (Perl based plugin) + - Embedding a Python interpreter: python + - Query statistics from RouterOS: routeros (disabled in Debian; + librouteros is not available) + New matches: + - Match values using a hash function of the hostname: hashed + New targets: + - Scale (multiply) values: scale + * debian/control: + - Build-depend on "python-dev", required to build the "python" plugin. + * debian/collectd-core.install: + - Install all collectd-*.5 manpages (in particular, this includes the + newly added collectd-python.5). + * Added support for kfreebsd-{i386,amd64}; see below for details + (Closes: #566521). + * debian/control, debian/rules: + - Disabled the following Linux-specific plugins / removed the following + build-deps on kfreebsd-{i386,amd64}: + + "iptables" plugin / iptables-dev + + "ipvs" plugin / linux-libc-dev + + "madwifi" plugin + + "netlink" plugin / iproute-dev + + "sensors" plugin / libsensors4-dev + + "vserver" plugin + - Disabled the following plugins / removed the following build-deps on + kfreebsd-{i386,amd64} -- the build-deps are (not yet) available on + kfreebsd: + + "gmond" plugin / libganglia1-dev + + "libvirt" plugin / libvirt-dev + + "java" plugin / openjdk6-jdk + - Enabled the "rrdcached" plugin and build-depend on librrd-dev (>= 1.4~) + (and removed the optional build-dep on librrd2-dev). + - Enabled the "tokyotyrant" plugin (except on kfreebsd-{i386,amd64}) and + build-depend on libtokyotyrant-dev (which is not available on kfreebsd). + Also, build-depend on libtokyocabinet-dev to work around a missing + dependency in libtokyotyrant-dev (see #566584). + * debian/rules: + - Disabled the following plugins on kfreebsd-{i386,amd64} which have not + yet been ported to FreeBSD: battery, conntrack, contextswitch, cpufreq, + disk, entropy, fscache, irq, nfs, protocols, serial, thermal, vmem, + wireless. + - Simplified Java archdir mapping: removed entries "pointing" to + themselves and let those default to DEB_BUILD_ARCH. + - Check whether all patches have been enabled; fail, if not. + * debian/patches: + - Added bts566199_collection_hide_types.dpatch -- added ability to hide + specified types in collection.cgi; thanks to Pavel Piatruk for the patch + (Closes: #566199). + - Added typo_fixes.dpatch -- fixing some typos in manpages and error + messages; thanks to lintian(1) for reporting this. + * debian/collectd-core.overrides: + - Replaced overrides for spelling-error-in-description with + capitalization-error-in-description. + + -- Sebastian Harl Tue, 26 Jan 2010 00:22:32 +0100 + + 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 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 + ; 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 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 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 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 + ). + + -- Sebastian Harl Sat, 29 Aug 2009 12:42:15 +0200 + +collectd (4.6.3-1~bpo50+1) lenny-backports; urgency=low + + * Rebuild for lenny-backports. + * Remaining changes: + - Build-conflict with iptables-dev to force the use of the shipped libiptc + (this allows building the iptables plugin on all architectures). + + -- Sebastian Harl Sun, 14 Jun 2009 17:06:37 +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 Sun, 14 Jun 2009 13:52:04 +0200 + collectd (4.6.3-1) unstable; urgency=low * New upstream release. diff --cc debian/control index 1a7271b,b382b76..c020368 --- a/debian/control +++ b/debian/control @@@ -2,9 -2,41 +2,40 @@@ Source: collect Section: utils Priority: optional Maintainer: Sebastian Harl - Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch, bison, flex, autotools-dev, pkg-config, linux-libc-dev (>= 2.6.25-4) | linux-libc-dev (<< 2.6.25-1), libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev, libmysqlclient15-dev, librrd-dev | librrd2-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap0.8-dev | libpcap-dev, libupsclient1-dev, libperl-dev, iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel], libsnmp-dev | libsnmp9-dev, libvirt-dev (>= 0.4.0-6) [amd64 i386 powerpc], libxml2-dev, libhal-dev, libopenipmi-dev (>= 2.0.14-1~), libglib2.0-dev, libnotify-dev, libesmtp-dev, libpq-dev, libdbi0-dev + Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch, + bison, flex, autotools-dev, libltdl-dev, pkg-config, + iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel !kfreebsd-i386 !kfreebsd-amd64], - iptables-dev (>= 1.4.3.2-2) [!kfreebsd-i386 !kfreebsd-amd64], + libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev, + libdbi0-dev, + libesmtp-dev, + libganglia1-dev (>= 3) [!kfreebsd-i386 !kfreebsd-amd64], + 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 (>= 1.4~), + libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64], + # 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], + libupsclient1-dev, + libvirt-dev (>= 0.4.0-6) [!kfreebsd-i386 !kfreebsd-amd64], + 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], + python-dev -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