Merge branch 'collectd-5.5'

diff --combined contrib/redhat/collectd.spec
index 53ceb93,fb0a55c..8d8cb8d
--- 1/contrib/redhat/collectd.spec
--- 2/contrib/redhat/collectd.spec
+++ b/contrib/redhat/collectd.spec
@@@ -62,12 -62,12 +62,13 @@@
  %{?el7:%global _has_lvm2app_h 1}
  %{?el7:%global _has_libudev 1}
  %{?el7:%global _has_recent_librrd 1}
- %{?el7:%global _has_broken_libmemcached 1}
  %{?el7:%global _has_iproute 1}
  %{?el7:%global _has_atasmart 1}
  %{?el7:%global _has_hiredis 1}
  %{?el7:%global _has_asm_msr_index 1}
 +%{?el7:%global _has_libmosquitto 1}
+ %{?el7:%global _has_libmodbus 1}
+ %{?el7:%global _has_xmms 1}
  
  # plugins enabled by default
  %define with_aggregation 0%{!?_without_aggregation:1}
@@@ -116,12 -116,11 +117,12 @@@
  %define with_madwifi 0%{!?_without_madwifi:1}
  %define with_mbmon 0%{!?_without_mbmon:1}
  %define with_md 0%{!?_without_md:1}
- %define with_memcachec 0%{!?_without_memcachec:0%{!?_has_broken_libmemcached:1}}
+ %define with_memcachec 0%{!?_without_memcachec:1}
  %define with_memcached 0%{!?_without_memcached:1}
  %define with_memory 0%{!?_without_memory:1}
  %define with_multimeter 0%{!?_without_multimeter:1}
  %define with_modbus 0%{!?_without_modbus:0%{?_has_libmodbus}}
 +%define with_mqtt 0%{!?_without_mqtt:0%{?_has_libmosquitto}}
  %define with_mysql 0%{!?_without_mysql:1}
  %define with_netlink 0%{!?_without_netlink:0%{?_has_iproute}}
  %define with_network 0%{!?_without_network:1}
@@@ -129,7 -128,6 +130,7 @@@
  %define with_nginx 0%{!?_without_nginx:1}
  %define with_notify_desktop 0%{!?_without_notify_desktop:1}
  %define with_notify_email 0%{!?_without_notify_email:1}
 +%define with_notify_nagios 0%{!?_without_notify_nagios:1}
  %define with_ntpd 0%{!?_without_ntpd:1}
  %define with_numa 0%{!?_without_numa:1}
  %define with_nut 0%{!?_without_nut:1}
@@@ -178,6 -176,7 +179,7 @@@
  %define with_write_riemann 0%{!?_without_write_riemann:1}
  %define with_write_sensu 0%{!?_without_write_sensu:1}
  %define with_write_tsdb 0%{!?_without_write_tsdb:1}
+ %define with_xmms 0%{!?_without_xmms:0%{!?_has_xmms:1}}
  %define with_zfs_arc 0%{!?_without_zfs_arc:1}
  %define with_zookeeper 0%{!?_without_zookeeper:1}
  
@@@ -214,10 -213,6 +216,8 @@@
  %define with_write_kafka 0%{!?_without_write_kafka:0}
  # plugin write_mongodb disabled, requires libmongoc
  %define with_write_mongodb 0%{!?_without_write_mongodb:0}
- # plugin xmms disabled, requires xmms
- %define with_xmms 0%{!?_without_xmms:0}
 +# plugin zone disabled, requires Solaris
 +%define with_zone 0%{!?_without_zone:0}
  
  Summary:      statistics collection and monitoring daemon
  Name:         collectd
@@@ -518,16 -513,6 +518,16 @@@ MySQL querying plugin. This plugin prov
  handlers and database traffic.
  %endif
  
 +%if %{with_mqtt}
 +%package mqtt
 +Summary:      mqtt plugin for collectd
 +Group:                System Environment/Daemons
 +Requires:     %{name}%{?_isa} = %{version}-%{release}
 +BuildRequires:        mosquitto-devel
 +%description mqtt
 +The MQTT plugin publishes and subscribes to MQTT topics.
 +%endif
 +
  %if %{with_netlink}
  %package netlink
  Summary:      netlink plugin for collectd
@@@ -789,6 -774,16 +789,16 @@@ BuildRequires:   protobuf-c-deve
  The riemann plugin submits values to Riemann, an event stream processor.
  %endif
  
+ %if %{with_xmms}
+ %package xmms
+ Summary:      XMMS plugin for collectd
+ Group:                System Environment/Daemons
+ Requires:     %{name}%{?_isa} = %{version}-%{release}
+ BuildRequires:        xmms-devel
+ %description xmms
+ The xmms plugin collects information from the XMMS music player.
+ %endif
+ 
  %package collection3
  Summary:      Web-based viewer for collectd
  Group:                System Environment/Daemons
