[gentoo-commits] repo/gentoo:master commit in: app-metrics/collectd/, app-metrics/collectd/files/
commit: 5e3a95e9046e01ac2f2021fe20fd05c9408fe2e7
Author: Thomas Deutschmann gentoo org>
AuthorDate: Wed Apr 29 18:15:04 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Wed Apr 29 18:31:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e3a95e9
app-metrics/collectd: drop old
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann gentoo.org>
app-metrics/collectd/Manifest | 3 -
app-metrics/collectd/collectd-5.8.1-r1.ebuild | 536
app-metrics/collectd/collectd-5.9.1-r2.ebuild | 543 -
app-metrics/collectd/collectd-5.9.2.ebuild | 541
...ectd-5.8.1-lm_sensors-4.5.0-compatibility.patch | 70 ---
.../collectd/files/collectd-5.9.1-fixup.patch | 81 ---
6 files changed, 1774 deletions(-)
diff --git a/app-metrics/collectd/Manifest b/app-metrics/collectd/Manifest
index 377f9b07844..a38fa25f542 100644
--- a/app-metrics/collectd/Manifest
+++ b/app-metrics/collectd/Manifest
@@ -1,4 +1 @@
DIST collectd-5.10.0.tar.bz2 1856377 BLAKE2B
d4c011c5d2d9bfcf8400a35ca92f0b8c82fd58c3201b1b57a6b48c98af63efaab03c5fb1144bae28e7661743626871eaa962959929ff7fcdd5778b72c7054c4e
SHA512
1296085fb19bba0c7b7d8684ec877851158b25c9f7b58fc3ae602fba7d7dc718876e730e1cdba96d39101cc5452705bb3445aaee717b219025ae816299b6a3c5
-DIST collectd-5.8.1.tar.bz2 1789228 BLAKE2B
739f961172978db33bdf95c8f93bde0036a26b2ed2abd3396a734d4b97c4ae117bb26a62fcdbb3d77bd63d9f64a38f83d0c8a0665e8fa7bf5ed2efc6838b0e8e
SHA512
8c75448c6e59ee1ea5c1cf486c07040d20fb36d5b7a1be2ab45facea330166e8c1d1fa38e3fa82ec905428d7b2c92c66aae35ee8e3546f67ce76f7f410739901
-DIST collectd-5.9.1.tar.gz 1501178 BLAKE2B
ed0984637161427f3b354002850b7ea8c49a4aca64b637b864e5513c8057f52a4a479477b21e2a4cff436728c16d66c6d561df14308adcaeb7d597c290f543ce
SHA512
424ef12a3ba6997a71e6eda1a62d73fec588c9c4d90542c2381c1f9f4e118b2c02e18c71507e8984e20fb255b69b7f42afe83085b3df5e225c576d1eee1655fb
-DIST collectd-5.9.2.tar.gz 1501275 BLAKE2B
f878dc9ee0d1948643dcbfcf3a427558a1c17adedcc31f02f4f4bb689e841760dcf732866c0617b8b139b4aecb094f8ca4aa5e7c7c707adf5589fc8767a1d2f9
SHA512
cbbc8d6409242108550b974f388d15c6084753dd51c6056614db34bceb3b72abb0237892ea65086093b9a5c5569087666c0430eb16021d22c3dde8e6d1ae7922
diff --git a/app-metrics/collectd/collectd-5.8.1-r1.ebuild
b/app-metrics/collectd/collectd-5.8.1-r1.ebuild
deleted file mode 100644
index 8c6d11da757..000
--- a/app-metrics/collectd/collectd-5.8.1-r1.ebuild
+++ /dev/null
@@ -1,536 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-JAVA_PKG_OPT_USE="collectd_plugins_java"
-
-inherit autotools fcaps flag-o-matic java-pkg-opt-2 linux-info multilib
perl-functions python-single-r1 systemd tmpfiles user
-
-DESCRIPTION="Collects system statistics and provides mechanisms to store the
values"
-
-HOMEPAGE="https://collectd.org/;
-SRC_URI="https://collectd.org/files/${P}.tar.bz2;
-
-LICENSE="MIT GPL-2 GPL-2+ GPL-3 GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm x86"
-IUSE="contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl
selinux static-libs udev xfs"
-
-# The plugin lists have to follow here since they extend IUSE
-
-# Plugins that don't build (e.g. dependencies not in Gentoo)
-# apple_sensors: Requires libIOKit
-# aquaero: Requires aerotools-ng/libaquaero5
-# barometer: Requires libi2c (i2c_smbus_read_i2c_block_data)
-# dpdkevents:Requires dpdk
-# dpdkstat: Requires dpdk
-# grpc: Requires libgrpc
-# intel_pmu: Requires libjevents (pmu-tools)
-# intel_rdt: Requires libpqos from intel-cmt-cat project
-# lpar: Requires libperfstat (AIX only)
-# mic: Requires Intel Many Integrated Core Architecture API
-#(part of Intel's Xeon Phi software)
-# netapp:Requires libnetapp
(http://communities.netapp.com/docs/DOC-1110)
-# pf:Requires BSD packet filter
-# pinba: Requires MySQL Pinba engine (http://pinba.org/)
-# tape: Requires libkstat (Solaris only)
-# write_riemann: Requires riemann-c-client
-# xmms: Requires libxmms (v1)
-# zone: Solaris only...
-COLLECTD_IMPOSSIBLE_PLUGINS="apple_sensors aquaero barometer dpdkstat grpc
- intel_pmu intel_rdt lpar mic netapp pf pinba tape write_riemann
- xmms zone"
-
-# Plugins that have been (compile) tested and can be enabled via
COLLECTD_PLUGINS
-COLLECTD_TESTED_PLUGINS="aggregation amqp apache apcups ascent battery bind
- ceph cgroups chrony conntrack contextswitch cpu cpufreq cpusleep
- csv curl curl_json curl_xml dbi df disk dns drbd email
- entropy ethstat exec fhcount filecount fscache gmond gps hddtemp
- hugepages interface ipc ipmi iptables ipvs irq java lua
- load logfile log_logstash lvm madwifi match_empty_counter
-
[gentoo-commits] repo/gentoo:master commit in: app-metrics/collectd/, app-metrics/collectd/files/
commit: d2742fad0ebcdb912763f84637a3a52b7a13d895
Author: Thomas Deutschmann gentoo org>
AuthorDate: Thu Aug 2 18:35:55 2018 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Aug 2 18:40:30 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2742fad
app-metrics/collectd: fix UDEV usage in disk plugin
Closes: https://bugs.gentoo.org/662488
Package-Manager: Portage-2.3.44, Repoman-2.3.10
RepoMan-Options: --force
...lectd-5.8.0.ebuild => collectd-5.8.0-r1.ebuild} | 2 +
.../collectd-5.8.0-disk-plugin-udev-fix.patch | 98 ++
2 files changed, 100 insertions(+)
diff --git a/app-metrics/collectd/collectd-5.8.0.ebuild
b/app-metrics/collectd/collectd-5.8.0-r1.ebuild
similarity index 99%
rename from app-metrics/collectd/collectd-5.8.0.ebuild
rename to app-metrics/collectd/collectd-5.8.0-r1.ebuild
index 65229f538d9..a401e6d8c24 100644
--- a/app-metrics/collectd/collectd-5.8.0.ebuild
+++ b/app-metrics/collectd/collectd-5.8.0-r1.ebuild
@@ -159,6 +159,8 @@ REQUIRED_USE="
collectd_plugins_python?( ${PYTHON_REQUIRED_USE} )
collectd_plugins_smart? ( udev )"
+PATCHES=( "${FILESDIR}"/${P}-disk-plugin-udev-fix.patch )
+
# @FUNCTION: collectd_plugin_kernel_linux
# @DESCRIPTION:
# USAGE:
diff --git
a/app-metrics/collectd/files/collectd-5.8.0-disk-plugin-udev-fix.patch
b/app-metrics/collectd/files/collectd-5.8.0-disk-plugin-udev-fix.patch
new file mode 100644
index 000..1a96f06df0a
--- /dev/null
+++ b/app-metrics/collectd/files/collectd-5.8.0-disk-plugin-udev-fix.patch
@@ -0,0 +1,98 @@
+From ed696c1b3adcb42d55759efe6f8034337f0fd243 Mon Sep 17 00:00:00 2001
+From: Dylan Stephano-Shachter
+Date: Thu, 15 Feb 2018 16:37:33 -0500
+Subject: [PATCH] change HAVE_UDEV_H to HAVE_LIBUDEV_H for bug 2651
+
+---
+ src/disk.c | 20 ++--
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/src/disk.c b/src/disk.c
+index 004ce9e2d7..04f337415f 100644
+--- a/src/disk.c
b/src/disk.c
+@@ -139,7 +139,7 @@ static int pnumdisk;
+ #error "No applicable input method."
+ #endif
+
+-#if HAVE_UDEV_H
++#if HAVE_LIBUDEV_H
+ #include
+
+ static char *conf_udev_name_attr = NULL;
+@@ -173,7 +173,7 @@ static int disk_config(const char *key, const char *value)
{
+ "on Mach / Mac OS X and will be ignored.");
+ #endif
+ } else if (strcasecmp("UdevNameAttr", key) == 0) {
+-#if HAVE_UDEV_H
++#if HAVE_LIBUDEV_H
+ if (conf_udev_name_attr != NULL) {
+ free(conf_udev_name_attr);
+ conf_udev_name_attr = NULL;
+@@ -209,7 +209,7 @@ static int disk_init(void) {
+ /* #endif HAVE_IOKIT_IOKITLIB_H */
+
+ #elif KERNEL_LINUX
+-#if HAVE_UDEV_H
++#if HAVE_LIBUDEV_H
+ if (conf_udev_name_attr != NULL) {
+ handle_udev = udev_new();
+ if (handle_udev == NULL) {
+@@ -217,7 +217,7 @@ static int disk_init(void) {
+ return -1;
+ }
+ }
+-#endif /* HAVE_UDEV_H */
++#endif /* HAVE_LIBUDEV_H */
+ /* #endif KERNEL_LINUX */
+
+ #elif KERNEL_FREEBSD
+@@ -260,10 +260,10 @@ static int disk_init(void) {
+
+ static int disk_shutdown(void) {
+ #if KERNEL_LINUX
+-#if HAVE_UDEV_H
++#if HAVE_LIBUDEV_H
+ if (handle_udev != NULL)
+ udev_unref(handle_udev);
+-#endif /* HAVE_UDEV_H */
++#endif /* HAVE_LIBUDEV_H */
+ #endif /* KERNEL_LINUX */
+ return 0;
+ } /* int disk_shutdown */
+@@ -325,7 +325,7 @@ static counter_t disk_calc_time_incr(counter_t delta_time,
+ }
+ #endif
+
+-#if HAVE_UDEV_H
++#if HAVE_LIBUDEV_H
+ /**
+ * Attempt to provide an rename disk instance from an assigned udev attribute.
+ *
+@@ -841,7 +841,7 @@ static int disk_read(void) {
+
+ output_name = disk_name;
+
+-#if HAVE_UDEV_H
++#if HAVE_LIBUDEV_H
+ char *alt_name = NULL;
+ if (conf_udev_name_attr != NULL) {
+ alt_name =
+@@ -852,7 +852,7 @@ static int disk_read(void) {
+ #endif
+
+ if (ignorelist_match(ignorelist, output_name) != 0) {
+-#if HAVE_UDEV_H
++#if HAVE_LIBUDEV_H
+ /* release udev-based alternate name, if allocated */
+ sfree(alt_name);
+ #endif
+@@ -878,7 +878,7 @@ static int disk_read(void) {
+ submit_io_time(output_name, io_time, weighted_time);
+ } /* if (is_disk) */
+
+-#if HAVE_UDEV_H
++#if HAVE_LIBUDEV_H
+ /* release udev-based alternate name, if allocated */
+ sfree(alt_name);
+ #endif
