[PR PATCH] collectd: update to 5.9.0

[PR PATCH] collectd: update to 5.9.0

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 341 bytes --]

There is a new pull request by PaperMountainStudio against master on the void-packages repository

https://github.com/PaperMountainStudio/void-packages collectd-5.9.0
https://github.com/void-linux/void-packages/pull/13199

collectd: update to 5.9.0


A patch file from https://github.com/void-linux/void-packages/pull/13199.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-collectd-5.9.0-13199.patch --]
[-- Type: application/text/x-diff, Size: 4661 bytes --]

From 8d2fd3181bf1dd5e2e9348f81db16267d1b1e0d1 Mon Sep 17 00:00:00 2001
From: Paper Mountain Studio <kodycze@gmail.com>
Date: Thu, 18 Jul 2019 10:45:54 +0200
Subject: [PATCH] collectd: update to 5.9.0

---
 srcpkgs/collectd/patches/3013.patch | 84 -----------------------------
 srcpkgs/collectd/template           |  6 +--
 2 files changed, 3 insertions(+), 87 deletions(-)
 delete mode 100644 srcpkgs/collectd/patches/3013.patch

diff --git a/srcpkgs/collectd/patches/3013.patch b/srcpkgs/collectd/patches/3013.patch
deleted file mode 100644
index fa98145dcd1..00000000000
--- a/srcpkgs/collectd/patches/3013.patch
+++ /dev/null
@@ -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 */
diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index 467675bc4fd..a6957f46b40 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
-version=5.8.1
-revision=5
+version=5.9.0
+revision=1
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(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"
 homepage="https://collectd.org"
 distfiles="https://collectd.org/files/${pkgname}-${version}.tar.bz2"
-checksum=e796fda27ce06377f491ad91aa286962a68c2b54076aa77a29673d53204453da
+checksum=7b220f8898a061f6e7f29a8c16697d1a198277f813da69474a67911097c0626b
 LDFLAGS="-lgcrypt"
 
 build_options="rrdtool perl notify"

Re: [PR PATCH] [Merged]: collectd: update to 5.9.0

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 158 bytes --]

There's a merged pull request on the void-packages repository

collectd: update to 5.9.0
https://github.com/void-linux/void-packages/pull/13199
Description: