- up to 5.8.1

- fix building with latest lm_sensors

diff --git a/collectd.spec b/collectd.spec
index dd19670939bf95ecc747298da5849bac444a729a..f5282e47106e8b2d7fbd0c5ffe323806eb856c37 100644 (file)
--- a/collectd.spec
+++ b/collectd.spec
@@ -135,12 +135,12 @@
 Summary:       Collects system information in RRD files
 Summary(pl.UTF-8):     Zbieranie informacji o systemie w plikach RRD
 Name:          collectd
 Summary:       Collects system information in RRD files
 Summary(pl.UTF-8):     Zbieranie informacji o systemie w plikach RRD
 Name:          collectd

-Version:       5.8.0
-Release:       6
+Version:       5.8.1
+Release:       1

 License:       GPL v2
 Group:         Daemons
 Source0:       http://collectd.org/files/%{name}-%{version}.tar.bz2
 License:       GPL v2
 Group:         Daemons
 Source0:       http://collectd.org/files/%{name}-%{version}.tar.bz2

-# Source0-md5: a841159323624f18bf03198e9f5aa364
+# Source0-md5: bfce96c42cede5243028510bcc57c1e6

 Source1:       %{name}.conf
 Source2:       %{name}.init
 Source3:       %{name}-http.conf
 Source1:       %{name}.conf
 Source2:       %{name}.init
 Source3:       %{name}-http.conf


@@ -151,6 +151,7 @@ Source11:   %{name}-rrdtool.conf
 Patch0:                %{name}-collection.patch
 Patch1:                %{name}-python.patch
 Patch2:                noquote.patch
 Patch0:                %{name}-collection.patch
 Patch1:                %{name}-python.patch
 Patch2:                noquote.patch

+Patch3:                sensors.patch

 URL:           http://collectd.org/
 %{?with_ipmi:BuildRequires:    OpenIPMI-devel >= 2.0.14-3}
 BuildRequires: autoconf
 URL:           http://collectd.org/
 %{?with_ipmi:BuildRequires:    OpenIPMI-devel >= 2.0.14-3}
 BuildRequires: autoconf


@@ -1317,6 +1318,7 @@ Perl files from Collectd package
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1

+%patch3 -p1

 
 %build
 %{__libtoolize} --ltdl
 
 %build
 %{__libtoolize} --ltdl


@@ -1328,6 +1330,7 @@ Perl files from Collectd package
 %configure \
        CPPFLAGS="-Wno-unused-but-set-variable -Wno-format-truncation" \
        c_cv_have_libperl=yes \
 %configure \
        CPPFLAGS="-Wno-unused-but-set-variable -Wno-format-truncation" \
        c_cv_have_libperl=yes \

+       --disable-werror \

        --with-libiptc=/usr \
        --with-libstatgrab=/usr \
        --with-lm-sensors=/usr \
        --with-libiptc=/usr \
        --with-libstatgrab=/usr \
        --with-lm-sensors=/usr \

diff --git a/sensors.patch b/sensors.patch
new file mode 100644 (file)
index 0000000..585bdd1
--- /dev/null
+++ b/sensors.patch
@@ -0,0 +1,80 @@
+commit d5a3c020d33cc33ee8049f54c7b4dffcd123bf83
+Author: Pavel Rochnyack <pavel2000@ngs.ru>
+Date:   Mon Dec 3 18:34:14 2018 +0700
+
+    sensors: Removed checks for upper limit of SENSORS_API_VERSION
+    
+    That makes no more sense after lm-sensors got new maintainers.
+    
+    Closes: #3006
+
+diff --git a/src/sensors.c b/src/sensors.c
+index f4ecda5e..33982e06 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 */