wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-08-03 19:32:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

collectd: update to 5.9.0

Browse source
This commit is contained in:
Paper Mountain Studio 2019-07-18 10:45:54 +02:00 • committed by Helmut Pozimski
parent 98fa819fe4
commit 1c44c78226
2 changed files with 3 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
srcpkgs/collectd/patches/3013.patch
View file

@ -1,84 +0,0 @@
Upstream: https://github.com/collectd/collectd/pull/3013
From d5a3c020d33cc33ee8049f54c7b4dffcd123bf83 Mon Sep 17 00:00:00 2001
From: Pavel Rochnyack <pavel2000@ngs.ru>
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
--- src/sensors.c
+++ 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 */

6
srcpkgs/collectd/template
View file

@ -1,7 +1,7 @@
# Template file for 'collectd' # Template file for 'collectd'
pkgname=collectd pkgname=collectd
version=5.8.1 version=5.9.0
revision=5 revision=1
build_style=gnu-configure build_style=gnu-configure
configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl) configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
$(vopt_enable notify notify_desktop) --with-libiptc --enable-virt $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
@ -17,7 +17,7 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
license="GPL-2.0-only, MIT" license="GPL-2.0-only, MIT"
homepage="https://collectd.org" homepage="https://collectd.org"
distfiles="https://collectd.org/files/${pkgname}-${version}.tar.bz2" distfiles="https://collectd.org/files/${pkgname}-${version}.tar.bz2"
checksum=e796fda27ce06377f491ad91aa286962a68c2b54076aa77a29673d53204453da checksum=7b220f8898a061f6e7f29a8c16697d1a198277f813da69474a67911097c0626b
LDFLAGS="-lgcrypt" LDFLAGS="-lgcrypt"
build_options="rrdtool perl notify" build_options="rrdtool perl notify"