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 - lsle...@suse.cz +Tue Aug 2 22:55:45 UTC 2011 - stefan.bru...@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 - sch...@novell.com +Mon Aug 1 11:50:52 UTC 2011 - stefan.bru...@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.ble...@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.ble...@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.ble...@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.ble...@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 <o...@verplant.org> %package web -License: GNU General Public License (GPL) + Summary: Web Frontend for watching the %{name} Statistics Group: System/Monitoring Requires: perl apache2 rrdtool @@ -224,7 +271,7 @@ Please look at /etc/apache2/conf.d/%{name}.conf on how to enable. %package web-js -License: GNU General Public License (GPL) + Summary: Web/JavaScript Frontend for watching %{name} Statistics Group: System/Monitoring Requires: perl apache2 rrdtool @@ -257,7 +304,7 @@ %if %ipmi %package plugin-ipmi -License: GNU General Public License (GPL) + Summary: OpenIPMI Monitoring Plugin for %{name} Group: System/Monitoring Requires: %{name} = %{version}-%{release} @@ -270,7 +317,7 @@ %if %snmp %package plugin-snmp -License: GNU General Public License (GPL) + Summary: SNMP Monitoring Plugin for %{name} Group: System/Monitoring Requires: %{name} = %{version}-%{release} @@ -282,29 +329,32 @@ Optional %{name} plugin to monitor devices using SNMP. %endif #snmp -%if %suse_version >= 930 +%if %with_mysql %package plugin-mysql -License: GNU General Public License (GPL) + Summary: MySQL Monitoring Plugin for %{name} Group: System/Monitoring Requires: %{name} = %{version}-%{release} %description plugin-mysql Optional %{name} plugin to monitor MySQL server instances. -%endif +%endif #with_mysql + +%if %with_pgsql %package plugin-postgresql -License: GNU General Public License (GPL) + Summary: PostgreSQL Monitoring Plugin for %{name} Group: System/Monitoring Requires: %{name} = %{version}-%{release} %description plugin-postgresql Optional %{name} plugin to monitor PostgreSQL server instances. +%endif #with_pgsql %package plugin-python -License: GNU General Public License (GPL) + Summary: Python API for %{name} Group: System/Monitoring Requires: %{name} = %{version}-%{release} @@ -316,7 +366,7 @@ %if %java %package plugin-java -License: GNU General Public License (GPL) + Summary: Java API for %{name} Group: System/Monitoring Requires: %{name} = %{version}-%{release} @@ -329,7 +379,7 @@ %if %virt %package plugin-virt -License: GNU General Public License (GPL) + Summary: Virtual Machine Statistics Plugin for %{name} Group: System/Monitoring Requires: %{name} = %{version}-%{release} @@ -342,7 +392,7 @@ %if %xmms %package plugin-xmms -License: GNU General Public License (GPL) + Summary: XMMS Monitoring Plugin for %{name} Group: System/Monitoring Requires: %{name} = %{version}-%{release} @@ -355,7 +405,7 @@ %if %dbi %package plugin-dbi -License: GNU General Public License (GPL) + Summary: DBI Storage Plugin for %{name} Group: System/Monitoring Requires: %{name} = %{version}-%{release} @@ -368,7 +418,7 @@ %if %memcachec %package plugin-memcachec -License: GNU General Public License (GPL) + Summary: Memcache Daemon Monitoring Plugin for %{name} Group: System/Monitoring Requires: %{name} = %{version}-%{release} @@ -377,8 +427,21 @@ Optional %{name} plugin to sample memcached statistics. %endif #memcachec +%if %protobuf + +%package plugin-pinba + +Summary: Pinba Collector Plugin for %{name} +Group: System/Monitoring +Requires: %{name} = %{version}-%{release} + +%description plugin-pinba +Optional %{name} plugin to receive and dispatch timing values from Pinba, a +profiling extension for PHP. +%endif #protobuf + %package plugins-all -License: GNU General Public License (GPL) + Summary: All Monitoring Plugins for %{name} Group: System/Monitoring Requires: %{name} = %{version}-%{release} @@ -388,10 +451,12 @@ %if %snmp Requires: %{name}-plugin-snmp = %{version}-%{release} %endif #snmp -%if %suse_version >= 930 +%if %with_mysql Requires: %{name}-plugin-mysql = %{version}-%{release} -%endif #suse >= 930 +%endif #with_mysql +%if %with_pgsql Requires: %{name}-plugin-postgresql = %{version}-%{release} +%endif %if %java Requires: %{name}-plugin-java = %{version}-%{release} %endif #java @@ -410,13 +475,16 @@ %if %memcachec Requires: %{name}-plugin-memcachec = %{version}-%{release} %endif #memcachec +%if %protobuf +Requires: %{name}-plugin-pinba = %{version}-%{release} +%endif #protobuf %description plugins-all Metapackage that installs %{name} and all the available monitoring plugin subpackages, except %{name}-plugin-xmms %package spamassassin -License: GNU General Public License (GPL) + Summary: Spamassassin Monitoring for %{name} Group: System/Monitoring Requires: %{name} = %{version}-%{release} @@ -427,7 +495,7 @@ SpamAsssassin anti-spam engine. %package -n libcollectdclient0 -License: GNU General Public License (GPL) + Summary: Library for %{name} clients Group: System/Monitoring Provides: libcollectdclient = %{version}-%{release} @@ -437,7 +505,7 @@ unixsock plugin for clients. %package -n libcollectdclient-devel -License: GNU General Public License (GPL) + Summary: Development Environment for %{name} clients Group: Development/Libraries/C and C++ Requires: libcollectdclient0 = %{version}-%{release} @@ -468,6 +536,11 @@ %patch20 %patch21 %patch22 +%patch23 +%patch24 +%patch25 -p1 +%patch26 -p1 +%patch27 -p1 %__sed -i 's|@@VERSION@@|%{version}|g' configure.in @@ -475,6 +548,8 @@ %__install -D -m0644 "%{SOURCE20}" pkgconfig/pthread.pc %__sed 's|@@LIB@@|%{_lib}|g' pkgconfig/pthread.pc +%__perl -p -i -e 's|(-L\$withval/lib)\b|${1}64|g' configure.in configure + # unneeded files: %__rm -fr \ contrib/fedora \ @@ -511,7 +586,8 @@ export PATH="$JDK_HOME/bin:$JRE_HOME/bin:$JAVA_HOME/bin:$PATH" # add /usr/src/linux to include path to find net/ip_vs.h: -export CFLAGS="%{optflags} -I$PWD/iproute2-%{libnetlink_version}/include/ -fno-strict-aliasing" +#export CFLAGS="%{optflags} -I$PWD/iproute2-%{libnetlink_version}/include/ -fno-strict-aliasing" +export CFLAGS="%{optflags} -fno-strict-aliasing" export CXXFLAGS="$CFLAGS" # workaround for missing pthread.pc on openSUSE, required by OpenIPMIpthread.pc export PKG_CONFIG_PATH="$PWD/pkgconfig:$PKG_CONFIG_PATH" @@ -524,6 +600,7 @@ --disable-nut \ --enable-netlink \ --enable-python \ + --with-librrd \ %if %iptables --enable-iptables \ %else @@ -566,7 +643,12 @@ --disable-serial %endif #os linux -%__make %{?jobs:-j%{jobs}} +%__make %{?_smp_flags} \ +%if 0%{?suse_version} < 1120 + JAVAC_TARGET="-source 1.5 -target 1.5" +%else + JAVAC_TARGET="-source 1.5 -target 1.6" +%endif %install %makeinstall @@ -577,6 +659,9 @@ %__sed -i '/^dependency_libs=/ s|-L'"${RPM_BUILD_DIR}/%{name}-%{version}"'/src||g' "%{buildroot}%{_libdir}/collectd/python.la" +# delete if it exists (not packaged any more on openSUSE): +%__rm -rf "%{buildroot}/var/adm/perl-modules/%{name}" + %if !%java %__rm -f "%{buildroot}%{_mandir}/man5"/collectd-java.5* %__rm -rf "%{buildroot}%{_datadir}/collectd/java" @@ -610,6 +695,7 @@ %__rm contrib/collection.cgi contrib/collection.conf %perl_process_packlist +%__rm -rf "%{buildroot}/var/adm/perl-modules"/* # web-js CGI frontend (_must_ be installed _after_ perl_process_packlist) %__install -d "%{buildroot}/srv/www/collectd-js" @@ -666,6 +752,14 @@ find contrib/ -name '*.orig' -exec %__rm {} \; +%if !%with_pgsql +%__rm -f "%{buildroot}%{_datadir}/collectd/postgresql_default.conf" +%endif + +%if !%with_snmp_plugin +%__rm -f "%{buildroot}%{_mandir}/man5/collectd-snmp.5" +%endif + # plugin list: echo -n > plugins.lst for plugin in %{plugins}; do @@ -693,7 +787,7 @@ %postun -n libcollectdclient0 -p /sbin/ldconfig %clean -%__rm -rf "%{buildroot}" +%{?buildroot:%__rm -rf "%{buildroot}"} %files -f plugins.lst %defattr(-,root,root) @@ -706,33 +800,30 @@ %{_sbindir}/collectd %{_sbindir}/collectdmon %dir %{_libdir}/collectd -%if %suse_version >= 1000 +%if %with_esmtp %{_libdir}/collectd/notify_email.so %{_libdir}/collectd/notify_email.la -%endif +%endif #with_esmtp %dir %{_datadir}/collectd %{_datadir}/collectd/types.db %{perl_vendorlib}/Collectd.pm %dir %{perl_vendorlib}/Collectd %{perl_vendorlib}/Collectd/* %{perl_vendorarch}/auto/Collectd -%doc %{_mandir}/man1/collectd.1* -%doc %{_mandir}/man1/collectdmon.1* -%doc %{_mandir}/man1/collectd-nagios.1* -%doc %{_mandir}/man1/cussh.1* -%doc %{_mandir}/man5/collectd.conf.5* -%doc %{_mandir}/man5/collectd-email.5* -%doc %{_mandir}/man5/collectd-exec.5* -%doc %{_mandir}/man5/collectd-perl.5* -%doc %{_mandir}/man5/collectd-unixsock.5* -%doc %{_mandir}/man5/types.db.5* -%doc %{perl_man3dir}/Collectd::Unixsock.%{perl_man3ext}* +%doc %{_mandir}/man1/collectd.1%{ext_man} +%doc %{_mandir}/man1/collectdmon.1%{ext_man} +%doc %{_mandir}/man1/collectd-nagios.1%{ext_man} +%doc %{_mandir}/man1/cussh.1%{ext_man} +%doc %{_mandir}/man5/collectd.conf.5%{ext_man} +%doc %{_mandir}/man5/collectd-email.5%{ext_man} +%doc %{_mandir}/man5/collectd-exec.5%{ext_man} +%doc %{_mandir}/man5/collectd-perl.5%{ext_man} +%doc %{_mandir}/man5/collectd-unixsock.5%{ext_man} +%doc %{_mandir}/man5/types.db.5%{ext_man} +%doc %{perl_man3dir}/Collectd::Unixsock.%{perl_man3ext}%{ext_man} %dir %{_localstatedir}/lib/collectd /etc/init.d/collectd /usr/sbin/rccollectd -%if 0%{?suse_version} == 0 || 0%{?suse_version} <= 1130 -/var/adm/perl-modules/%{name} -%endif %files web %defattr(-,root,root) @@ -772,12 +863,22 @@ %defattr(-,root,root) %doc _rpmdoc_/snmp/* %{_bindir}/collectd-snmp-probe-host +%doc %{_mandir}/man1/collectd-snmp-probe-host.1%{ext_man} +%if %with_snmp_plugin %{_libdir}/collectd/snmp.so %{_libdir}/collectd/snmp.la -%doc %{_mandir}/man1/collectd-snmp-probe-host.1* -%doc %{_mandir}/man5/collectd-snmp.5* +%doc %{_mandir}/man5/collectd-snmp.5%{ext_man} +%endif #with_snmp_plugin %endif #snmp +%if %protobuf + +%files plugin-pinba +%defattr(-,root,root) +%{_libdir}/collectd/pinba.so +%{_libdir}/collectd/pinba.la +%endif #protobuf + %if %suse_version >= 930 %files plugin-mysql @@ -786,17 +887,20 @@ %{_libdir}/collectd/mysql.la %endif +%if %with_pgsql + %files plugin-postgresql %defattr(-,root,root) %{_libdir}/collectd/postgresql.so %{_libdir}/collectd/postgresql.la %config %{_datadir}/collectd/postgresql_default.conf +%endif #with_pgsql %files plugin-python %defattr(-,root,root) %{_libdir}/collectd/python.so %{_libdir}/collectd/python.la -%doc %{_mandir}/man5/collectd-python.5* +%doc %{_mandir}/man5/collectd-python.5%{ext_man} %if %java @@ -806,7 +910,7 @@ %{_libdir}/collectd/java.so %{_libdir}/collectd/java.la %{_datadir}/collectd/java -%doc %{_mandir}/man5/collectd-java.5* +%doc %{_mandir}/man5/collectd-java.5%{ext_man} %endif #java %if %virt @@ -849,7 +953,7 @@ %dir %{perl_vendorlib}/Mail/SpamAssassin %dir %{perl_vendorlib}/Mail/SpamAssassin/Plugin %{perl_vendorlib}/Mail/SpamAssassin/Plugin/Collectd.pm -%doc %{perl_man3dir}/Mail::SpamAssassin::Plugin::Collectd.%{perl_man3ext}* +%doc %{perl_man3dir}/Mail::SpamAssassin::Plugin::Collectd.%{perl_man3ext}%{ext_man} %files plugins-all %defattr(-,root,root) @@ -866,9 +970,4 @@ %{_libdir}/libcollectdclient.so %{_libdir}/pkgconfig/libcollectdclient.pc -# vim: set sw=3 ts=3 noet: -# Local Variables: -# mode: rpm-spec -# tab-width: 3 -# End: %changelog ++++++ collectd-4.10.2.tar.bz2 -> collectd-4.10.3.tar.bz2 ++++++ ++++ 202714 lines of diff (skipped) ++++++ collectd-df-remove-duplicates.patch ++++++ diff --git a/src/df.c b/src/df.c index fc80ac3..a6cf37c 100644 --- a/src/df.c +++ b/src/df.c @@ -213,6 +213,7 @@ static int df_read (void) { unsigned long long blocksize; char disk_name[256]; + cu_mount_t *mnt_dup_ptr; if (ignorelist_match (il_device, (mnt_ptr->spec_device != NULL) @@ -224,6 +225,20 @@ static int df_read (void) if (ignorelist_match (il_fstype, mnt_ptr->type)) continue; + /* ignore duplicates */ + for (mnt_dup_ptr = mnt_ptr; mnt_dup_ptr != NULL; mnt_dup_ptr = mnt_dup_ptr->next) + { + if (by_device) { + if (strcmp (mnt_ptr->spec_device, mnt_dup_ptr->spec_device) == 0) + continue; + } + else + { + if (strcmp (mnt_ptr->dir, mnt_dup_ptr->dir) == 0) + continue; + } + } + if (STATANYFS (mnt_ptr->dir, &statbuf) < 0) { char errbuf[1024]; ++++++ collectd-fix_libltdl_autoreconf.patch ++++++ --- /var/tmp/diff_new_pack.Ntn3J0/_old 2011-08-04 15:07:00.000000000 +0200 +++ /var/tmp/diff_new_pack.Ntn3J0/_new 2011-08-04 15:07:00.000000000 +0200 @@ -1,16 +1,16 @@ ---- Makefile.in.orig 2009-07-27 16:44:54.000000000 +0200 -+++ Makefile.in 2009-07-27 16:45:08.000000000 +0200 -@@ -263,7 +263,7 @@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ +--- Makefile.in.orig 2011-04-13 22:41:49.000000000 +0200 ++++ Makefile.in 2011-04-13 22:41:57.000000000 +0200 +@@ -565,7 +565,7 @@ + subdirs = @subdirs@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ -ACLOCAL_AMFLAGS = -I libltdl/m4 +ACLOCAL_AMFLAGS = -I libltdl SUBDIRS = libltdl src bindings INCLUDES = $(LTDLINCL) EXTRA_DIST = contrib version-gen.sh ---- Makefile.am.orig 2009-07-27 16:44:44.000000000 +0200 -+++ Makefile.am 2009-07-27 16:44:52.000000000 +0200 +--- Makefile.am.orig 2011-04-13 22:42:01.000000000 +0200 ++++ Makefile.am 2011-04-13 22:42:05.000000000 +0200 @@ -1,4 +1,4 @@ -ACLOCAL_AMFLAGS = -I libltdl/m4 +ACLOCAL_AMFLAGS = -I libltdl ++++++ collectd-javac_target.patch ++++++ --- bindings/java/Makefile.in.orig 2010-07-12 20:27:41.000000000 +0200 +++ bindings/java/Makefile.in 2010-07-12 20:28:09.000000000 +0200 @@ -490,8 +490,8 @@ java-build-stamp: org/collectd/api/*.java org/collectd/java/*.java - $(JAVAC) -d "." "$(srcdir)/org/collectd/api"/*.java - $(JAVAC) -d "." "$(srcdir)/org/collectd/java"/*.java + $(JAVAC) $(JAVAC_TARGET) -d "." "$(srcdir)/org/collectd/api"/*.java + $(JAVAC) $(JAVAC_TARGET) -d "." "$(srcdir)/org/collectd/java"/*.java mkdir -p .libs $(JAR) cf .libs/collectd-api.jar "org/collectd/api"/*.class $(JAR) cf .libs/generic-jmx.jar "org/collectd/java"/*.class --- bindings/java/Makefile.am.orig 2010-07-12 20:26:48.000000000 +0200 +++ bindings/java/Makefile.am 2010-07-12 20:27:35.000000000 +0200 @@ -25,8 +25,8 @@ org/collectd/java/JMXMemory.java java-build-stamp: org/collectd/api/*.java org/collectd/java/*.java - $(JAVAC) -d "." "$(srcdir)/org/collectd/api"/*.java - $(JAVAC) -d "." "$(srcdir)/org/collectd/java"/*.java + $(JAVAC) $(JAVAC_TARGET) -d "." "$(srcdir)/org/collectd/api"/*.java + $(JAVAC) $(JAVAC_TARGET) -d "." "$(srcdir)/org/collectd/java"/*.java mkdir -p .libs $(JAR) cf .libs/collectd-api.jar "org/collectd/api"/*.class $(JAR) cf .libs/generic-jmx.jar "org/collectd/java"/*.class ++++++ collectd-libip4tc.patch ++++++ diff --git a/configure.in b/configure.in index 5c3564c..d1c293c 100644 --- a/configure.in +++ b/configure.in @@ -1630,9 +1630,9 @@ fi # Check for the iptc_init symbol in the library. if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xno" then - AC_CHECK_LIB(iptc, iptc_init, + AC_CHECK_LIB(ip4tc, iptc_init, [ - AC_DEFINE(HAVE_LIBIPTC, 1, [Define to 1 if you have the iptc library (-liptc).]) + AC_DEFINE(HAVE_LIBIPTC, 1, [Define to 1 if you have the iptc library (-lip4tc).]) ], [ with_libiptc="yes" ++++++ collectd-libnotify_070.patch ++++++ diff --git a/src/notify_desktop.c b/src/notify_desktop.c index 839bc61..31c2411 100644 --- a/src/notify_desktop.c +++ b/src/notify_desktop.c @@ -95,7 +95,13 @@ static int c_notify (const notification_t *n, : (NOTIF_WARNING == n->severity) ? "WARNING" : (NOTIF_OKAY == n->severity) ? "OKAY" : "UNKNOWN"); +#if (defined NOTIFY_CHECK_VERSION) +#if NOTIFY_CHECK_VERSION(0, 7, 0) + notification = notify_notification_new (summary, n->message, NULL); +#endif +#else notification = notify_notification_new (summary, n->message, NULL, NULL); +#endif if (NULL == notification) { log_err ("Failed to create a new notification."); return -1; ++++++ collectd-pkgconfig_libnotify_add_gtk.patch ++++++ --- configure.in.orig 2011-04-15 08:06:54.000000000 +0200 +++ configure.in 2011-04-15 08:09:05.000000000 +0200 @@ -3833,7 +3833,7 @@ fi # }}} -PKG_CHECK_MODULES([LIBNOTIFY], [libnotify], +PKG_CHECK_MODULES([LIBNOTIFY], [libnotify gtk+-2.0], [with_libnotify="yes"], [with_libnotify="no ($LIBNOTIFY_PKG_ERRORS)"]) --- configure.orig 2011-04-15 08:09:08.000000000 +0200 +++ configure 2011-04-15 08:10:40.000000000 +0200 @@ -45112,7 +45112,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify" 2>/dev/null` + pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify" "gtk+-2.0"2>/dev/null` else pkg_failed=yes fi @@ -45126,11 +45126,11 @@ else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnotify\"") >&5 - ($PKG_CONFIG --exists --print-errors "libnotify") 2>&5 + ($PKG_CONFIG --exists --print-errors "libnotify" "gtk+-2.0") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify" 2>/dev/null` + pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify" "gtk+-2.0" 2>/dev/null` else pkg_failed=yes fi @@ -45149,9 +45149,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libnotify"` + LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libnotify" "gtk+-2.0"` else - LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnotify"` + LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnotify" "gtk+-2.0"` fi # Put the nasty error message in config.log where it belongs echo "$LIBNOTIFY_PKG_ERRORS" >&5 ++++++ collectd-rpmlintrc ++++++ addFilter('perl5-naming-policy-not-applied') addFilter('non-etc-or-var-file-marked-as-conffile .*/spamassassin/99_collectd.cf') addFilter('non-etc-or-var-file-marked-as-conffile .*/collectd/postgresql_default.conf') addFilter('macro-in-comment') addFilter('no-manual-page-for-binary rccollectd') addFilter('obsolete-suse-version-check') ++++++ iproute2-2.6.34.tar.bz2 -> iproute2-2.6.37.tar.bz2 ++++++ ++++ 3258 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
