cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 15:38:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

collectd: Update to 5.4.1

Browse Source 
-update collectd to the current release 5.4.1
-fix sigrok glib check (upstream patch after 5.4.1)

Note:
Changes are required also to luci-statistics in Luci source.
Patch in http://patchwork.openwrt.org/patch/5303/

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
This commit is contained in:
Hannu Nyman
2014-09-09 19:45:14 +03:00
parent 34fd74553a
commit 1b0bd00838
10 changed files with 112 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
utils/collectd/patches/100-rrdtool-add-rrasingle-option.patch
+7 -7
View File
@@ -1,6 +1,6 @@
--- a/src/rrdtool.c
+++ b/src/rrdtool.c
@@ -80,6 +80,7 @@ static const char *config_keys[] =
@@ -82,6 +82,7 @@ static const char *config_keys[] =
"HeartBeat",
"RRARows",
"RRATimespan",
@@ -8,16 +8,16 @@
"XFF",
"WritesPerSecond",
"RandomTimeout"
@@ -101,6 +102,8 @@ static rrdcreate_config_t rrdcreate_conf
@@ -103,6 +104,8 @@ static rrdcreate_config_t rrdcreate_conf
/* timespans = */ NULL,
/* timespans_num = */ 0,
+ /* rrasingle = */ 0,
+
/* consolidation_functions = */ NULL,
/* consolidation_functions_num = */ 0
};
@@ -1027,6 +1030,14 @@ static int rrd_config (const char *key,
/* consolidation_functions_num = */ 0,
@@ -1093,6 +1096,14 @@ static int rrd_config (const char *key,
free (value_copy);
}
@@ -34,7 +34,7 @@
double tmp = atof (value);
--- a/src/utils_rrdcreate.c
+++ b/src/utils_rrdcreate.c
@@ -122,6 +122,9 @@ static int rra_get (char ***ret, const v
@@ -211,6 +211,9 @@ static int rra_get (char ***ret, const v
rts_num = rra_timespans_num;
}
@@ -54,4 +54,4 @@
+
char **consolidation_functions;
size_t consolidation_functions_num;
};