Hello community,
here is the log from the commit of package collectd for openSUSE:Factory
checked in at Thu Aug 4 15:09:36 CEST 2011.
--------
--- collectd/collectd.changes 2010-12-21 15:30:02.000000000 +0100
+++ /mounts/work_src_done/STABLE/collectd/collectd.changes 2011-08-03 00:59:30.000000000 +0200
@@ -2 +2 @@
-Tue Dec 21 14:27:22 UTC 2010 - lslezak@suse.cz
+Tue Aug 2 22:55:45 UTC 2011 - stefan.bruens@rwth-aachen.de
@@ -4,2 +4,3 @@
-- fixed packaging on openSUSE-11.4 - some perl-files are not
- generated, disabled plugin-notify-desktop - it doesn't build
+- notify-desktop: fix compatibility with libnotify >= 0.7.0
+- iptables plugin: use iptables library
+- ipvs plugin: disable for >= 12.1, as build fails currently
@@ -8 +9 @@
-Thu Dec 9 12:11:28 UTC 2010 - schubi@novell.com
+Mon Aug 1 11:50:52 UTC 2011 - stefan.bruens@rwth-aachen.de
@@ -10,2 +11,59 @@
-- Update to version 4.9.4 in order to fix security issue:
- CVE-2010-4336
+- df plugin: skip duplicate entries, fixes "uc_update: Value too old"
+ error
+
+-------------------------------------------------------------------
+Sat Apr 16 23:58:31 UTC 2011 - pascal.bleser@opensuse.org
+
+- downgrading in-tree iproute2 from 2.6.38 to 2.6.37, as 2.6.38 causes an
+ internal error in gcc
+
+-------------------------------------------------------------------
+Fri Apr 15 06:50:14 UTC 2011 - pascal.bleser@opensuse.org
+
+- add pinba plugin (through protobuf-c support)
+- add rpmlintrc file to suppress false positives
+- add collectd-pkgconfig_libnotify_add_gtk.patch to fix building libnotify
+ support on >= 11.4
+
+-------------------------------------------------------------------
+Wed Apr 13 21:24:21 UTC 2011 - pascal.bleser@opensuse.org
+
+- bump in-tree iproute2 to 2.6.38
+
+- update to 4.10.3:
+ * collectd: Threshold subsection: Handling of NAN values in the percentage
+ calculation has been fixed
+ * collectd, java plugin, ntpd plugin: Several diagnostic messages have been
+ improved
+ * curl_json plugin: Handling of arrays has been fixed.
+ * libvirt plugin: A bug in reading the virtual CPU statistics has been fixed
+ * processes plugin: Potentially erroneous behavior has been fixed in an error
+ handling case
+ * python plugin: Fix dispatching of values from Python scripts to collectd
+
+- changes from 4.10.2:
+ * collectd: If including one configuration file fails, continue with the rest
+ of the configuration if possible
+ * collectd: Fix a bug in the read function scheduling. In rare cases read
+ functions may not have been called as often as requested
+ * collectd: A left-over hard-coded 2 has been replaced by the configurable
+ timeout value
+ * curl, memcachec, tail plugins: Fix handling of "DERIVE" data sources.
+ Matching the end of a string has been improved
+ * curl_json plugin: Fix a problem when parsing 64bit integers. Reading JSON
+ data from non-HTTP sources has been fixed
+ * network plugin: Be less verbose about unchecked signatures, in order to
+ prevent spamming the logs
+ * notify_email plugin: Concurrency problems have been fixed
+ * python plugin: Set "sys.argv", since many scripts don't expect that it may
+ not be set
+ * rrdtool, rrdcached plugin: Fix a too strict assertion when creating RRD
+ files
+ * swap plugin: A bug which lead to incorrect I/O values has been fixed
+ * value match: A minor memory leak has been fixed
+
+-------------------------------------------------------------------
+Mon Jul 12 19:47:09 UTC 2010 - pascal.bleser@opensuse.org
+
+- add curl_json plugin (libyajl)
+- fix Java plugin on 11.1
@@ -21 +79,3 @@
- * Python plugin: memory leaks in the write and notification callbacks have been fixed; a possible crash when the plugin was loaded but not configured has been fixed
+ * Python plugin: memory leaks in the write and notification callbacks have
+ been fixed; a possible crash when the plugin was loaded but not configured
+ has been fixed
@@ -29,12 +89,20 @@
- * cURL plugin: the new ExcludeRegex allows to easily exclude certain lines from the match
- * cURL-XML plugin: new plugin allows to read XML files using cURL and extract metrics included in the files
- * FileCount plugin: the new IncludeHidden option allows to include hidden files and directories in the statistics
- * LogFile plugin: the new PrintSeverity option allows to include the severity of a message in the output
- * memcachec plugin: the new ExcludeRegex allows to easily exclude certain lines from the match
- * Modbus plugin: new plugin allows to read registers from Modbus-TCP enabled devices
- * Network plugin: new Interface option allows to set the interface to be used for multicast and, if supported, unicast traffic
- * OpenVPN plugin: the CollectUserCount and CollectIndividualUsers options allow more detailed control over how to report sessions of multiple users
- * Pinba plugin: new plugin receives timing information from the Pinba PHP extension, which can be used for profiling PHP code and webserver performance
- * Ping plugin: new MaxMissed allows to re-resolve a hosts address when it doesn't reply to a number of ping requests
- * PostgreSQL plugin: the Interval config option has been added; the plugin has been relicensed under the 2-clause BSD license
- * Processes plugin: support for code and data virtual memory sizes has been added
+ * cURL plugin: the new ExcludeRegex allows to easily exclude certain lines
+ from the match
+ * cURL-XML plugin: new plugin allows to read XML files using cURL and extract
+ metrics included in the files
+ * FileCount plugin: the new IncludeHidden option allows to include hidden
+ files and directories in the statistics
+ * LogFile plugin: the new PrintSeverity option allows to include the severity
+ of a message in the output
+ * memcachec plugin: the new ExcludeRegex allows to easily exclude certain
+ lines from the match
+ * Network plugin: new Interface option allows to set the interface to be used
+ for multicast and, if supported, unicast traffic
+ * OpenVPN plugin: the CollectUserCount and CollectIndividualUsers options
+ allow more detailed control over how to report sessions of multiple users
+ * Ping plugin: new MaxMissed allows to re-resolve a hosts address when it
+ doesn't reply to a number of ping requests
+ * PostgreSQL plugin: the Interval config option has been added; the plugin
+ has been relicensed under the 2-clause BSD license
+ * Processes plugin: support for code and data virtual memory sizes has been
+ added
@@ -42 +109,0 @@
- * RouterOS plugin: support for collecting CPU load, memory usage, used and free disk space, sectors written and number of bad blocks from MikroTik devices has been added
@@ -44 +111,2 @@
- * Tail plugin: the new ExcludeRegex allows to easily exclude certain lines from the match
+ * Tail plugin: the new ExcludeRegex allows to easily exclude certain lines
+ from the match
@@ -60,2 +128,4 @@
- * Apache plugin: collection of the number of active connections has been fixed for Apache 2.*
- * Exec plugin: error messages have been improved; the "running" flag is now cleared correctly when forking a child fails
+ * Apache plugin: collection of the number of active connections has been
+ fixed for Apache 2.*
+ * Exec plugin: error messages have been improved; the "running" flag is now
+ cleared correctly when forking a child fails
@@ -64,2 +134,4 @@
- * Network plugin: fix a segmentation fault when receiving packets with an unknown data source type
- * Network plugin: a memory leak when receiving encrypted network packets has been fixed
+ * Network plugin: fix a segmentation fault when receiving packets with an
+ unknown data source type
+ * Network plugin: a memory leak when receiving encrypted network packets has
+ been fixed
@@ -106,2 +178,4 @@
- * adds detection of dead connections and reconnection in the GenericJMX and Oracle plugins
- * fixes handling of negative values and hex strings has been corrected in the SNMP plugin
+ * adds detection of dead connections and reconnection in the GenericJMX and
+ Oracle plugins
+ * fixes handling of negative values and hex strings has been corrected in the
+ SNMP plugin
@@ -128,4 +202,9 @@
- * collectd: two new data source types, DERIVE and ABSOLUTE, have been added: DERIVE can be used for counters that are reset occasionally
- * thresholds: the advanced threshold options “Percentage”, “Hits”, and “Hysteresis” have been added
- * cURL-JSON plugin: the new cURL-JSON plugin reads JSON files using the cURL library and parses the contents according to user specification; among other things, this allows to read statistics from a CouchDB instance
- * DF plugin: using the new “ReportByDevice” option the device rather than the mount point can be used to identify partitions
+ * collectd: two new data source types, DERIVE and ABSOLUTE, have been added:
+ DERIVE can be used for counters that are reset occasionally
+ * thresholds: the advanced threshold options “Percentage”, “Hits”, and
+ “Hysteresis” have been added
+ * cURL-JSON plugin: the new cURL-JSON plugin reads JSON files using the cURL
+ library and parses the contents according to user specification; among
+ other things, this allows to read statistics from a CouchDB instance
+ * DF plugin: using the new “ReportByDevice” option the device rather than the
+ mount point can be used to identify partitions
@@ -133,10 +212,23 @@
- * GenericJMX plugin: the new, Java-based GenericJMX plugin allows to query arbitrary data from a Java process using the Java Management Extensions (JMX)
- * MadWifi plugin: the new MadWifi plugin collects information about Atheros wireless LAN chipsets from the MadWifi driver
- * network plugin: the receive- and send-buffer-sizes have been made configurable, allowing for bigger and smaller packets
- * olsrd plugin: the new OLSR plugin queries routing information from the Optimized Link State Routing daemon
- * RRDtool plugin: a new configuration option allows to define a random write delay when writing RRD files; this spreads the load created by writing RRD files more evenly
- * Swap plugin: the possibility to collect swapped in/out pages has been added to the Swap plugin
- * TokyoTyrant plugin: the new TokyoTyrant plugin reads the number of records and file size from a running Tokyo Tyrant server
- * UnixSock plugin: add the GETTHRESHOLD command: this command can be used to query the thresholds configured for a particular identifier
- * Write HTTP plugin: the new Write HTTP plugin sends the values collected by collectd to a web-server using HTTP POST requests
- * Empty Counter match: the new Empty Counter match matches value lists, where at least one data source is of type COUNTER and the counter value of all counter data sources is zero
+ * GenericJMX plugin: the new, Java-based GenericJMX plugin allows to query
+ arbitrary data from a Java process using the Java Management Extensions
+ (JMX)
+ * MadWifi plugin: the new MadWifi plugin collects information about Atheros
+ wireless LAN chipsets from the MadWifi driver
+ * network plugin: the receive- and send-buffer-sizes have been made
+ configurable, allowing for bigger and smaller packets
+ * olsrd plugin: the new OLSR plugin queries routing information from the
+ Optimized Link State Routing daemon
+ * RRDtool plugin: a new configuration option allows to define a random write
+ delay when writing RRD files; this spreads the load created by writing RRD
+ files more evenly
+ * Swap plugin: the possibility to collect swapped in/out pages has been added
+ to the Swap plugin
+ * TokyoTyrant plugin: the new TokyoTyrant plugin reads the number of records
+ and file size from a running Tokyo Tyrant server
+ * UnixSock plugin: add the GETTHRESHOLD command: this command can be used to
+ query the thresholds configured for a particular identifier
+ * Write HTTP plugin: the new Write HTTP plugin sends the values collected by
+ collectd to a web-server using HTTP POST requests
+ * Empty Counter match: the new Empty Counter match matches value lists, where
+ at least one data source is of type COUNTER and the counter value of all
+ counter data sources is zero
@@ -147 +239,2 @@
-- temporarily disable perl plugin for opensuse 11.2, must fix configure check first
+- temporarily disable perl plugin for opensuse 11.2, must fix configure check
+ first
@@ -163,7 +256,14 @@
- * apache plugin: handling of lighttpd's scoreboard statistics has been improved
- * conntrack plugin: the new conntrack plugin collects the connection tracking table size
- * fscache plugin: the new fscache plugin collects statistics about Linux' file-system based caching framework
- * gmond plugin: the new gmond plugin can receive and interpret multicast traffic from Ganglia's gmond daemon
- * java plugin: the new java plugin exports the collectd API to Java, making it possible to write extensions to collectd in Java
- * memcachec plugin: the new memcachec plugin queries data from a memcached daemon and parses it similar to the cURL plugin
++++ 53 more lines (skipped)
++++ between collectd/collectd.changes
++++ and /mounts/work_src_done/STABLE/collectd/collectd.changes
calling whatdependson for head-i586
Old:
----
collectd-4.10.2.tar.bz2
iproute2-2.6.34.tar.bz2
New:
----
collectd-4.10.3.tar.bz2
collectd-df-remove-duplicates.patch
collectd-javac_target.patch
collectd-libip4tc.patch
collectd-libnotify_070.patch
collectd-pkgconfig_libnotify_add_gtk.patch
collectd-rpmlintrc
iproute2-2.6.37.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ collectd.spec ++++++
--- /var/tmp/diff_new_pack.Ntn3J0/_old 2011-08-04 15:06:59.000000000 +0200
+++ /var/tmp/diff_new_pack.Ntn3J0/_new 2011-08-04 15:06:59.000000000 +0200
@@ -15,9 +15,8 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-%if 0%{?_with_xmms:1}0 || 0%{?suse_version} <= 1020
+%if 0%{?_with_xmms:1}0
%define xmms 1
%else
%define xmms 0
@@ -41,27 +40,27 @@
%define dbi 0
%endif
-%if ! 0%{?_without_memcachec:1}
+%if 0%{?suse_version} >= 1100 && ! 0%{?_without_memcachec:1}
%define memcachec 1
+%define memcached_plugin memcached
%else
%define memcachec 0
+%define memcached_plugin %{nil}
%endif
-%if 0%{?suse_version} < 1000 || 0%{?suse_version} > 1130
+%if 0%{?suse_version} < 1000
%define libnotify 0
%else
%define libnotify 1
%endif
%if 0%{?suse_version} > 1020
-%define snmp 1
%define ipmi 1
%define ascent 1
%define ascent_plugin ascent
%define iptables 1
%define iptables_plugin iptables
%else
-%define snmp 0
%define ipmi 0
%define ascent 0
%define ascent_plugin %{nil}
@@ -69,11 +68,7 @@
%define iptables_plugin %{nil}
%endif
-%if 0%{?suse_version} >= 1110
%define madwifi_plugin madwifi
-%else
-%define madwifi_plugin %{nil}
-%endif
%if 0%{?suse_version} >= 1130
%define rrdcached_plugin rrdcached
@@ -81,12 +76,45 @@
%define rrdcached_plugin %{nil}
%endif
-%define libnetlink_version 2.6.34
+%define snmp 1
+%define with_esmtp 1
-%define plugins apache apcups battery bind curl curl_xml conntrack contextswitch cpu cpufreq csv df disk dns email entropy exec filecount fscache hddtemp interface ipvs irq load logfile match_empty_counter match_hashed match_regex match_timediff match_value mbmon memcached memory multimeter netlink network nfs nginx ntpd olsrd openvpn perl ping protocols powerdns processes rrdtool sensors serial swap syslog table tail target_notification target_replace target_scale target_set tcpconns teamspeak2 ted thermal unixsock uptime users uuid vmem vserver wireless write_http %{expand:%ascent_plugin} %{expand:%iptables_plugin} %{expand:%madwifi_plugin} %{expand:%rrdcached_plugin}
+%if 0%{?suse_version} >= 1000
+%define yajl 1
+%define curl_json_plugin curl_json
+%define curl_xml_plugin curl_xml
+%define with_snmp_plugin 1
+%define with_pgsql 1
+%define with_mysql 1
+%define with_bind 1
+%define bind_plugin bind
+%define protobuf 1
+%define pinba_plugin pinba
+%else
+%define yajl 0
+%define curl_json_plugin %{nil}
+%define curl_xml_plugin %{nil}
+%define with_snmp_plugin 0
+%define with_pgsql 0
+%define with_mysql 0
+%define with_bind 0
+%define bind_plugin %{nil}
+%define protobuf 0
+%define pinba_plugin %{nil}
+%endif
+
+%if 0%{?suse_version} >= 1210
+%define ipvs_plugin %{nil}
+%else
+%define ipvs_plugin ipvs
+%endif
+
+%define libnetlink_version 2.6.37
+
+%define plugins apache apcups battery %{expand:%bind_plugin} curl %{expand:%curl_json_plugin} %{expand:%curl_xml_plugin} conntrack contextswitch cpu cpufreq csv df disk dns email entropy exec filecount fscache hddtemp interface %{expand:%ipvs_plugin} irq load logfile match_empty_counter match_hashed match_regex match_timediff match_value mbmon %{expand:%memcached_plugin} memory multimeter netlink network nfs nginx ntpd olsrd openvpn perl ping protocols powerdns processes rrdtool sensors serial swap syslog table tail target_notification target_replace target_scale target_set tcpconns teamspeak2 ted thermal unixsock uptime users uuid vmem vserver wireless write_http %{expand:%ascent_plugin} %{expand:%iptables_plugin} %{expand:%madwifi_plugin} %{expand:%rrdcached_plugin}
Name: collectd
-Version: 4.10.2
+Version: 4.10.3
Release: 1
Summary: Statistics Collection Daemon for filling RRD Files
Source: http://collectd.org/files/collectd-%{version}.tar.bz2
@@ -113,6 +141,12 @@
Patch20: collectd-split_README.patch
Patch21: collectd-fix_collectd_config_path_in_snmp_probe.patch
Patch22: collectd-collection3.patch
+Patch23: collectd-javac_target.patch
+Patch24: collectd-pkgconfig_libnotify_add_gtk.patch
+Patch25: collectd-df-remove-duplicates.patch
+Patch26: collectd-libip4tc.patch
+Patch27: collectd-libnotify_070.patch
+Source99: collectd-rpmlintrc
Url: http://collectd.org/
Group: System/Monitoring
License: GNU General Public License (GPL)
@@ -142,16 +176,23 @@
%endif #java
# for /etc/apache2/... ownership (rpmlint):
BuildRequires: apache2
-%if %suse_version >= 1000
+%if %with_esmtp
BuildRequires: libesmtp-devel
%endif
BuildRequires: xfsprogs-devel
-%if %suse_version >= 930
+%if %with_mysql
BuildRequires: mysql-devel >= 4.1.0
%endif
+%if %with_pgsql
BuildRequires: postgresql-devel
+%endif
+%if %yajl
+BuildRequires: libyajl-devel
+%endif
%if %suse_version >= 1030
BuildRequires: rrdtool-devel
+%endif
+%if %suse_version >= 1030
BuildRequires: libcurl-devel
%else
BuildRequires: curl-devel
@@ -185,6 +226,12 @@
%if %memcachec
BuildRequires: libmemcached-devel
%endif
+%if %protobuf
+BuildRequires: protobuf-c
+%endif
+%if %suse_version >= 1210
+BuildRequires: iptables-devel
+%endif
# in case we'd like to split it later:
Provides: collectd-perl = %{version}-%{release}
PreReq: %fillup_prereq
@@ -208,7 +255,7 @@
Florian octo Forster