The package rpms/collectd.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/collectd.git/commit/?id=6af547882...
https://src.fedoraproject.org/cgit/rpms/collectd.git/commit/?id=86cdbe796....
Change:
-%ifnarch ppc64le
+%ifnarch ppc64le
Thanks.
Full change:
============
commit 492547fa166960547b27e12970cc55501095ea6d
Merge: 0a930dd e27b771
Author: Ruben Kerkhof <ruben(a)rubenkerkhof.com>
Date: Mon Nov 27 13:51:14 2017 +0100
Merge branch 'f27' into f26
commit e27b7715644feb14a65d1f0515cbc1074bf8b6bd
Author: Ruben Kerkhof <ruben(a)rubenkerkhof.com>
Date: Mon Nov 27 13:17:55 2017 +0100
Amend Changelog with CVE fix
diff --git a/collectd.spec b/collectd.spec
index 6736fa2..644d8de 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -1260,6 +1260,7 @@ make check
* Sat Nov 18 2017 Ruben Kerkhof <ruben(a)rubenkerkhof.com> - 5.8.0-1
- Upstream released new version
+- Fixes CVE-2017-16820 (double free in snmp plugin)
* Mon Oct 02 2017 Ruben Kerkhof <ruben(a)rubenkerkhof.com> - 5.7.2-15
- Use mariadb-connector-c-devel instead of mysql-devel (31493616)
commit bfca2ed345ec892ea762809e147a91702a830695
Author: Ruben Kerkhof <ruben(a)rubenkerkhof.com>
Date: Tue Nov 21 13:09:16 2017 +0100
Enable write_mongodb plugin (#1388826)
Remove dependency on libltdl
diff --git a/collectd.spec b/collectd.spec
index 184c717..6736fa2 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -3,7 +3,7 @@
Summary: Statistics collection daemon for filling RRD files
Name: collectd
Version: 5.8.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2
Group: System Environment/Daemons
URL:
https://collectd.org/
@@ -22,7 +22,6 @@ Source98: onewire.conf
Patch0: %{name}-include-collectd.d.patch
-BuildRequires: libtool-ltdl-devel
BuildRequires: perl-devel
BuildRequires: perl-generators
BuildRequires: perl(ExtUtils::MakeMaker)
@@ -602,6 +601,15 @@ BuildRequires: librdkafka-devel
This sends values to Kafka, a distributed messaging system.
+%package write_mongodb
+Summary: MongoDB output plugin for collectd
+Group: System Environment/Daemons
+Requires: %{name}%{?_isa} = %{version}-%{release}
+BuildRequires: mongo-c-driver-devel
+%description write_mongodb
+This plugin sends values to MongoDB.
+
+
%package write_prometheus
Summary: Prometheus output plugin for collectd
Group: System Environment/Daemons
@@ -713,7 +721,6 @@ touch src/pinba.proto
--disable-tape \
--disable-tokyotyrant \
--disable-turbostat \
- --disable-write_mongodb \
%ifnarch %ix86 x86_64
--disable-xencpu \
%endif
@@ -1207,6 +1214,10 @@ make check
%{_libdir}/%{name}/write_kafka.so
+%files write_mongodb
+%{_libdir}/%{name}/write_mongodb.so
+
+
%files write_prometheus
%{_libdir}/collectd/write_prometheus.so
@@ -1243,6 +1254,10 @@ make check
%changelog
+* Tue Nov 21 2017 Ruben Kerkhof <ruben(a)rubenkerkhof.com> - 5.8.0-2
+- Enable write_mongodb plugin (#1388826)
+- Remove dependency on libltdl
+
* Sat Nov 18 2017 Ruben Kerkhof <ruben(a)rubenkerkhof.com> - 5.8.0-1
- Upstream released new version
commit 71cb6aab93c0276a7f5a6f1e58ba8751f62d75a9
Author: Ruben Kerkhof <ruben(a)rubenkerkhof.com>
Date: Sat Nov 18 21:03:44 2017 +0100
Upstream released new version
diff --git a/.gitignore b/.gitignore
index b286190..ad07c1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
/collectd-5.7.0.tar.bz2
/collectd-5.7.1.tar.bz2
/collectd-5.7.2.tar.bz2
+/collectd-5.8.0.tar.bz2
diff --git a/collectd.spec b/collectd.spec
index 46ae09e..184c717 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -2,8 +2,8 @@
Summary: Statistics collection daemon for filling RRD files
Name: collectd
-Version: 5.7.2
-Release: 15%{?dist}
+Version: 5.8.0
+Release: 1%{?dist}
License: GPLv2
Group: System Environment/Daemons
URL:
https://collectd.org/
@@ -290,6 +290,15 @@ BuildRequires: lvm2-devel
This plugin collects information from lvm
+%package mcelog
+Summary: Mcelog plugin for collectd
+Group: System Environment/Daemons
+Requires: %{name}%{?_isa} = %{version}-%{release}
+%description mcelog
+This plugin monitors machine check exceptions reported by mcelog and generates
+appropriate notifications when machine check exceptions are detected.
+
+
%package memcachec
Summary: Memcachec plugin for collectd
Group: System Environment/Daemons
@@ -397,6 +406,26 @@ This plugin for collectd reads monitoring information
from OpenLDAP's cn=Monitor subtree.
+%package ovs_events
+Summary: Open vSwitch events plugin for collectd
+Group: System Environment/Daemons
+Requires: %{name}%{?_isa} = %{version}-%{release}
+BuildRequires: yajl-devel
+%description ovs_events
+This plugin monitors the link status of Open vSwitch (OVS) connected
+interfaces, dispatches the values to collectd and sends notifications
+whenever a link state change occurs in the OVS database.
+
+
+%package ovs_stats
+Summary: Open vSwitch stats plugin for collectd
+Group: System Environment/Daemons
+Requires: %{name}%{?_isa} = %{version}-%{release}
+BuildRequires: yajl-devel
+%description ovs_stats
+This plugin collects statictics of OVS connected bridges and interfaces.
+
+
%package -n perl-Collectd
Summary: Perl bindings for collectd
Group: System Environment/Daemons
@@ -505,6 +534,24 @@ BuildRequires: net-snmp-devel
This plugin for collectd provides querying of net-snmp.
+%package snmp_agent
+Summary: SNMP AgentX plugin for collectd
+Group: System Environment/Daemons
+Requires: %{name}%{?_isa} = %{version}-%{release}
+BuildRequires: net-snmp-devel
+%description snmp_agent
+This plugin is an AgentX subagent that receives and handles queries
+from a SNMP master agent and returns the data collected by read plugins.
+
+
+%package synproxy
+Summary: Synproxy plugin for collectd
+Group: System Environment/Daemons
+Requires: %{name}%{?_isa} = %{version}-%{release}
+%description synproxy
+This plugin provides statistics for Linux SYNPROXY available since 3.12
+
+
%package varnish
Summary: Varnish plugin for collectd
Group: System Environment/Daemons
@@ -645,8 +692,10 @@ touch src/pinba.proto
--disable-apple_sensors \
--disable-aquaero \
--disable-barometer \
+ --disable-dpdkevents \
--disable-dpdkstat \
--disable-grpc \
+ --disable-intel_pmu \
--disable-intel_rdt \
--disable-lpar \
--disable-mic \
@@ -872,16 +921,19 @@ make check
%files -n libcollectdclient-devel
%dir %{_includedir}/collectd/
%{_includedir}/collectd/client.h
+%{_includedir}/collectd/lcc_features.h
%{_includedir}/collectd/network.h
%{_includedir}/collectd/network_buffer.h
-%{_includedir}/collectd/lcc_features.h
+%{_includedir}/collectd/network_parse.h
+%{_includedir}/collectd/server.h
+%{_includedir}/collectd/types.h
%{_libdir}/pkgconfig/libcollectdclient.pc
%{_libdir}/libcollectdclient.so
%files -n libcollectdclient
%{_libdir}/libcollectdclient.so.1
-%{_libdir}/libcollectdclient.so.1.0.0
+%{_libdir}/libcollectdclient.so.1.1.0
%files -n collectd-utils
@@ -1000,6 +1052,10 @@ make check
%{_libdir}/collectd/lvm.so
+%files mcelog
+%{_libdir}/collectd/mcelog.so
+
+
%files memcachec
%{_libdir}/collectd/memcachec.so
@@ -1050,6 +1106,14 @@ make check
%{_libdir}/collectd/openldap.so
+%files ovs_events
+%{_libdir}/collectd/ovs_events.so
+
+
+%files ovs_stats
+%{_libdir}/collectd/ovs_stats.so
+
+
%files -n perl-Collectd
%doc perl-examples/*
%{_libdir}/collectd/perl.so
@@ -1110,6 +1174,14 @@ make check
%doc %{_mandir}/man5/collectd-snmp.5*
+%files snmp_agent
+%{_libdir}/collectd/snmp_agent.so
+
+
+%files synproxy
+%{_libdir}/collectd/synproxy.so
+
+
%files varnish
%{_libdir}/collectd/varnish.so
@@ -1171,6 +1243,9 @@ make check
%changelog
+* Sat Nov 18 2017 Ruben Kerkhof <ruben(a)rubenkerkhof.com> - 5.8.0-1
+- Upstream released new version
+
* Mon Oct 02 2017 Ruben Kerkhof <ruben(a)rubenkerkhof.com> - 5.7.2-15
- Use mariadb-connector-c-devel instead of mysql-devel (31493616)
diff --git a/sources b/sources
index 12b4618..39caee2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (collectd-5.7.2.tar.bz2) =
8844b67159f8da2203b5ac57ef19fce0a01050a016174d196b48b5fb24925ad2935af9bdd9af06097ff663499abc496cdcc2d9e9a10f403f8d707c465c1a88f3
+SHA512 (collectd-5.8.0.tar.bz2) =
1b3d0cc44e2ca54e13eebf292074f1efa8b33d6800d04405e0eaaa2dd1cb2416c6eae580729fb5aead23a5039f41ffe8a9989a907a8c18be8f867f1099fc0008
commit b4eff87089cbf650cf8ee07ed9312d01afb3c706
Author: Ruben Kerkhof <ruben(a)rubenkerkhof.com>
Date: Mon Oct 2 17:14:18 2017 +0200
Use mariadb-connector-c-devel instead of mysql-devel (31493616)
diff --git a/collectd.spec b/collectd.spec
index 4616bbd..46ae09e 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -3,7 +3,7 @@
Summary: Statistics collection daemon for filling RRD files
Name: collectd
Version: 5.7.2
-Release: 14%{?dist}
+Release: 15%{?dist}
License: GPLv2
Group: System Environment/Daemons
URL:
https://collectd.org/
@@ -323,7 +323,7 @@ The MQTT plugin publishes and subscribes to MQTT topics.
Summary: MySQL plugin for collectd
Group: System Environment/Daemons
Requires: %{name}%{?_isa} = %{version}-%{release}
-BuildRequires: mysql-devel
+BuildRequires: mariadb-connector-c-devel
%description mysql
MySQL querying plugin. This plugin provides data of issued commands,
called handlers and database traffic.
@@ -1171,6 +1171,9 @@ make check
%changelog
+* Mon Oct 02 2017 Ruben Kerkhof <ruben(a)rubenkerkhof.com> - 5.7.2-15
+- Use mariadb-connector-c-devel instead of mysql-devel (31493616)
+
* Mon Oct 02 2017 Ruben Kerkhof <ruben(a)rubenkerkhof.com> - 5.7.2-14
- Enable ping plugin again (#1478736)
commit 3440831eceee85e6488e08e13a4b4317099d21ef
Author: Ruben Kerkhof <ruben(a)rubenkerkhof.com>
Date: Mon Oct 2 11:05:07 2017 +0200
Enable ping plugin again (#1478736)
diff --git a/collectd.spec b/collectd.spec
index c2b3903..4616bbd 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -3,7 +3,7 @@
Summary: Statistics collection daemon for filling RRD files
Name: collectd
Version: 5.7.2
-Release: 13%{?dist}
+Release: 14%{?dist}
License: GPLv2
Group: System Environment/Daemons
URL:
https://collectd.org/
@@ -416,6 +416,15 @@ This plugin receives profiling information from Pinba,
an extension for the PHP interpreter.
+%package ping
+Summary: Ping plugin for collectd
+Group: System Environment/Daemons
+Requires: %{name}%{?_isa} = %{version}-%{release}
+BuildRequires: liboping-devel
+%description ping
+This plugin for collectd provides network latency statistics.
+
+
%package postgresql
Summary: PostgreSQL plugin for collectd
Group: System Environment/Daemons
@@ -646,7 +655,6 @@ touch src/pinba.proto
--disable-nut \
%endif
--disable-oracle \
- --disable-ping \
--disable-pf \
--disable-routeros \
%ifarch ppc sparc sparc64
@@ -711,9 +719,9 @@ cp %{SOURCE98} %{buildroot}%{_sysconfdir}/collectd.d/onewire.conf
# configs for subpackaged plugins
%ifnarch s390 s390x
-for p in dns ipmi libvirt nut perl postgresql
+for p in dns ipmi libvirt nut perl ping postgresql
%else
-for p in dns ipmi libvirt perl postgresql
+for p in dns ipmi libvirt perl ping postgresql
%endif
do
cat > %{buildroot}%{_sysconfdir}/collectd.d/$p.conf <<EOF
@@ -763,6 +771,7 @@ make check
%endif
%exclude %{_sysconfdir}/collectd.d/onewire.conf
%exclude %{_sysconfdir}/collectd.d/perl.conf
+%exclude %{_sysconfdir}/collectd.d/ping.conf
%exclude %{_sysconfdir}/collectd.d/postgresql.conf
%exclude %{_datadir}/collectd/postgresql_default.conf
%exclude %{_sysconfdir}/collectd.d/rrdtool.conf
@@ -1055,6 +1064,11 @@ make check
%{_libdir}/collectd/pinba.so
+%files ping
+%{_libdir}/collectd/ping.so
+%config(noreplace) %{_sysconfdir}/collectd.d/ping.conf
+
+
%files postgresql
%{_libdir}/collectd/postgresql.so
%config(noreplace) %{_sysconfdir}/collectd.d/postgresql.conf
@@ -1157,6 +1171,9 @@ make check
%changelog
+* Mon Oct 02 2017 Ruben Kerkhof <ruben(a)rubenkerkhof.com> - 5.7.2-14
+- Enable ping plugin again (#1478736)
+
* Wed Sep 27 2017 Kevin Fenzi <kevin(a)scrye.com> - 5.7.2-13
- Rebuild for new libgps
commit d86de027ecb1b0489cb24809ddede0e8847f6ef8
Author: Kevin Fenzi <kevin(a)scrye.com>
Date: Wed Sep 27 10:29:42 2017 -0700
Rebuild for new libgps
diff --git a/collectd.spec b/collectd.spec
index 7fe593f..c2b3903 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -3,7 +3,7 @@
Summary: Statistics collection daemon for filling RRD files
Name: collectd
Version: 5.7.2
-Release: 12%{?dist}
+Release: 13%{?dist}
License: GPLv2
Group: System Environment/Daemons
URL:
https://collectd.org/
@@ -1157,6 +1157,9 @@ make check
%changelog
+* Wed Sep 27 2017 Kevin Fenzi <kevin(a)scrye.com> - 5.7.2-13
+- Rebuild for new libgps
+
* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.7.2-12
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
commit 5f145c5bacaab6b7d2921abfdbc2b4b2e428c1ae
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Aug 2 19:02:03 2017 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
diff --git a/collectd.spec b/collectd.spec
index 563b3ad..7fe593f 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -3,7 +3,7 @@
Summary: Statistics collection daemon for filling RRD files
Name: collectd
Version: 5.7.2
-Release: 11%{?dist}
+Release: 12%{?dist}
License: GPLv2
Group: System Environment/Daemons
URL:
https://collectd.org/
@@ -1157,6 +1157,9 @@ make check
%changelog
+* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.7.2-12
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
* Sun Jul 30 2017 Florian Weimer <fweimer(a)redhat.com> - 5.7.2-11
- Rebuild with binutils fix for ppc64le (#1475636)
commit 6c928c3d1fae326e0cc0b3182217e1edc6fefea8
Author: Florian Weimer <fweimer(a)redhat.com>
Date: Sun Jul 30 19:23:04 2017 +0200
Rebuild with binutils fix for ppc64le (#1475636)
diff --git a/collectd.spec b/collectd.spec
index 2fdf223..563b3ad 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -3,7 +3,7 @@
Summary: Statistics collection daemon for filling RRD files
Name: collectd
Version: 5.7.2
-Release: 10%{?dist}
+Release: 11%{?dist}
License: GPLv2
Group: System Environment/Daemons
URL:
https://collectd.org/
@@ -1157,6 +1157,9 @@ make check
%changelog
+* Sun Jul 30 2017 Florian Weimer <fweimer(a)redhat.com> - 5.7.2-11
+- Rebuild with binutils fix for ppc64le (#1475636)
+
* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.7.2-10
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
commit 9291e81c13f59eb60b5dd661bc95d0456e8c336d
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jul 26 05:13:36 2017 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
diff --git a/collectd.spec b/collectd.spec
index aedad91..2fdf223 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -3,7 +3,7 @@
Summary: Statistics collection daemon for filling RRD files
Name: collectd
Version: 5.7.2
-Release: 9%{?dist}
+Release: 10%{?dist}
License: GPLv2
Group: System Environment/Daemons
URL:
https://collectd.org/
@@ -1157,6 +1157,9 @@ make check
%changelog
+* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.7.2-10
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
* Mon Jul 24 2017 Kevin Fenzi <kevin(a)scrye.com> - 5.7.2-9
- Rebuild for new libxenctrl
commit 154dcb48fe10f5a20b84a834af6bdd5f882ea121
Author: Kevin Fenzi <kevin(a)scrye.com>
Date: Mon Jul 24 11:24:19 2017 -0700
Rebuild for new libxenctrl
diff --git a/collectd.spec b/collectd.spec
index 8322302..aedad91 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -3,7 +3,7 @@
Summary: Statistics collection daemon for filling RRD files
Name: collectd
Version: 5.7.2
-Release: 8%{?dist}
+Release: 9%{?dist}
License: GPLv2
Group: System Environment/Daemons
URL:
https://collectd.org/
@@ -1157,6 +1157,9 @@ make check
%changelog
+* Mon Jul 24 2017 Kevin Fenzi <kevin(a)scrye.com> - 5.7.2-9
+- Rebuild for new libxenctrl
+
* Fri Jul 14 2017 Ruben Kerkhof <ruben(a)rubenkerkhof.com> - 5.7.2-8
- Own /usr/share/collectd (#1471070)
- Own /usr/include/collectd
commit bbca2b8360dd242103cfa1aaba0052b804f64ce8
Author: Ruben Kerkhof <ruben(a)rubenkerkhof.com>
Date: Fri Jul 14 13:50:08 2017 +0200
Own /usr/share/collectd (#1471070)
Own /usr/include/collectd
diff --git a/collectd.spec b/collectd.spec
index 95aec77..8322302 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -3,7 +3,7 @@
Summary: Statistics collection daemon for filling RRD files
Name: collectd
Version: 5.7.2
-Release: 7%{?dist}
+Release: 8%{?dist}
License: GPLv2
Group: System Environment/Daemons
URL:
https://collectd.org/
@@ -848,6 +848,7 @@ make check
%{_libdir}/collectd/write_log.so
%{_libdir}/collectd/zfs_arc.so
+%dir %{_datadir}/collectd/
%{_datadir}/collectd/types.db
%doc %{_mandir}/man1/collectd.1*
@@ -860,6 +861,7 @@ make check
%files -n libcollectdclient-devel
+%dir %{_includedir}/collectd/
%{_includedir}/collectd/client.h
%{_includedir}/collectd/network.h
%{_includedir}/collectd/network_buffer.h
@@ -1155,6 +1157,10 @@ make check
%changelog
+* Fri Jul 14 2017 Ruben Kerkhof <ruben(a)rubenkerkhof.com> - 5.7.2-8
+- Own /usr/share/collectd (#1471070)
+- Own /usr/include/collectd
+
* Thu Jul 13 2017 Ruben Kerkhof <ruben(a)rubenkerkhof.com> - 5.7.2-7
- Re-enable java plugin on ppc64le
commit 6af54788271a284127287416a47236a913707307
Author: Ruben Kerkhof <ruben(a)rubenkerkhof.com>
Date: Thu Jul 13 14:25:49 2017 +0200
Re-enable java plugin on ppc64le
diff --git a/collectd.spec b/collectd.spec
index d9602e6..95aec77 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -3,7 +3,7 @@
Summary: Statistics collection daemon for filling RRD files
Name: collectd
Version: 5.7.2
-Release: 6%{?dist}
+Release: 7%{?dist}
License: GPLv2
Group: System Environment/Daemons
URL:
https://collectd.org/
@@ -176,14 +176,12 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
This plugin collects data provided by spamassassin.
-%ifnarch ppc64le
%package generic-jmx
Summary: Generic JMX plugin for collectd
Group: System Environment/Daemons
Requires: %{name}%{?_isa} = %{version}-%{release}
%description generic-jmx
This plugin collects data provided by JMX.
-%endif
%package gmond
@@ -239,7 +237,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
This plugin collects data from IPVS.
-%ifnarch ppc64le
%package java
Summary: Java bindings for collectd
Group: System Environment/Daemons
@@ -248,7 +245,6 @@ BuildRequires: java-devel
BuildRequires: jpackage-utils
%description java
These are the Java bindings for collectd.
-%endif
%package -n libcollectdclient
@@ -665,11 +661,7 @@ touch src/pinba.proto
--disable-xencpu \
%endif
--disable-zone \
-%ifnarch ppc64le
--with-java=%{java_home}/ \
-%else
- --disable-java \
-%endif
--with-python=%{_bindir}/python3 \
--with-perl-bindings=INSTALLDIRS=vendor \
--disable-werror \
@@ -730,11 +722,7 @@ EOF
done
# *.la files shouldn't be distributed.
-rm -f %{buildroot}%{_libdir}/{collectd/,}*.la
-
-%ifarch ppc64le
-rm -f %{buildroot}%{_mandir}/man5/collectd-java.5*
-%endif
+rm -f %{buildroot}/%{_libdir}/{collectd/,}*.la
%check
@@ -953,10 +941,8 @@ make check
%doc %{_mandir}/man5/collectd-email.5*
-%ifnarch ppc64le
%files generic-jmx
%{_datadir}/collectd/java/generic-jmx.jar
-%endif
%files gmond
@@ -984,14 +970,11 @@ make check
%{_libdir}/collectd/ipvs.so
-%ifnarch ppc64le
%files java
%{_libdir}/collectd/java.so
%dir %{_datadir}/collectd/java/
%{_datadir}/collectd/java/collectd-api.jar
%doc %{_mandir}/man5/collectd-java.5*
-%endif
-
%files log_logstash
%{_libdir}/collectd/log_logstash.so
@@ -1172,6 +1155,9 @@ make check
%changelog
+* Thu Jul 13 2017 Ruben Kerkhof <ruben(a)rubenkerkhof.com> - 5.7.2-7
+- Re-enable java plugin on ppc64le
+
* Fri Jul 07 2017 Ruben Kerkhof <ruben(a)rubenkerkhof.com> - 5.7.2-6
- Disable java plugin on ppc64le for now, javac segfaults.
commit 86cdbe796513c6e216d18edfc2e2286f2d953e10
Author: Ruben Kerkhof <ruben(a)rubenkerkhof.com>
Date: Fri Jul 7 18:10:42 2017 +0200
Disable java plugin on ppc64le for now, javac segfaults.
diff --git a/collectd.spec b/collectd.spec
index c9a3d8b..d9602e6 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -3,7 +3,7 @@
Summary: Statistics collection daemon for filling RRD files
Name: collectd
Version: 5.7.2
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPLv2
Group: System Environment/Daemons
URL:
https://collectd.org/
@@ -176,12 +176,14 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
This plugin collects data provided by spamassassin.
+%ifnarch ppc64le
%package generic-jmx
Summary: Generic JMX plugin for collectd
Group: System Environment/Daemons
Requires: %{name}%{?_isa} = %{version}-%{release}
%description generic-jmx
This plugin collects data provided by JMX.
+%endif
%package gmond
@@ -237,6 +239,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
This plugin collects data from IPVS.
+%ifnarch ppc64le
%package java
Summary: Java bindings for collectd
Group: System Environment/Daemons
@@ -245,6 +248,7 @@ BuildRequires: java-devel
BuildRequires: jpackage-utils
%description java
These are the Java bindings for collectd.
+%endif
%package -n libcollectdclient
@@ -661,7 +665,11 @@ touch src/pinba.proto
--disable-xencpu \
%endif
--disable-zone \
+%ifnarch ppc64le
--with-java=%{java_home}/ \
+%else
+ --disable-java \
+%endif
--with-python=%{_bindir}/python3 \
--with-perl-bindings=INSTALLDIRS=vendor \
--disable-werror \
@@ -722,7 +730,11 @@ EOF
done
# *.la files shouldn't be distributed.
-rm -f %{buildroot}/%{_libdir}/{collectd/,}*.la
+rm -f %{buildroot}%{_libdir}/{collectd/,}*.la
+
+%ifarch ppc64le
+rm -f %{buildroot}%{_mandir}/man5/collectd-java.5*
+%endif
%check
@@ -941,8 +953,10 @@ make check
%doc %{_mandir}/man5/collectd-email.5*
+%ifnarch ppc64le
%files generic-jmx
%{_datadir}/collectd/java/generic-jmx.jar
+%endif
%files gmond
@@ -970,11 +984,14 @@ make check
%{_libdir}/collectd/ipvs.so
+%ifnarch ppc64le
%files java
%{_libdir}/collectd/java.so
%dir %{_datadir}/collectd/java/
%{_datadir}/collectd/java/collectd-api.jar
%doc %{_mandir}/man5/collectd-java.5*
+%endif
+
%files log_logstash
%{_libdir}/collectd/log_logstash.so
@@ -1155,6 +1172,9 @@ make check
%changelog
+* Fri Jul 07 2017 Ruben Kerkhof <ruben(a)rubenkerkhof.com> - 5.7.2-6
+- Disable java plugin on ppc64le for now, javac segfaults.
+
* Mon Jul 03 2017 Ruben Kerkhof <ruben(a)rubenkerkhof.com> - 5.7.2-5
- Rebuild for owfs
commit d75c955ab0db1a21289585b29c6282b274270117
Author: Ruben Kerkhof <ruben(a)rubenkerkhof.com>
Date: Mon Jul 3 17:00:01 2017 +0200
Rebuild for owfs
diff --git a/collectd.spec b/collectd.spec
index d7f468c..c9a3d8b 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -3,7 +3,7 @@
Summary: Statistics collection daemon for filling RRD files
Name: collectd
Version: 5.7.2
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv2
Group: System Environment/Daemons
URL:
https://collectd.org/
@@ -1155,6 +1155,9 @@ make check
%changelog
+* Mon Jul 03 2017 Ruben Kerkhof <ruben(a)rubenkerkhof.com> - 5.7.2-5
+- Rebuild for owfs
+
* Thu Jun 15 2017 Ruben Kerkhof <ruben(a)rubenkerkhof.com> - 5.7.2-4
- Disable ping plugin for now until liboping is fixed (#1427893)