[collectd: 1/2] Update to 5.4.0
Ruben Kerkhof
ruben at fedoraproject.org
Sun Sep 15 15:31:24 UTC 2013
commit ab57fab79a42ca76397a3f5d3dbf773343b5d65c
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sun Sep 15 17:13:46 2013 +0200
Update to 5.4.0
http://mailman.verplant.org/pipermail/collectd/2013-August/005906.html
- Enable new cgroups, statsd and lvm plugins
.gitignore | 1 +
collectd-include-collectd.d.patch | 24 +++++++++++-------------
collectd.spec | 34 ++++++++++++++++++++++++++++------
sources | 2 +-
4 files changed, 41 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4ef59cf..cd6c022 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/collectd-5.2.2.tar.bz2
/collectd-5.3.0.tar.bz2
+/collectd-5.4.0.tar.bz2
diff --git a/collectd-include-collectd.d.patch b/collectd-include-collectd.d.patch
index 8b3a400..b3fbd4b 100644
--- a/collectd-include-collectd.d.patch
+++ b/collectd-include-collectd.d.patch
@@ -1,15 +1,7 @@
-diff -up collectd-5.3.0/src/collectd.conf.in.include collectd-5.3.0/src/collectd.conf.in
---- collectd-5.3.0/src/collectd.conf.in.include 2013-04-27 17:56:28.489000000 +0200
-+++ collectd-5.3.0/src/collectd.conf.in 2013-04-27 17:58:10.317000000 +0200
-@@ -52,6 +52,7 @@
- # LogLevel @DEFAULT_LOG_LEVEL@
- #</Plugin>
-
-+Include "/etc/collectd.d"
- ##############################################################################
- # LoadPlugin section #
- #----------------------------------------------------------------------------#
-@@ -137,7 +138,7 @@
+diff -up collectd-5.4.0/src/collectd.conf.in.patch collectd-5.4.0/src/collectd.conf.in
+--- collectd-5.4.0/src/collectd.conf.in.patch 2013-09-15 16:49:14.802000000 +0200
++++ collectd-5.4.0/src/collectd.conf.in 2013-09-15 16:52:13.913000000 +0200
+@@ -152,7 +152,7 @@
#@BUILD_PLUGIN_REDIS_TRUE at LoadPlugin redis
#@BUILD_PLUGIN_ROUTEROS_TRUE at LoadPlugin routeros
#@BUILD_PLUGIN_RRDCACHED_TRUE at LoadPlugin rrdcached
@@ -17,4 +9,10 @@ diff -up collectd-5.3.0/src/collectd.conf.in.include collectd-5.3.0/src/collectd
+#@LOAD_PLUGIN_RRDTOOL at LoadPlugin rrdtool
#@BUILD_PLUGIN_SENSORS_TRUE at LoadPlugin sensors
#@BUILD_PLUGIN_SERIAL_TRUE at LoadPlugin serial
- #@BUILD_PLUGIN_SNMP_TRUE at LoadPlugin snmp
+ #@BUILD_PLUGIN_SIGROK_TRUE at LoadPlugin sigrok
+@@ -1258,3 +1258,5 @@
+ # </Type>
+ # </Host>
+ #</Plugin>
++Include "/etc/collectd.d"
++
diff --git a/collectd.spec b/collectd.spec
index b8fbc4e..c0dd89b 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -3,8 +3,8 @@
Summary: Statistics collection daemon for filling RRD files
Name: collectd
-Version: 5.3.0
-Release: 2%{?dist}
+Version: 5.4.0
+Release: 1%{?dist}
License: GPLv2
Group: System Environment/Daemons
URL: http://collectd.org/
@@ -32,7 +32,6 @@ Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
-
%description
collectd is a small daemon written in C for performance. It reads various
system statistics and updates RRD files, creating them if necessary.
@@ -190,6 +189,15 @@ BuildRequires: jpackage-utils
These are the Java bindings for collectd.
+%package lvm
+Summary: LVM plugin for collectd
+Group: System Environment/Daemons
+Requires: collectd = %{version}-%{release}
+BuildRequires: lvm2-devel
+%description lvm
+This plugin collects information from lvm
+
+
%if 0%{?fedora} <= 18
%package memcachec
Summary: Memcachec plugin for collectd
@@ -226,7 +234,7 @@ called handlers and database traffic.
Summary: Netlink plugin for collectd
Group: System Environment/Daemons
Requires: collectd = %{version}-%{release}
-BuildRequires: iproute-static
+BuildRequires: iproute-static, libmnl-devel
%description netlink
This plugin uses a netlink socket to query the Linux kernel
about statistics of various interface and routing aspects.
@@ -400,9 +408,9 @@ It graphs the bit-rate and sampling rate as you play songs.
%prep
-# update for aarch64
%setup -q
%patch0 -p1
+# update for aarch64
autoreconf --force
sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in
@@ -413,11 +421,13 @@ sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in
--enable-all-plugins \
--disable-static \
--disable-apple_sensors \
+ --disable-aquaero \
--disable-lpar \
- --disable-netapp \
+ --disable-mic \
%if 0%{?fedora} >= 19
--disable-memcachec \
%endif
+ --disable-netapp \
%ifarch s390 s390x
--disable-nut \
%endif
@@ -429,6 +439,7 @@ sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in
%ifarch ppc ppc64 sparc sparc64
--disable-sensors \
%endif
+ --disable-sigrok \
--disable-tape \
--disable-tokyotyrant \
--disable-write_mongodb \
@@ -545,6 +556,7 @@ rm -f %{buildroot}/%{_libdir}/{collectd/,}*.la
%{_libdir}/collectd/aggregation.so
%{_libdir}/collectd/apcups.so
%{_libdir}/collectd/battery.so
+%{_libdir}/collectd/cgroups.so
%{_libdir}/collectd/conntrack.so
%{_libdir}/collectd/contextswitch.so
%{_libdir}/collectd/cpu.so
@@ -584,6 +596,7 @@ rm -f %{buildroot}/%{_libdir}/{collectd/,}*.la
%{_libdir}/collectd/protocols.so
%{_libdir}/collectd/python.so
%{_libdir}/collectd/serial.so
+%{_libdir}/collectd/statsd.so
%{_libdir}/collectd/swap.so
%{_libdir}/collectd/syslog.so
%{_libdir}/collectd/table.so
@@ -705,6 +718,10 @@ rm -f %{buildroot}/%{_libdir}/{collectd/,}*.la
%{_datadir}/collectd/java/collectd-api.jar
%doc %{_mandir}/man5/collectd-java.5*
+%files lvm
+%{_libdir}/collectd/lvm.so
+
+
%if 0%{?fedora} <= 18
%files memcachec
%{_libdir}/collectd/memcachec.so
@@ -817,6 +834,11 @@ rm -f %{buildroot}/%{_libdir}/{collectd/,}*.la
%changelog
+* Sun Sep 15 2013 Ruben Kerkhof <ruben at rubenkerkhof.com> 5.4.0-1
+- Update to 5.4.0
+ http://mailman.verplant.org/pipermail/collectd/2013-August/005906.html
+- Enable new cgroups, statsd and lvm plugins
+
* Mon May 27 2013 Ruben Kerkhof <ruben at rubenkerkhof.com> 5.3.0-2
- BuildRequire static version of iproute (#967214)
diff --git a/sources b/sources
index 86672d1..b2a533b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1f0eb7b27ada94b22ed881daf788958b collectd-5.3.0.tar.bz2
+bbcc8d0dd466d1ec7d8311646d5bddd8 collectd-5.4.0.tar.bz2
More information about the scm-commits
mailing list