1 |
commit: 7628e513e894f1fa4d23dd8b4b5a052a4a068dd9 |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Aug 21 22:52:35 2019 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 21 22:53:44 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7628e513 |
7 |
|
8 |
app-metrics/collectd: unbreack v5.9.1 |
9 |
|
10 |
Add some upstream patches to fix broken v5.9.1 release. |
11 |
|
12 |
Package-Manager: Portage-2.3.72, Repoman-2.3.17 |
13 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
14 |
|
15 |
...lectd-5.9.1.ebuild => collectd-5.9.1-r1.ebuild} | 2 +- |
16 |
.../collectd/files/collectd-5.9.1-fixup.patch | 81 ++++++++++++++++++++++ |
17 |
2 files changed, 82 insertions(+), 1 deletion(-) |
18 |
|
19 |
diff --git a/app-metrics/collectd/collectd-5.9.1.ebuild b/app-metrics/collectd/collectd-5.9.1-r1.ebuild |
20 |
similarity index 99% |
21 |
rename from app-metrics/collectd/collectd-5.9.1.ebuild |
22 |
rename to app-metrics/collectd/collectd-5.9.1-r1.ebuild |
23 |
index e79b4d6e0e4..052e491c929 100644 |
24 |
--- a/app-metrics/collectd/collectd-5.9.1.ebuild |
25 |
+++ b/app-metrics/collectd/collectd-5.9.1-r1.ebuild |
26 |
@@ -160,7 +160,7 @@ REQUIRED_USE=" |
27 |
collectd_plugins_python? ( ${PYTHON_REQUIRED_USE} ) |
28 |
collectd_plugins_smart? ( udev )" |
29 |
|
30 |
-PATCHES=() |
31 |
+PATCHES=( "${FILESDIR}"/${P}-fixup.patch ) |
32 |
|
33 |
S="${WORKDIR}/${PN}-${PN}-${PV}" |
34 |
|
35 |
|
36 |
diff --git a/app-metrics/collectd/files/collectd-5.9.1-fixup.patch b/app-metrics/collectd/files/collectd-5.9.1-fixup.patch |
37 |
new file mode 100644 |
38 |
index 00000000000..93f97d95a9c |
39 |
--- /dev/null |
40 |
+++ b/app-metrics/collectd/files/collectd-5.9.1-fixup.patch |
41 |
@@ -0,0 +1,81 @@ |
42 |
+--- a/src/daemon/plugin.c |
43 |
++++ b/src/daemon/plugin.c |
44 |
+@@ -647,7 +647,8 @@ static void start_read_threads(size_t num) /* {{{ */ |
45 |
+ } |
46 |
+ |
47 |
+ char name[THREAD_NAME_MAX]; |
48 |
+- snprintf(name, sizeof(name), "reader#%" PRIu64, (uint64_t)read_threads_num); |
49 |
++ ssnprintf(name, sizeof(name), "reader#%" PRIu64, |
50 |
++ (uint64_t)read_threads_num); |
51 |
+ set_thread_name(read_threads[read_threads_num], name); |
52 |
+ |
53 |
+ read_threads_num++; |
54 |
+@@ -836,8 +837,8 @@ static void start_write_threads(size_t num) /* {{{ */ |
55 |
+ } |
56 |
+ |
57 |
+ char name[THREAD_NAME_MAX]; |
58 |
+- snprintf(name, sizeof(name), "writer#%" PRIu64, |
59 |
+- (uint64_t)write_threads_num); |
60 |
++ ssnprintf(name, sizeof(name), "writer#%" PRIu64, |
61 |
++ (uint64_t)write_threads_num); |
62 |
+ set_thread_name(write_threads[write_threads_num], name); |
63 |
+ |
64 |
+ write_threads_num++; |
65 |
+--- a/src/intel_rdt.c |
66 |
++++ b/src/intel_rdt.c |
67 |
+@@ -325,8 +325,12 @@ static int strlisttoarray(char *str_list, char ***names, size_t *names_num) { |
68 |
+ continue; |
69 |
+ |
70 |
+ if ((isdupstr((const char **)*names, *names_num, token))) { |
71 |
+- ERROR(RDT_PLUGIN ": Duplicated process name \'%s\' in group \'%s\'", |
72 |
+- token, str_list); |
73 |
++ if (str_list != NULL) |
74 |
++ ERROR(RDT_PLUGIN ": Duplicated process name \'%s\' in group \'%s\'", |
75 |
++ token, str_list); |
76 |
++ else |
77 |
++ ERROR(RDT_PLUGIN ": Duplicated process name \'%s\'", token); |
78 |
++ |
79 |
+ return -EINVAL; |
80 |
+ } else { |
81 |
+ if (0 != strarray_add(names, names_num, token)) { |
82 |
+--- a/src/intel_rdt.c |
83 |
++++ b/src/intel_rdt.c |
84 |
+@@ -325,11 +325,7 @@ static int strlisttoarray(char *str_list, char ***names, size_t *names_num) { |
85 |
+ continue; |
86 |
+ |
87 |
+ if ((isdupstr((const char **)*names, *names_num, token))) { |
88 |
+- if (str_list != NULL) |
89 |
+- ERROR(RDT_PLUGIN ": Duplicated process name \'%s\' in group \'%s\'", |
90 |
+- token, str_list); |
91 |
+- else |
92 |
+- ERROR(RDT_PLUGIN ": Duplicated process name \'%s\'", token); |
93 |
++ ERROR(RDT_PLUGIN ": Duplicated process name \'%s\'", token); |
94 |
+ |
95 |
+ return -EINVAL; |
96 |
+ } else { |
97 |
+--- a/src/syslog.c |
98 |
++++ b/src/syslog.c |
99 |
+@@ -51,8 +51,7 @@ static int sl_config(const char *key, const char *value) { |
100 |
+ log_level = parse_log_severity(value); |
101 |
+ if (log_level < 0) { |
102 |
+ log_level = LOG_INFO; |
103 |
+- ERROR("syslog: invalid loglevel [%s] defaulting to 'info'", value); |
104 |
+- return 1; |
105 |
++ WARNING("syslog: invalid loglevel [%s] defaulting to 'info'", value); |
106 |
+ } |
107 |
+ } else if (strcasecmp(key, "NotifyLevel") == 0) { |
108 |
+ notif_severity = parse_notif_severity(value); |
109 |
+--- a/src/utils/common/common.c |
110 |
++++ b/src/utils/common/common.c |
111 |
+@@ -99,10 +99,7 @@ int ssnprintf(char *str, size_t sz, const char *format, ...) { |
112 |
+ |
113 |
+ va_end(ap); |
114 |
+ |
115 |
+- if (ret < 0) { |
116 |
+- return ret; |
117 |
+- } |
118 |
+- return (size_t)ret >= sz; |
119 |
++ return ret; |
120 |
+ } /* int ssnprintf */ |
121 |
+ |
122 |
+ char *ssnprintf_alloc(char const *format, ...) /* {{{ */ |