@@@ -1179,12 -1174,6 +1189,12 @@@ Collectd utilitie
  %define _with_multimeter --disable-multimeter
  %endif
  
 +%if %{with_mqtt}
 +%define _with_mqtt --enable-mqtt
 +%else
 +%define _with_mqtt --disable-mqtt
 +%endif
 +
  %if %{with_mysql}
  %define _with_mysql --enable-mysql
  %else
@@@ -1233,12 -1222,6 +1243,12 @@@
  %define _with_notify_email --disable-notify_email
  %endif
  
 +%if %{with_notify_nagios}
 +%define _with_notify_nagios --enable-notify_nagios
 +%else
 +%define _with_notify_nagios --disable-notify_nagios
 +%endif
 +
  %if %{with_ntpd}
  %define _with_ntpd --enable-ntpd
  %else
@@@ -1597,12 -1580,6 +1607,12 @@@
  %define _with_zfs_arc --disable-zfs_arc
  %endif
  
 +%if %{with_zone}
 +%define _with_zone --enable-zone
 +%else
 +%define _with_zone --disable-zone
 +%endif
 +
  %if %{with_zookeeper}
  %define _with_zookeeper --enable-zookeeper
  %else
@@@ -1671,7 -1648,6 +1681,7 @@@
        %{?_with_mic} \
        %{?_with_modbus} \
        %{?_with_multimeter} \
 +      %{?_with_mqtt} \
        %{?_with_mysql} \
        %{?_with_netapp} \
        %{?_with_netlink} \
@@@ -1705,7 -1681,6 +1715,7 @@@
        %{?_with_write_redis} \
        %{?_with_xmms} \
        %{?_with_zfs_arc} \
 +      %{?_with_zone} \
        %{?_with_zookeeper} \
        %{?_with_irq} \
        %{?_with_load} \
@@@ -1717,7 -1692,6 +1727,7 @@@
        %{?_with_memory} \
        %{?_with_network} \
        %{?_with_nfs} \
 +      %{?_with_notify_nagios} \
        %{?_with_ntpd} \
        %{?_with_numa} \
        %{?_with_olsrd} \
@@@ -1984,9 -1958,6 +1994,9 @@@ f
  %if %{with_nfs}
  %{_libdir}/%{name}/nfs.so
  %endif
 +%if %{with_notify_nagios}
 +%{_libdir}/%{name}/notify_nagios.so
 +%endif
  %if %{with_ntpd}
  %{_libdir}/%{name}/ntpd.so
  %endif
@@@ -2234,11 -2205,6 +2244,11 @@@
  %{_libdir}/%{name}/modbus.so
  %endif
  
 +%if %{with_mqtt}
 +%files mqtt
 +%{_libdir}/%{name}/mqtt.so
 +%endif
 +
  %if %{with_mysql}
  %files mysql
  %{_libdir}/%{name}/mysql.so
@@@ -2366,6 -2332,11 +2376,11 @@@
  %{_libdir}/%{name}/write_riemann.so
  %endif
  
+ %if %{with_xmms}
+ %files xmms
+ %{_libdir}/%{name}/xmms.so
+ %endif
+ 
  %files collection3
  %{_localstatedir}/www/collection3
  %{_sysconfdir}/httpd/conf.d/collection3.conf
@@@ -2378,11 -2349,6 +2393,11 @@@
  %doc contrib/
  
  %changelog
 +#* TODO: next feature release changelog
 +#- New upstream version
 +#- New plugins enabled by default: mqtt, notify_nagios
 +#- New plugins disabled by default: zone
 +#
  * Wed May 27 2015 Marc Fournier <marc.fournier@camptocamp.com> 5.5.0-1
  - New upstream version
  - New plugins enabled by default: ceph, drbd, log_logstash, write_tsdb, smart,
@@@ -2395,11 -2361,12 +2410,12 @@@
  - Install collectdctl, collectd-tg and collectd-nagios in collectd-utils.rpm
  - Add build-dependency on libcap-devel
  
- * Mon Aug 19 2013 Marc Fournier <marc.fournier@camptocamp.com> 5.4.0-1
+ * Mon Aug 19 2013 Marc Fournier <marc.fournier@camptocamp.com> 5.4.2-1
  - New upstream version
  - Build netlink plugin by default
  - Enable cgroups, lvm and statsd plugins
  - Enable (but don't build by default) mic, aquaero and sigrok plugins
+ - Enable modbus, memcachec and xmms plugins on RHEL7
  
  * Tue Aug 06 2013 Marc Fournier <marc.fournier@camptocamp.com> 5.3.1-1
  - New upstream version