[arch-commits] Commit in collectd/trunk (PKGBUILD lm_sensors5to6.patch)

[Gaëtan Bisson]

    Date: Thursday, November 29, 2018 @ 20:06:09
  Author: bisson
Revision: 410565

rebuild against lm_sensors-3.5.0

Added:
  collectd/trunk/lm_sensors5to6.patch
Modified:
  collectd/trunk/PKGBUILD

----------------------+
 PKGBUILD             |    5 ++-
 lm_sensors5to6.patch |   69 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-29 19:54:16 UTC (rev 410564)
+++ PKGBUILD	2018-11-29 20:06:09 UTC (rev 410565)
@@ -3,7 +3,7 @@
 
 pkgname=collectd
 pkgver=5.8.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Daemon which collects system performance statistics periodically'
 url='https://collectd.org/'
 arch=('x86_64')
@@ -41,8 +41,10 @@
 depends=('libltdl' 'iptables' 'libnsl')
 
 source=("${url}files/${pkgname}-${pkgver}.tar.bz2"
+        'lm_sensors5to6.patch'
         'service')
 sha256sums=('e796fda27ce06377f491ad91aa286962a68c2b54076aa77a29673d53204453da'
+            '9946e796bcbc857160a540ccf38979a4dd722ec13e0761451523206b202591eb'
             'e45e261146563b0bf6967c669dff7ac2400f066f0eb4c022ac3fdb0ccadca2f9')
 
 backup=('etc/collectd.conf')
@@ -50,6 +52,7 @@
 prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	sed 's/ -Werror//g' -i configure
+	patch -p1 -i ../lm_sensors5to6.patch
 }
 
 build() {

Added: lm_sensors5to6.patch
===================================================================
--- lm_sensors5to6.patch	                        (rev 0)
+++ lm_sensors5to6.patch	2018-11-29 20:06:09 UTC (rev 410565)
@@ -0,0 +1,69 @@
+diff -Naur old/src/sensors.c new/src/sensors.c
+--- old/src/sensors.c	2018-10-22 20:57:09.027242628 -1000
++++ new/src/sensors.c	2018-11-29 09:51:36.950814002 -1000
+@@ -149,7 +149,7 @@
+ 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) && (SENSORS_API_VERSION < 0x600)
+ typedef struct featurelist {
+   const sensors_chip_name *chip;
+   const sensors_feature *feature;
+@@ -159,9 +159,9 @@
+ 
+ static char *conffile = NULL;
+ static _Bool use_labels = 0;
+-/* #endif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */
++/* #endif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x600) */
+ 
+-#else /* if SENSORS_API_VERSION >= 0x500 */
++#else /* if SENSORS_API_VERSION >= 0x600 */
+ #error "This version of libsensors is not supported yet. Please report this " \
+ 	"as bug."
+ #endif
+@@ -223,7 +223,7 @@
+     if (IS_TRUE(value))
+       ignorelist_set_invert(sensor_list, 0);
+   }
+-#if (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500)
++#if (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x600)
+   else if (strcasecmp(key, "UseLabels") == 0) {
+     use_labels = IS_TRUE(value) ? 1 : 0;
+   }
+@@ -353,7 +353,7 @@
+   }   /* while sensors_get_detected_chips */
+ /* #endif SENSORS_API_VERSION < 0x400 */
+ 
+-#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500)
++#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x600)
+   chip_num = 0;
+   while ((chip = sensors_get_detected_chips(NULL, &chip_num)) != NULL) {
+     const sensors_feature *feature;
+@@ -410,7 +410,7 @@
+       } /* while (subfeature) */
+     }   /* while (feature) */
+   }     /* while (chip) */
+-#endif /* (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */
++#endif /* (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x600) */
+ 
+   if (first_feature == NULL) {
+     sensors_cleanup();
+@@ -485,7 +485,7 @@
+   } /* for fl = first_feature .. NULL */
+ /* #endif SENSORS_API_VERSION < 0x400 */
+ 
+-#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500)
++#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x600)
+   for (featurelist_t *fl = first_feature; fl != NULL; fl = fl->next) {
+     double value;
+     int status;
+@@ -528,7 +528,7 @@
+ 
+     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) && (SENSORS_API_VERSION < 0x600) */
+ 
+   return 0;
+ } /* int sensors_read */