diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-09-06 10:28:05 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-09-06 10:28:05 +0100 |
commit | f1af93971b7490792d8541bc790e0d8c6d787059 (patch) | |
tree | a38046712bbc3a3844d77452d16c84e716caa3d4 /app-metrics/collectd | |
parent | fc637fb28da700da71ec2064d65ca5a7a31b9c6c (diff) |
gentoo resync : 06.08.2019
Diffstat (limited to 'app-metrics/collectd')
-rw-r--r-- | app-metrics/collectd/Manifest | 5 | ||||
-rw-r--r-- | app-metrics/collectd/collectd-5.8.1-r1.ebuild (renamed from app-metrics/collectd/collectd-5.8.1.ebuild) | 2 | ||||
-rw-r--r-- | app-metrics/collectd/collectd-5.9.1-r2.ebuild (renamed from app-metrics/collectd/collectd-5.9.1.ebuild) | 4 | ||||
-rw-r--r-- | app-metrics/collectd/files/collectd-5.9.1-fixup.patch | 81 |
4 files changed, 87 insertions, 5 deletions
diff --git a/app-metrics/collectd/Manifest b/app-metrics/collectd/Manifest index 617045da5013..d3b85962f990 100644 --- a/app-metrics/collectd/Manifest +++ b/app-metrics/collectd/Manifest @@ -1,10 +1,11 @@ AUX collectd-5.8.1-lm_sensors-4.5.0-compatibility.patch 2595 BLAKE2B cd60e42c3870611b30068d09410abc1cc80e5c2c945805d9a105050a52f3c2fc2ca2c5e10f33cd9c5063b0773a1bdad9ea7446f88632674cbd2cdd5202a69247 SHA512 6c04f6651a4bbe0c051202cfc3fae3e366cacf34c74e9ff3f09ca83887eb165e4febf8957ede66c22195c03c1f111b24a8859a56921cd42f68f938e87d784f52 +AUX collectd-5.9.1-fixup.patch 2870 BLAKE2B 4b28683774e856ac71c41ec8016d329fd09795dfd877cd1d7a7662aac8e1bc96a62b6fa24ffa6136ed5be95712e52d114eb403a17eb438eedd7d0aa5385047e7 SHA512 1d4c102214ad825a36b6d4057fc9c47c000857ae218a0e541dff33ecbcb2ec78872a486e661ef8013040acd626e78298ca220b8fd87beef7f5ee5bd8b85551ea AUX collectd.confd-r2 2001 BLAKE2B fbf1a64aab6ec60111553466c3a8b725200ab13d0e09c1ba1d71e68213e8f978c3cad0dfc5eb2c536ced8213f172804f0596b3494f9b42b0cacf3432105cab5a SHA512 729f2b4e06c4a8c95d32c03c6f3f292eaa4895780ace180b74fcf139a949e9c28a2b3ae823bdebec0014f9b4d919adb399bc7f019c68c0e268b263326959edb7 AUX collectd.initd-r2 1843 BLAKE2B ccb12e55de72565aa7b6bb0f2c4e7a5a6d15ff23d5bc75e9cb36e1f2dba85b3b2b587336f976059af165ae89333d681ffe0cf53bbcd8098eaeff75228cb80b68 SHA512 8f0a73f0f2b2280c0f2e35894a9dfa38af937930eb090eab52cbe81089a146bd974f6a2a3062b7147611f9c13b770a945a1a9228a026405d31578e27a3fd3b80 AUX collectd.logrotate 115 BLAKE2B ce2a79787096b04af6ecd128633dde68fb868a02cc1d246c3e512c1733133fcc8da41b3ab2a0051b4da78c53e6629b2ad8085872dec1d4c28e397c88cafe3a90 SHA512 87ec01784d415f00834c2b20614f11f7e08b70f88d7c87509a8b8fd7e1af8758565b9ed6a6840af7bf1006cb941a61a6ff4f3176f6ded722728f24483b08bc8e AUX collectd.tmpfile 39 BLAKE2B 0d1ee2f02e539e854b62b47032308d08505fa31d8428e98f8d150c924201074c5edae22eea3990edf3a7837f1473193fe009a501645bf064638c532ec53a36cc SHA512 55fb70da9ece74b143c3e971b890954842230691039f8ad2240cc4c8d699e4e7a21efcbfd0b3cb2503e90af0bbdd0c7d886e09baf9fc86ec26c115a0bce6a668 DIST collectd-5.8.1.tar.bz2 1789228 BLAKE2B 739f961172978db33bdf95c8f93bde0036a26b2ed2abd3396a734d4b97c4ae117bb26a62fcdbb3d77bd63d9f64a38f83d0c8a0665e8fa7bf5ed2efc6838b0e8e SHA512 8c75448c6e59ee1ea5c1cf486c07040d20fb36d5b7a1be2ab45facea330166e8c1d1fa38e3fa82ec905428d7b2c92c66aae35ee8e3546f67ce76f7f410739901 DIST collectd-5.9.1.tar.gz 1501178 BLAKE2B ed0984637161427f3b354002850b7ea8c49a4aca64b637b864e5513c8057f52a4a479477b21e2a4cff436728c16d66c6d561df14308adcaeb7d597c290f543ce SHA512 424ef12a3ba6997a71e6eda1a62d73fec588c9c4d90542c2381c1f9f4e118b2c02e18c71507e8984e20fb255b69b7f42afe83085b3df5e225c576d1eee1655fb -EBUILD collectd-5.8.1.ebuild 19429 BLAKE2B b84bcdcd587f375766052acc92f3c053fac92a6c0a8750a1d558333345918fdcd7e563f705830b85cc5c76f9b14beca28297a8b1762ac6f67f66bd871c1c522f SHA512 123f88476f52f94cc5a975558889fb450e5341d6ae9ac9ec0cf4ffb5d46633d04f949b27f8408cab587d818ce27058c2d2dd53c8ea70315c9c7215c06cce61fe -EBUILD collectd-5.9.1.ebuild 19563 BLAKE2B 99704cccf28dfbfb29085fa99f586efa15dcc0702d542927931cef723d583a6e988fadbdce96a4e69976f2e21a5404566ffd98c30f2362e793e4119ef96c535d SHA512 d4ca49e401ee7b92e7422e0cd3fc09d73ebaf4a5d0432c9f8836e0e859f7c3ee527b700c35d871b83651242cf76f8aa92baadac9f3549ea3e8860b6852940d78 +EBUILD collectd-5.8.1-r1.ebuild 19431 BLAKE2B 7bc4b09438a006dea269c954133c7b8ca0f051451d7408fe53d672caec76cff0c462050719c069a8f3b4fd7106db7e6551b240b5cf3a3cd6644543a09b53fd76 SHA512 a3dedffad32926cb884678790a3243db5560600e9a7a6a1ae518a9c332db441b5e9ffd41b10191180464e3366712b90606c7e5b7c98d550b3c4bb7a4fcfcc003 +EBUILD collectd-5.9.1-r2.ebuild 19597 BLAKE2B b592caeb54af1575e62b23026ca726eb50c28206f162728f0e945c797c904a94470f7d4f5b3e4b7c51a9df7c131412e6c620c4801585b531d3164599a54f51af SHA512 c89e6971009200fefe9b8d3ba15a1e9bb0c35405f459cd779b018be3630091a70bbcd4a3d001899f1e1364f5ba3969ac0db1242e8c73029cb1779f44f34648e1 MISC metadata.xml 1515 BLAKE2B 5525766b822463f94f7c2cddbdf78b4c4ea5a473880a473d0b51481d948569cfc7f51bd2e74eb67065ab2be1b23e4fb7ee99512d018c6e6b5ac1ee7331eae9eb SHA512 51c17c16d27b722d729d036d67c562ab76e212dac9bcd004a7e43c2c5e041b8c46e74f9a130f30c2e18cc95ca1b367034246eff02cfaf55f6f9375ff836749e5 diff --git a/app-metrics/collectd/collectd-5.8.1.ebuild b/app-metrics/collectd/collectd-5.8.1-r1.ebuild index ce35b6c2a889..ce224b6f9195 100644 --- a/app-metrics/collectd/collectd-5.8.1.ebuild +++ b/app-metrics/collectd/collectd-5.8.1-r1.ebuild @@ -100,7 +100,7 @@ COMMON_DEPEND=" collectd_plugins_memcachec? ( dev-libs/libmemcached ) collectd_plugins_modbus? ( dev-libs/libmodbus ) collectd_plugins_mqtt? ( app-misc/mosquitto ) - collectd_plugins_mysql? ( virtual/libmysqlclient:= ) + collectd_plugins_mysql? ( dev-db/mysql-connector-c:= ) collectd_plugins_netlink? ( net-libs/libmnl ) collectd_plugins_nginx? ( net-misc/curl:0= ) collectd_plugins_notify_desktop? ( x11-libs/libnotify ) diff --git a/app-metrics/collectd/collectd-5.9.1.ebuild b/app-metrics/collectd/collectd-5.9.1-r2.ebuild index e79b4d6e0e41..af1f3432adc8 100644 --- a/app-metrics/collectd/collectd-5.9.1.ebuild +++ b/app-metrics/collectd/collectd-5.9.1-r2.ebuild @@ -101,7 +101,7 @@ COMMON_DEPEND=" collectd_plugins_memcachec? ( dev-libs/libmemcached ) collectd_plugins_modbus? ( dev-libs/libmodbus ) collectd_plugins_mqtt? ( app-misc/mosquitto ) - collectd_plugins_mysql? ( virtual/libmysqlclient:= ) + collectd_plugins_mysql? ( dev-db/mysql-connector-c:= ) collectd_plugins_netlink? ( net-libs/libmnl ) collectd_plugins_nginx? ( net-misc/curl:0= ) collectd_plugins_notify_desktop? ( x11-libs/libnotify ) @@ -160,7 +160,7 @@ REQUIRED_USE=" collectd_plugins_python? ( ${PYTHON_REQUIRED_USE} ) collectd_plugins_smart? ( udev )" -PATCHES=() +PATCHES=( "${FILESDIR}"/${P}-fixup.patch ) S="${WORKDIR}/${PN}-${PN}-${PV}" diff --git a/app-metrics/collectd/files/collectd-5.9.1-fixup.patch b/app-metrics/collectd/files/collectd-5.9.1-fixup.patch new file mode 100644 index 000000000000..93f97d95a9c4 --- /dev/null +++ b/app-metrics/collectd/files/collectd-5.9.1-fixup.patch @@ -0,0 +1,81 @@ +--- a/src/daemon/plugin.c ++++ b/src/daemon/plugin.c +@@ -647,7 +647,8 @@ static void start_read_threads(size_t num) /* {{{ */ + } + + char name[THREAD_NAME_MAX]; +- snprintf(name, sizeof(name), "reader#%" PRIu64, (uint64_t)read_threads_num); ++ ssnprintf(name, sizeof(name), "reader#%" PRIu64, ++ (uint64_t)read_threads_num); + set_thread_name(read_threads[read_threads_num], name); + + read_threads_num++; +@@ -836,8 +837,8 @@ static void start_write_threads(size_t num) /* {{{ */ + } + + char name[THREAD_NAME_MAX]; +- snprintf(name, sizeof(name), "writer#%" PRIu64, +- (uint64_t)write_threads_num); ++ ssnprintf(name, sizeof(name), "writer#%" PRIu64, ++ (uint64_t)write_threads_num); + set_thread_name(write_threads[write_threads_num], name); + + write_threads_num++; +--- a/src/intel_rdt.c ++++ b/src/intel_rdt.c +@@ -325,8 +325,12 @@ static int strlisttoarray(char *str_list, char ***names, size_t *names_num) { + continue; + + if ((isdupstr((const char **)*names, *names_num, token))) { +- ERROR(RDT_PLUGIN ": Duplicated process name \'%s\' in group \'%s\'", +- token, str_list); ++ if (str_list != NULL) ++ ERROR(RDT_PLUGIN ": Duplicated process name \'%s\' in group \'%s\'", ++ token, str_list); ++ else ++ ERROR(RDT_PLUGIN ": Duplicated process name \'%s\'", token); ++ + return -EINVAL; + } else { + if (0 != strarray_add(names, names_num, token)) { +--- a/src/intel_rdt.c ++++ b/src/intel_rdt.c +@@ -325,11 +325,7 @@ static int strlisttoarray(char *str_list, char ***names, size_t *names_num) { + continue; + + if ((isdupstr((const char **)*names, *names_num, token))) { +- if (str_list != NULL) +- ERROR(RDT_PLUGIN ": Duplicated process name \'%s\' in group \'%s\'", +- token, str_list); +- else +- ERROR(RDT_PLUGIN ": Duplicated process name \'%s\'", token); ++ ERROR(RDT_PLUGIN ": Duplicated process name \'%s\'", token); + + return -EINVAL; + } else { +--- a/src/syslog.c ++++ b/src/syslog.c +@@ -51,8 +51,7 @@ static int sl_config(const char *key, const char *value) { + log_level = parse_log_severity(value); + if (log_level < 0) { + log_level = LOG_INFO; +- ERROR("syslog: invalid loglevel [%s] defaulting to 'info'", value); +- return 1; ++ WARNING("syslog: invalid loglevel [%s] defaulting to 'info'", value); + } + } else if (strcasecmp(key, "NotifyLevel") == 0) { + notif_severity = parse_notif_severity(value); +--- a/src/utils/common/common.c ++++ b/src/utils/common/common.c +@@ -99,10 +99,7 @@ int ssnprintf(char *str, size_t sz, const char *format, ...) { + + va_end(ap); + +- if (ret < 0) { +- return ret; +- } +- return (size_t)ret >= sz; ++ return ret; + } /* int ssnprintf */ + + char *ssnprintf_alloc(char const *format, ...) /* {{{ */ |