- Update to 5.9.0:
+- Drop patches (fixed by upstream):
+ * 0001-gps-plugin-fix-build-with-newer-gpsd.patch
+ * Removed-checks-for-upper-limit-of-SENSORS_API_VERSION.patch
+- Add new subpackages:
+ * plugin-pcie
+ * plugin-write_stackdriver
+ * plugin-write_syslog
+
+-------------------------------------------------------------------
Sun Apr 14 12:37:27 UTC 2019 - Christophe Giboudeaux

- Update to 5.8.1:
Index: collectd.spec
===================================================================
--- collectd.spec (revision 154)
+++ collectd.spec (revision 9)
@@ -42,7 +42,7 @@
%define sensors_plugin %{nil}
%endif
Name: collectd
-Version: 5.8.1
+Version: 5.9.0
Release: 0
Summary: Statistics Collection Daemon for filling RRD Files
License: GPL-2.0-only AND MIT
@@ -62,8 +62,6 @@
Patch6: collectd-fix_spamassassin_doc.patch
Patch7: collectd-fix_collectd_config_path_in_snmp_probe.patch
Patch8: 9e36cd85a2bb_sigrok_Update_to_support_libsigrok_0_4.patch
-Patch9: 0001-gps-plugin-fix-build-with-newer-gpsd.patch
-Patch10: Removed-checks-for-upper-limit-of-SENSORS_API_VERSION.patch
# PATCH-FIX-OPENSUSE avoid-pg-config.patch avoid pg_config if possible
Patch11: avoid-pg-config.patch
# for /etc/apache2/... ownership (rpmlint):
@@ -110,7 +108,6 @@
BuildRequires: pkgconfig(libatasmart)
BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(libevent)
-#BuildRequires: pkgconfig(libgpsd)
BuildRequires: pkgconfig(libgps)
BuildRequires: pkgconfig(libiptc)
BuildRequires: pkgconfig(libmemcached)
@@ -251,6 +248,14 @@
%description plugin-lvm
This plugin collects information from lvm.

+%package plugin-pcie
+Summary: PCIe Monitoring Plugin for %{name}
+Group: System/Monitoring
+Requires: %{name} = %{version}-%{release}
+
+%description plugin-pcie
+Optional %{name} plugin to monitor PCIe errors.
+
%package plugin-postgresql
Summary: PostgreSQL Monitoring Plugin for %{name}
Group: System/Monitoring
@@ -371,6 +376,22 @@
%description plugin-synproxy
Optional %{name} plugin to monitor Synproxy stats.

+%package plugin-write_stackdriver
+Summary: Write Stackdriver plugin for %{name}
+Group: System/Monitoring
+Requires: %{name} = %{version}-%{release}
+
+%description plugin-write_stackdriver
+Optional %{name} plugin to to write to Google Stackdriver.
+
+%package plugin-write_syslog
+Summary: Write Syslog plugin for %{name}
+Group: System/Monitoring
+Requires: %{name} = %{version}-%{release}
+
+%description plugin-write_syslog
+Optional %{name} plugin to write values lists as syslog messages.
+
%package plugins-all
Summary: All Monitoring Plugins for %{name}
Group: System/Monitoring
@@ -387,6 +408,7 @@
Requires: %{name}-plugin-notify-desktop = %{version}-%{release}
Requires: %{name}-plugin-openldap = %{version}-%{release}
Requires: %{name}-plugin-ovs = %{version}-%{release}
+Requires: %{name}-plugin-pcie = %{version}-%{release}
Requires: %{name}-plugin-pinba = %{version}-%{release}
Requires: %{name}-plugin-postgresql = %{version}-%{release}
Requires: %{name}-plugin-python3 = %{version}-%{release}
@@ -395,6 +417,8 @@
Requires: %{name}-plugin-snmp = %{version}-%{release}
Requires: %{name}-plugin-synproxy = %{version}-%{release}
Requires: %{name}-plugin-virt = %{version}-%{release}
+Requires: %{name}-plugin-write_stackdriver = %{version}-%{release}
+Requires: %{name}-plugin-write_syslog = %{version}-%{release}
Requires: %{name}-web = %{version}-%{release}
Requires: %{name}-web-js = %{version}-%{release}
%if 0%{?suse_version} >= 1330
@@ -447,8 +471,6 @@
%if 0%{?suse_version} > 1320
%patch8 -p1
%endif
-%patch9 -p1
-%patch10 -p1
%patch11 -p1

sed -i 's|@@VERSION@@|%{version}|g' configure.ac
@@ -678,6 +700,10 @@
%{_libdir}/collectd/mysql.so
%{_libdir}/collectd/mysql.la

+%files plugin-pcie
+%{_libdir}/collectd/pcie_errors.so
+%{_libdir}/collectd/pcie_errors.la
+
%files plugin-postgresql
%{_libdir}/collectd/postgresql.so
%{_libdir}/collectd/postgresql.la
@@ -740,6 +766,14 @@
%{_libdir}/collectd/synproxy.so
%{_libdir}/collectd/synproxy.la

