summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2008-11-04 19:32:18 +0000
committerPeter Volkov <pva@gentoo.org>2008-11-04 19:32:18 +0000
commit690dd43c50a356609356a1bcd52eda1cebb8d1bb (patch)
tree1990cc67209f2d8a8f5469353cf24ae55d87600f /net-analyzer/rrdtool/files
parentfix ffmpeg deps for bug #245467 (diff)
downloadgentoo-2-690dd43c50a356609356a1bcd52eda1cebb8d1bb.tar.gz
gentoo-2-690dd43c50a356609356a1bcd52eda1cebb8d1bb.tar.bz2
gentoo-2-690dd43c50a356609356a1bcd52eda1cebb8d1bb.zip
Revert upstream changes that cause broken graphs in cacti, bug #245331, thank Thomas Beutin for report and fleg for tests. Remove unused.
(Portage version: 2.2_rc13/cvs/Linux 2.6.26-openvz.git-35f41f1 i686)
Diffstat (limited to 'net-analyzer/rrdtool/files')
-rw-r--r--net-analyzer/rrdtool/files/rrdtool-1.2.28-revert-font-fix.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.2.28-revert-font-fix.patch b/net-analyzer/rrdtool/files/rrdtool-1.2.28-revert-font-fix.patch
new file mode 100644
index 000000000000..19a0a8072811
--- /dev/null
+++ b/net-analyzer/rrdtool/files/rrdtool-1.2.28-revert-font-fix.patch
@@ -0,0 +1,26 @@
+=== modified file 'src/rrd_graph.c'
+--- src/rrd_graph.c 2008-11-04 14:50:21 +0000
++++ src/rrd_graph.c 2008-11-04 14:57:04 +0000
+@@ -3508,17 +3508,15 @@
+ if (size > 0){
+ im->text_prop[propidx].size=size;
+ }
+- if (strlen(optarg) > end){
+- if (optarg[end] == ':'){
+- strncpy(im->text_prop[propidx].font,optarg+end+1,255);
++ if (strlen(prop) > end){
++ if (prop[end] == ':'){
++ strncpy(im->text_prop[propidx].font,prop+end+1,255);
+ im->text_prop[propidx].font[255] = '\0';
+ } else {
+- rrd_set_error("expected : after font size in '%s'",optarg);
++ rrd_set_error("expected after font size in '%s'",prop);
+ return;
+ }
+ }
+- /* only run the for loop for DEFAULT (0) for
+- all others, we break here. woodo programming */
+ if (propidx==sindex && sindex != 0) break;
+ }
+ } else {
+