summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-analyzer/rrdtool/files')
-rw-r--r--net-analyzer/rrdtool/files/rrdtool-1.2.28-fix-empty-font.patch15
-rw-r--r--net-analyzer/rrdtool/files/rrdtool-1.2.28-revert-font-fix.patch26
2 files changed, 0 insertions, 41 deletions
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.2.28-fix-empty-font.patch b/net-analyzer/rrdtool/files/rrdtool-1.2.28-fix-empty-font.patch
deleted file mode 100644
index 15661557eaa5..000000000000
--- a/net-analyzer/rrdtool/files/rrdtool-1.2.28-fix-empty-font.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://oss.oetiker.ch/rrdtool-trac/changeset/1653
-
-=== modified file 'src/rrd_graph.c'
---- src/rrd_graph.c 2008-11-08 07:45:41 +0000
-+++ src/rrd_graph.c 2008-11-08 07:47:06 +0000
-@@ -3508,7 +3508,7 @@
- if (size > 0){
- im->text_prop[propidx].size=size;
- }
-- if (strlen(optarg) > end){
-+ if (strlen(optarg) > end+2){
- if (optarg[end] == ':'){
- strncpy(im->text_prop[propidx].font,optarg+end+1,255);
- im->text_prop[propidx].font[255] = '\0';
-
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
deleted file mode 100644
index 19a0a8072811..000000000000
--- a/net-analyzer/rrdtool/files/rrdtool-1.2.28-revert-font-fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-=== 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 {
-