+%files plugin-write_stackdriver
+%{_libdir}/collectd/write_stackdriver.so
+%{_libdir}/collectd/write_stackdriver.la
+
+%files plugin-write_syslog
+%{_libdir}/collectd/write_syslog.so
+%{_libdir}/collectd/write_syslog.la
+
%if 0%{?suse_version} >= 1330
%files plugin-nut
%{_libdir}/collectd/nut.so
Index: collectd-5.9.0.tar.bz2
===================================================================
Binary file collectd-5.9.0.tar.bz2 (revision 9) added
Index: 0001-gps-plugin-fix-build-with-newer-gpsd.patch
===================================================================
--- 0001-gps-plugin-fix-build-with-newer-gpsd.patch (revision 154)
+++ 0001-gps-plugin-fix-build-with-newer-gpsd.patch (deleted)
@@ -1,41 +0,0 @@
-From d5ec9075510601537cc76be4417ab337364506d0 Mon Sep 17 00:00:00 2001
-From: Baruch Siach
-Date: Tue, 9 Oct 2018 19:57:21 +0300
-Subject: [PATCH] gps plugin: fix build with newer gpsd
-
-gpsd version 3.18 changed the prototype of gps_read(). Make the
-gps_read() call depend on GPSD_API_MAJOR_VERSION to fix that.
-
-This fixes build failures like:
-
-gps.c: In function 'cgps_thread':
-gps.c:144:11: error: too few arguments to function 'gps_read'
- if (gps_read(&gpsd_conn) == -1) {
- ^~~~~~~~
-
-(cherry picked from commit 991a6d3fd38c2435d94de3853fda36b3330cf6ab)
----
- src/gps.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/gps.c b/src/gps.c
-index 1d32d049..b22c3a2e 100644
---- a/src/gps.c
-+++ b/src/gps.c
-@@ -141,7 +141,12 @@ static void *cgps_thread(void *pData) {
- continue;
- }
-
-- if (gps_read(&gpsd_conn) == -1) {
-+#if GPSD_API_MAJOR_VERSION > 6
-+ if (gps_read(&gpsd_conn, NULL, 0) == -1)
-+#else
-+ if (gps_read(&gpsd_conn) == -1)
-+#endif
-+ {
- WARNING("gps plugin: incorrect data! (err_count: %d)", err_count);
- err_count++;
-
---
-2.16.4
-
Index: Removed-checks-for-upper-limit-of-SENSORS_API_VERSION.patch
===================================================================
--- Removed-checks-for-upper-limit-of-SENSORS_API_VERSION.patch (revision 154)
+++ Removed-checks-for-upper-limit-of-SENSORS_API_VERSION.patch (deleted)
@@ -1,83 +0,0 @@
-From d5a3c020d33cc33ee8049f54c7b4dffcd123bf83 Mon Sep 17 00:00:00 2001
-From: Pavel Rochnyack
-Date: Mon, 3 Dec 2018 18:34:14 +0700
-Subject: [PATCH] sensors: Removed checks for upper limit of
- SENSORS_API_VERSION
-
-That makes no more sense after lm-sensors got new maintainers.
-
-Closes: #3006
----
- src/sensors.c | 17 ++++++-----------
- 1 file changed, 6 insertions(+), 11 deletions(-)
-
-diff --git a/src/sensors.c b/src/sensors.c
-index f4ecda5e49..33982e061a 100644
---- a/src/sensors.c
-+++ b/src/sensors.c
-@@ -149,7 +149,7 @@ typedef struct featurelist {
- static char *conffile = SENSORS_CONF_PATH;
- /* #endif SENSORS_API_VERSION < 0x400 */
-
--#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500)
-+#elif (SENSORS_API_VERSION >= 0x400)
- typedef struct featurelist {
- const sensors_chip_name *chip;
- const sensors_feature *feature;
-@@ -159,11 +159,6 @@ typedef struct featurelist {
-
- static char *conffile = NULL;
- static _Bool use_labels = 0;
--/* #endif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */
--
--#else /* if SENSORS_API_VERSION >= 0x500 */
--#error "This version of libsensors is not supported yet. Please report this " \
-- "as bug."
- #endif
-
- static featurelist_t *first_feature = NULL;
-@@ -223,7 +218,7 @@ static int sensors_config(const char *key, const char *value) {
- if (IS_TRUE(value))
- ignorelist_set_invert(sensor_list, 0);
- }
--#if (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500)
-+#if (SENSORS_API_VERSION >= 0x400)
- else if (strcasecmp(key, "UseLabels") == 0) {
- use_labels = IS_TRUE(value) ? 1 : 0;
- }
-@@ -353,7 +348,7 @@ static int sensors_load_conf(void) {
- } /* while sensors_get_detected_chips */
- /* #endif SENSORS_API_VERSION < 0x400 */
-
--#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500)
-+#elif (SENSORS_API_VERSION >= 0x400)
- chip_num = 0;
- while ((chip = sensors_get_detected_chips(NULL, &chip_num)) != NULL) {
- const sensors_feature *feature;
-@@ -410,7 +405,7 @@ static int sensors_load_conf(void) {
- } /* while (subfeature) */
- } /* while (feature) */
- } /* while (chip) */
--#endif /* (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */
-+#endif /* (SENSORS_API_VERSION >= 0x400) */
-
- if (first_feature == NULL) {
- sensors_cleanup();
-@@ -485,7 +480,7 @@ static int sensors_read(void) {
- } /* for fl = first_feature .. NULL */
- /* #endif SENSORS_API_VERSION < 0x400 */
-
--#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500)
-+#elif (SENSORS_API_VERSION >= 0x400)
- for (featurelist_t *fl = first_feature; fl != NULL; fl = fl->next) {
- double value;
- int status;
-@@ -528,7 +523,7 @@ static int sensors_read(void) {
-
- sensors_submit(plugin_instance, type, type_instance, value);
- } /* for fl = first_feature .. NULL */
--#endif /* (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */
-+#endif /* (SENSORS_API_VERSION >= 0x400) */
-
- return 0;
- } /* int sensors_read */
Index: collectd-5.8.1.tar.bz2
===================================================================
Binary file collectd-5.8.1.tar.bz2 (revision 154) deleted