Hello community, here is the log from the commit of package collectd for openSUSE:Factory checked in at 2016-01-21 23:43:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/collectd (Old) and /work/SRC/openSUSE:Factory/.collectd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "collectd" Changes: -------- --- /work/SRC/openSUSE:Factory/collectd/collectd.changes 2015-06-10 09:16:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.collectd.new/collectd.changes 2016-01-22 01:08:11.000000000 +0100 @@ -1,0 +2,308 @@ +Fri Jan 15 20:48:24 UTC 2016 - [email protected] + +- packaging: + * removed patches: + - collectd-new_libstatgrab.patch (fixed upstream) + - collectd-lib64.patch (fixed upstream) + - collectd-fix_libltdl_autoreconf.patch (fixed upstream) + * updated patches: + - collectd-javac_target.patch + - collectd-version.patch + +- upstream update release 2015-05-27, Version 5.5.0 + * Build system: Ability to make out-of-tree builds has been fixed. + Thanks to Vincent Bernat. #792 + * Build system, Disk and Users plugins: Detection and use of libstatgrab + ≧ 0.90 has been added. Thanks to Vincent Bernat. #445, #795, #806, + #807, #908 + * Build system, Memory, CPU, TCPConns and Processes plugins: Numerous + fixes related to OpenBSD support have been added. Thanks to Landry + Breuil. #777, #778, #779, #808 + * Build system: Plugins now only export "module_register()". Thanks to + Florian Forster. + * Build system: Various cleanups and improvements have been done. Thanks + to Marc Fournier. + * collectd: Numerous internal changes and improvements to the daemon and + the plugin API have been make. Thanks to Florian Forster, Pierre-Yves + Ritschard and Alex Petrov. #512, #727 + * collectd: Numerous spelling mistakes have been corrected in comments + and documentation and several error messages have been improved. + Thanks to Ruben Kerkhof, Abhinav Upadhyay, Olivier Bazoud, Pierre-Yves + Ritschard, Tim Smith, Moshe Zada, Katelyn Perry and Marc Fournier. + * collectd: Rules/Targets can now be appended to existing Filter Chains. + Thanks to Marc Falzon. #444 + * collectd: Failing Filter Chains destinations will now log the list of + available write targets. Thanks to Wilfried Goesgens. #650, #1043 + * collectd: Support for process signaling and management by upstart and + systemd has been implemented for the Linux platform. Thanks to + Pierre-Yves Ritschard and Marc Fournier. #798, #811, #814 + * collectd: The "CollectInternalStats" option has been added. Thanks to + Yves Mettier. #691 + * collectd: The daemon source code and dependencies have moved to the + "src/daemon/" directory. Thanks to Florian Forster. + * collectd: The new "MaxReadInterval" option allows to cap the + exponential retry interval of plugins read errors. Thanks to Alexey + Remizov and Florian Forster. #713 + * collectd: The "-P" command-line option now has precedence over the + "PIDFile" option. Thanks to Thomas D. #553 + * collection.cgi: Various data-source related adjustments have been + made. Thanks to Fabiano Pires and Sebastian Harl. + * libcollectdclient: Now propagates errors when signing / encrypting + network packets. Thanks to Florian Forster. + * Configuration: Support for unquoted IPv6 addresses has been added. + Thanks to Sebastian Harl. #489 + * Documentation: Various improvements have been done. Thanks to Florian + Forster and Marc Fournier. + * Examples: the sample C plugin has been updated to the current plugin + API. Thanks to Sebastian Harl. + * Licensing: The following components have been relicensed to the MIT + license: the Apple Sensors, Ascent, DBI, E-Mail, Entropy, GenericJMX, + gmond, LogFile, nginx, Notify Desktop, NTPd, NUT, olsrd, Perl, Ping, + PostgreSQL, Protocols, RouterOS, RRDCacheD, SNMP, StatsD, SysLog, + Table, Tail, UnixSock, vmem, VServer, Wireless, Write Riemann and XMMS + plugins, the core collectd daemon, the collectdmon, collectd-nagios + and collectd-tg utilities, all the Targets and Matches, liboconfig, + most of the "utils_*" files and the plugin API. + * Tests: A test suite has been added. Thanks to Florian Forster. + * Threshold: The hysteresis calculation has been made more reliable. + Thanks to Jan Kundrát. #581 + * Threshold: Various fixes and improvements have been made. Thanks to + Manuel Luis Sanmartín Rozada. #649, #644 + * AMQP plugin: The "ConnectionRetryDelay" option has been added, + allowing to delay reconnection. Thanks to Yoga Ramalingam and Marc + Fournier. #833 + * AMQP plugin: The "QueueDurable" and "QueueAutoDelete" options have + been added, giving control over queue creation and deletion. Thanks to + David Blundell and Marc Fournier. #623 + * Apache, Ascent, BIND, cURL, cURL-JSON, cURL-XML, nginx and Write HTTP + plugins: Customizing the "User-Agent" field is now possible at + compile-time. Thanks to Jeremy Katz. #440 + * Apache, Ascent, BIND, cURL, cURL-JSON, cURL-XML, nginx plugins: The + connection will be reset if it hasn't completed within the configured + "Interval". The new "Timeout" option gives control over this behavior. + Thanks to Jan Kundrát and Marc Fournier. #982, #983, #993 + * Apache, Ascent, cURL, cURL-JSON, cURL-XML, nginx, Write HTTP plugins: + Allow usernames and passwords to contain colons if built against + libcurl ≧ 7.19.1. Thanks to Marc Fournier. #695, #947 + * Apache plugin: The "SSLCiphers" option gives control over the + encryption algorithms to use with TLS connections. Thanks to Toni + Moreno. #946 + * Barometer plugin: This new plugin reads sensor data from various + Freescale and Bosch digital barometers. Thanks to Tomas Menzl. #69, + #693 + * Battery plugin: Reporting values as percentages and reporting degraded + batteries has been added. Thanks to Florian Forster. + * Battery plugin: Support for reading values from sysfs on Linux has + been added. Thanks to Andy Parkins, Nicholas Humfrey, Peter Wu and + Florian Forster. #725, #810, #998 + * Battery plugin: The value for current is no longer supplied unless the + battery provides this information. Thanks to Florian Forster. + * BIND plugin: Bind's XML v3 API is now supported; Thanks to Victor + Berger, Bruno Prémont and Michal Humpula. #742, #847 + * Ceph plugin: This new plugin collects statistics from the Ceph + distributed storage system. Thanks to Dan Ryder, Dennis Zou, Colin + McCabe, Sage Weil. #522, #598 + * ConnTrack plugin: Support for reporting values as percentages as well + as legacy conntrack files in "/proc" has been added. Thanks to + Pierre-Yves Ritschard. #497, #680 + * CPU plugin: The plugin is now able to report values as percentages and + aggregate values per-state and per-CPU. Thanks to Pierre-Yves + Ritschard, Florian Forster, Fabien Wernli, Nicholas Humfrey and + Wilfried Goesgens. #499, #516, #639 #734, #812, #802 + * cURL-JSON plugin: Extracting values from complex JSON structures has + been enhanced. Thanks to Jim Radford. #408, #411 + * cURL-JSON plugin: Intervals can now be configured on a per-URL basis. + Thanks to Stan Sawa. #685 + * cURL-JSON, cURL-XML, Write HTTP plugins: These plugins now also follow + HTTP redirects. Thanks to Marc Fournier. + * cURL, cURL-JSON, cURL-XML plugins: HTTP Digest authentication has been + implemented. Thanks to Frank Cornelis. #482 + * DBI, Oracle, PostgreSQL plugins: A "MetadataFrom" parameter has been + added which allows to set metadata from database columns. Thanks to + Mark Wong. #317, #321 + * DBI plugin: Querying several databases in parallel is now possible. + Thanks to Vincent Bernat. #453 + * Disk plugin: On the Linux platform, disk names can now get looked up + in udev with the "UdevNameAttr" option. Thanks to Patrick Mooney. #537 + * Disk plugin: This plugin now collects several additional I/O-related + metrics on the Linux platform. Thanks to Florian Forster and Michael + Schenck. #705, #759 + * DRBD plugin: This new plugin reads Linux's Distributed Replicated + Block Device (DRBD) statistics. Thanks to Tim Laszlo. #566, #700 + * Exec, UnixSock plugins: The "PUTNOTIF" command now allows to set + metadata on notifications. Thanks to John-John Tedro. #416 + * fhcount plugin: This new plugin reports the number of used file + handles. Thanks to Jiri Tyr. #1009 + * GenericJMX plugin: A Class Loader for "JMXConnectorFactory" has been + added, allowing the plugin to work with JBOSS > 7. Thanks to Alexandre + Moutot. #452 + * IPC plugin: This new plugin collects information related to shared + memory. Thanks to Andrés J. Díaz. #925 + * Java plugin: Now uses the hostname defined in the configuration file. + Thanks to Pierre-Yves Ritschard. #530, #681 + * Load plugin: The plugin is now able to report values as percentages. + Thanks to Vedran Bartonicek and Pierre-Yves Ritschard. #344, #498 + * Log Logstash plugin: This new plugin writes collectd logs and events + as Logstash JSON formatted events. Thanks to Pierre-Yves Ritschard. + #360 + * LVM plugin: The plugin collects thin pool data volumes size, and no + longer reports virtual volumes. Thanks to Benjamin Gilbert. #603 + * memcached plugin: "listen_disabled_num" are now also reported. Thanks + to Matt Cottingham. #622 + * Memory plugin: Slab memory reporting on the Linux platform has been + added. Thanks to Manuel CISSÉ and Marc Fournier. #560, #697 + * Memory plugin: The plugin is now able to report values as percentages. + Thanks to Jeremy Katz, Florian Forster and Manuel CISSÉ. #501, #511, + #559 + * Modbus plugin: Selecting between holding and input registers is now + possible. Thanks to Jan Vitek. #338 + * Modbus plugin: Support for accessing devices through an RS-485 serial + port has been added. Thanks to Eric Sandeen. + * Multimeter plugin: This plugin isn't built by default on the AIX + platform anymore. Thanks to Manuel Luis Sanmartin Rozada. #549, #684 + * MySQL and PostgreSQL plugins: Passing "127.0.0.1" as a host will now + result in the global Hostname being used in metric names. Thanks to + Jeremy Katz. #441 + * MySQL plugin: InnoDB, Select and Sort statistics collection has been + added. Thanks to Wilson Felipe, Marek Becka and Pierre-Yves Ritschard. + #248, #621, #699, #824 + * MySQL plugin: The "Alias" and "ConnectTimeout" options have been + added. Thanks to William Tisäter. + * Netlink plugin: Support for 64bit netlink counters has been added. + Thanks to Marek Becka. #435 + * Network plugin: The "ReconnectInterval" configuration option has been + added. Thanks to John Ferlito. #732 + * NFS plugin: Support for NFSv4.0 has been implemented. Thanks to Marek + Becka. #550 + * OneWire plugin: Support for more temperature-providing sensor families + has been added. Thanks to Tomasz Torcz. #672 + * OneWire plugin: Support for full OWFS path and more device families + has been implemented. Thanks to Tomas Menzl. #68 + * OpenLDAP plugin: This new plugin reads monitoring information from + OpenLDAP's "cn=Monitor" subtree. Thanks to Kimo Rosenbaum, Marc + Fournier and Nicholas Humfrey. #719 + * OpenVPN plugin: Support for OpenVPN 2.3.0 has been implemented. Thanks + to Ed Okerson. #252 + * OpenVZ plugin: Various improvements have been made, making the plugin + report values like the other collectd plugins do. Thanks to Chris + Lundquist. #264 + * Perl plugin: A new "listval_filter" method has been added, various + internal cleanups and improvements have been made and a test suite has + been added. Thanks to Matthias Bethke. #728 + * PostgreSQL plugin: The new "ExpireDelay" option allows skipping older + values pending write when the database slows down. Thanks to Stephen + O'Dor. #593 + * PowerDNS plugin: The plugin was updated for stats from pdns 3.4.3. + Thanks to Ruben Kerkhof. #965 + * Processes plugin: A memory-usage related optimization for low-profile ++++ 111 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/collectd/collectd.changes ++++ and /work/SRC/openSUSE:Factory/.collectd.new/collectd.changes Old: ---- _service collectd-5.4.2.tar.bz2 collectd-fix_libltdl_autoreconf.patch collectd-lib64.patch New: ---- collectd-5.5.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ collectd.spec ++++++ --- /var/tmp/diff_new_pack.ciwH2Q/_old 2016-01-22 01:08:13.000000000 +0100 +++ /var/tmp/diff_new_pack.ciwH2Q/_new 2016-01-22 01:08:13.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package collectd # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2005-2013 Pascal Bleser <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -17,12 +17,21 @@ # +%bcond_with modbus + %define madwifi_plugin madwifi %define pcap_version %({rpm -q --qf='%{VERSION}\n' libpcap-devel 2>/dev/null || echo 0.0.0} | gawk -F. '{print $1*10000+$2*100+$3}') %define snmp 1 %define with_esmtp 1 %define ipvs_plugin ipvs -%define plugins apache apcups battery %{expand:%{bind_plugin}} cgroups curl %{expand:%{curl_json_plugin}} %{expand:%{curl_xml_plugin}} conntrack contextswitch cpu cpufreq csv df disk %{expand:%{dns_plugin}} 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 statsd swap syslog table tail target_notification target_replace target_scale target_set target_v5upgrade tcpconns teamspeak2 ted thermal threshold unixsock uptime users uuid vmem vserver wireless write_http %{expand:%{ascent_plugin}} %{expand:%{iptables_plugin}} %{expand:%{madwifi_plugin}} %{expand:%{rrdcached_plugin}} aggregation ethstat md numa tail_csv write_graphite write_riemann +%define plugins apache apcups battery %{expand:%{bind_plugin}} cgroups curl %{expand:%{curl_json_plugin}} %{expand:%{curl_xml_plugin}} conntrack contextswitch cpu cpufreq csv df disk %{expand:%{dns_plugin}} 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 %{expand:%{sensors_plugin}} serial statsd swap syslog table tail target_notification target_replace target_scale target_set target_v5upgrade tcpconns teamspeak2 ted thermal threshold unixsock uptime users uuid vmem vserver wireless write_http %{expand:%{ascent_plugin}} %{expand:%{iptables_plugin}} %{expand:%{madwifi_plugin}} %{expand:%{rrdcached_plugin}} aggregation ethstat md numa tail_csv write_graphite write_riemann ceph drbd fhcount ipc log_logstash turbostat write_log write_log write_sensu write_tsdb zfs_arc zookeeper +%ifnarch s390 s390x +%define sensors 1 +%define sensors_plugin sensors +%else +%define sensors 0 +%define sensors_plugin %{nil} +%endif %if 0%{?_with_xmms:1}0 %define xmms 1 %else @@ -114,7 +123,7 @@ PreReq: %insserv_prereq %endif Name: collectd -Version: 5.4.2 +Version: 5.5.0 Release: 0 Summary: Statistics Collection Daemon for filling RRD Files License: GPL-2.0 @@ -128,13 +137,11 @@ # see https://bugzilla.novell.com/show_bug.cgi?id=388026 Source20: collectd-pthread.pc Source99: collectd-rpmlintrc -Patch4: collectd-lib64.patch Patch7: collectd-fix-config.patch Patch9: collectd-version.patch Patch10: collectd-perl-vendor.patch # see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=467072 Patch11: collectd-fix_broken_perl-5.10.patch -Patch17: collectd-fix_libltdl_autoreconf.patch Patch18: collectd-fix_collection_cgi.patch Patch19: collectd-fix_spamassassin_doc.patch Patch20: collectd-split_README.patch @@ -157,7 +164,6 @@ BuildRequires: kernel-source BuildRequires: libart_lgpl-devel BuildRequires: libevent-devel -#BuildRequires: libmodbus-devel BuildRequires: libmnl-devel BuildRequires: libnetlink-devel BuildRequires: liboping-devel @@ -172,11 +178,13 @@ BuildRequires: pkgconfig BuildRequires: python-devel BuildRequires: rrdtool -BuildRequires: sensors BuildRequires: xfsprogs-devel BuildRequires: zlib-devel Requires: rrdtool +%if %{sensors} +BuildRequires: sensors Requires: sensors +%endif # FIXME: use proper Requires(pre/post/preun/...) PreReq: %fillup_prereq # in case we'd like to split it later: @@ -253,6 +261,9 @@ %if %{memcachec} BuildRequires: libmemcached-devel %endif +%if %{with modbus} +BuildRequires: libmodbus-devel +%endif %if %{protobuf} BuildRequires: protobuf-c %endif @@ -426,6 +437,16 @@ Optional %{name} plugin to sample memcached statistics. %endif #memcachec +%if %{with modbus} +%package plugin-modbus +Summary: ModBus Plugin for %{name} +Group: System/Monitoring +Requires: %{name} = %{version}-%{release} + +%description plugin-modbus +Optional %{name} plugin to collect data using ModBus protocol. +%endif #modbus + %if %{protobuf} %package plugin-pinba Summary: Pinba Collector Plugin for %{name} @@ -471,6 +492,9 @@ %if %{memcachec} Requires: %{name}-plugin-memcachec = %{version}-%{release} %endif #memcachec +%if %{with modbus} +Requires: %{name}-plugin-modbus = %{version}-%{release} +%endif #modbus %if %{protobuf} Requires: %{name}-plugin-pinba = %{version}-%{release} %endif #protobuf @@ -511,19 +535,15 @@ %prep %setup -q -n "collectd-%{version}" -%if "%{_lib}"=="lib64" -%patch4 -%endif %patch7 %patch9 -p1 %patch10 %patch11 -%patch17 %patch18 %patch19 %patch20 %patch21 -%patch23 +%patch23 -p1 %if 0%{?suse_version} <= 1140 && !0%{?sles_version} %patch24 -p1 %endif @@ -608,6 +628,11 @@ %else --disable-memcached \ %endif #memcachec +%if %{with modbus} + --enable-modbus \ +%else + --disable-modbus \ +%endif #modbus %if 0%{?suse_version} < 930 --disable-mysql \ %endif @@ -908,8 +933,8 @@ %if %{virt} %files plugin-virt %defattr(-,root,root) -%{_libdir}/collectd/libvirt.so -%{_libdir}/collectd/libvirt.la +%{_libdir}/collectd/virt.so +%{_libdir}/collectd/virt.la %endif #virt %if %{xmms} @@ -933,6 +958,13 @@ %{_libdir}/collectd/memcachec.la %endif #memcachec +%if %{with modbus} +%files plugin-modbus +%defattr(-,root,root) +%{_libdir}/collectd/modbus.so +%{_libdir}/collectd/modbus.la +%endif #modbus + %files spamassassin %defattr(-,root,root) %dir %{_datadir}/spamassassin ++++++ collectd-5.4.2.tar.bz2 -> collectd-5.5.0.tar.bz2 ++++++ ++++ 86272 lines of diff (skipped) ++++++ collectd-javac_target.patch ++++++ --- /var/tmp/diff_new_pack.ciwH2Q/_old 2016-01-22 01:08:15.000000000 +0100 +++ /var/tmp/diff_new_pack.ciwH2Q/_new 2016-01-22 01:08:15.000000000 +0100 @@ -1,9 +1,11 @@ ---- 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 @@ - +diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am +index 8d2e49d..549d81a 100644 +--- a/bindings/java/Makefile.am ++++ b/bindings/java/Makefile.am +@@ -25,8 +25,8 @@ EXTRA_DIST = org/collectd/api/CollectdConfigInterface.java \ + org/collectd/java/JMXMemory.java - java-build-stamp: org/collectd/api/*.java org/collectd/java/*.java + java-build-stamp: $(srcdir)/org/collectd/api/*.java $(srcdir)/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 @@ -11,12 +13,14 @@ 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 +diff --git a/bindings/java/Makefile.in b/bindings/java/Makefile.in +index 1c57558..c8ab086 100644 +--- a/bindings/java/Makefile.in ++++ b/bindings/java/Makefile.in +@@ -597,8 +597,8 @@ uninstall-am: uninstall-local + - java-build-stamp: org/collectd/api/*.java org/collectd/java/*.java + java-build-stamp: $(srcdir)/org/collectd/api/*.java $(srcdir)/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 ++++++ collectd-version.patch ++++++ --- /var/tmp/diff_new_pack.ciwH2Q/_old 2016-01-22 01:08:15.000000000 +0100 +++ /var/tmp/diff_new_pack.ciwH2Q/_new 2016-01-22 01:08:15.000000000 +0100 @@ -1,9 +1,11 @@ ---- a/configure.ac 2014-01-26 09:09:23.000000000 +0100 -+++ b/configure.ac 2014-03-11 07:41:44.326748635 +0100 +diff --git a/configure.ac b/configure.ac +index 87d1502..15efa43 100644 +--- a/configure.ac ++++ b/configure.ac @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([collectd],[m4_esyscmd(./version-gen.sh)]) +AC_INIT([collectd],[@@VERSION@@]) - AC_CONFIG_SRCDIR(src/collectd.c) + AC_CONFIG_SRCDIR(src/) AC_CONFIG_HEADERS(src/config.h) AC_CONFIG_AUX_DIR([libltdl/config])
