1 |
jer 14/10/04 09:35:02 |
2 |
|
3 |
Added: rrdtool-1.4.9-disable-rrd_graph-perl.patch |
4 |
rrdtool-1.4.9-disable-rrd_graph-lua.patch |
5 |
rrdtool-1.4.9-disable-rrd_graph-cgi.patch |
6 |
rrdtool-1.4.9-disable-rrd_graph-python.patch |
7 |
Log: |
8 |
Version bump. |
9 |
|
10 |
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key A792A613) |
11 |
|
12 |
Revision Changes Path |
13 |
1.1 net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-perl.patch |
14 |
|
15 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-perl.patch?rev=1.1&view=markup |
16 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-perl.patch?rev=1.1&content-type=text/plain |
17 |
|
18 |
Index: rrdtool-1.4.9-disable-rrd_graph-perl.patch |
19 |
=================================================================== |
20 |
--- a/bindings/perl-shared/RRDs.xs |
21 |
+++ b/bindings/perl-shared/RRDs.xs |
22 |
@@ -189,6 +189,7 @@ |
23 |
OUTPUT: |
24 |
RETVAL |
25 |
|
26 |
+#ifdef HAVE_RRD_GRAPH |
27 |
SV * |
28 |
rrd_graph(...) |
29 |
PROTOTYPE: @ |
30 |
@@ -235,6 +236,8 @@ |
31 |
PUSHs(sv_2mortal(newSViv(xsize))); |
32 |
PUSHs(sv_2mortal(newSViv(ysize))); |
33 |
|
34 |
+#endif /* HAVE_RRD_GRAPH */ |
35 |
+ |
36 |
SV * |
37 |
rrd_fetch(...) |
38 |
PROTOTYPE: @ |
39 |
@@ -313,6 +316,7 @@ |
40 |
PUSHs(sv_2mortal(newSVuv(start_tmp))); |
41 |
PUSHs(sv_2mortal(newSVuv(end_tmp))); |
42 |
|
43 |
+#ifdef HAVE_RRD_GRAPH |
44 |
int |
45 |
rrd_xport(...) |
46 |
PROTOTYPE: @ |
47 |
@@ -371,6 +375,8 @@ |
48 |
PUSHs(sv_2mortal(newRV_noinc((SV*)names))); |
49 |
PUSHs(sv_2mortal(newRV_noinc((SV*)retar))); |
50 |
|
51 |
+#endif /* HAVE_RRD_GRAPH */ |
52 |
+ |
53 |
SV* |
54 |
rrd_info(...) |
55 |
PROTOTYPE: @ |
56 |
@@ -397,6 +403,7 @@ |
57 |
OUTPUT: |
58 |
RETVAL |
59 |
|
60 |
+#ifdef HAVE_RRD_GRAPH |
61 |
SV* |
62 |
rrd_graphv(...) |
63 |
PROTOTYPE: @ |
64 |
@@ -410,6 +417,8 @@ |
65 |
OUTPUT: |
66 |
RETVAL |
67 |
|
68 |
+#endif /* HAVE_RRD_GRAPH */ |
69 |
+ |
70 |
int |
71 |
rrd_dump(...) |
72 |
PROTOTYPE: @ |
73 |
|
74 |
|
75 |
|
76 |
1.1 net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-lua.patch |
77 |
|
78 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-lua.patch?rev=1.1&view=markup |
79 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-lua.patch?rev=1.1&content-type=text/plain |
80 |
|
81 |
Index: rrdtool-1.4.9-disable-rrd_graph-lua.patch |
82 |
=================================================================== |
83 |
--- a/bindings/lua/rrdlua.c |
84 |
+++ b/bindings/lua/rrdlua.c |
85 |
@@ -267,6 +267,7 @@ |
86 |
return 1; |
87 |
} |
88 |
|
89 |
+#ifdef HAVE_RRD_GRAPH |
90 |
static int |
91 |
lua_rrd_graph (lua_State * L) |
92 |
{ |
93 |
@@ -291,6 +292,7 @@ |
94 |
rrd_freemem(calcpr); |
95 |
return 3; |
96 |
} |
97 |
+#endif /* HAVE_RRD_GRAPH */ |
98 |
|
99 |
static int |
100 |
lua_rrd_flushcached(lua_State *L) |
101 |
@@ -305,11 +307,13 @@ |
102 |
return lua_rrd_infocall(L, "info", rrd_info); |
103 |
} |
104 |
|
105 |
+#ifdef HAVE_RRD_GRAPH |
106 |
static int |
107 |
lua_rrd_graphv (lua_State * L) |
108 |
{ |
109 |
return lua_rrd_infocall(L, "graphv", rrd_graph_v); |
110 |
} |
111 |
+#endif /* HAVE_RRD_GRAPH */ |
112 |
|
113 |
static int |
114 |
lua_rrd_updatev (lua_State * L) |
115 |
@@ -347,7 +351,9 @@ |
116 |
{"dump", lua_rrd_dump}, |
117 |
{"fetch", lua_rrd_fetch}, |
118 |
{"first", lua_rrd_first}, |
119 |
+#ifdef HAVE_RRD_GRAPH |
120 |
{"graph", lua_rrd_graph}, |
121 |
+#endif /* HAVE_RRD_GRAPH */ |
122 |
{"last", lua_rrd_last}, |
123 |
{"resize", lua_rrd_resize}, |
124 |
{"restore", lua_rrd_restore}, |
125 |
@@ -357,7 +363,9 @@ |
126 |
#if defined(DINF) |
127 |
{"info", lua_rrd_info}, |
128 |
{"updatev", lua_rrd_updatev}, |
129 |
+#ifdef HAVE_RRD_GRAPH |
130 |
{"graphv", lua_rrd_graphv}, |
131 |
+#endif /* HAVE_RRD_GRAPH */ |
132 |
#endif |
133 |
{NULL, NULL} |
134 |
}; |
135 |
|
136 |
|
137 |
|
138 |
1.1 net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-cgi.patch |
139 |
|
140 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-cgi.patch?rev=1.1&view=markup |
141 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-cgi.patch?rev=1.1&content-type=text/plain |
142 |
|
143 |
Index: rrdtool-1.4.9-disable-rrd_graph-cgi.patch |
144 |
=================================================================== |
145 |
--- a/src/rrd_cgi.c |
146 |
+++ b/src/rrd_cgi.c |
147 |
@@ -56,6 +56,7 @@ |
148 |
const char **); |
149 |
|
150 |
/* call rrd_graph and insert appropriate image tag */ |
151 |
+#ifdef HAVE_RRD_GRAPH |
152 |
char *drawgraph( |
153 |
long, |
154 |
const char **); |
155 |
@@ -64,6 +65,7 @@ |
156 |
char *drawprint( |
157 |
long, |
158 |
const char **); |
159 |
+#endif /* HAVE_RRD_GRAPH */ |
160 |
|
161 |
/* pretty-print the <last></last> value for some.rrd via strftime() */ |
162 |
char *printtimelast( |
163 |
@@ -542,9 +544,13 @@ |
164 |
} |
165 |
parse(&buffer, i, "<RRD::GETVAR", rrdgetvar); |
166 |
parse(&buffer, i, "<RRD::GOODFOR", rrdgoodfor); |
167 |
+#ifdef HAVE_RRD_GRAPH |
168 |
parse(&buffer, i, "<RRD::GRAPH", drawgraph); |
169 |
+#endif /* HAVE_RRD_GRAPH */ |
170 |
parse(&buffer, i, "<RRD::INCLUDE", includefile); |
171 |
+#ifdef HAVE_RRD_GRAPH |
172 |
parse(&buffer, i, "<RRD::PRINT", drawprint); |
173 |
+#endif /* HAVE_RRD_GRAPH */ |
174 |
parse(&buffer, i, "<RRD::SETCONSTVAR", rrdsetvarconst); |
175 |
parse(&buffer, i, "<RRD::SETENV", rrdsetenv); |
176 |
parse(&buffer, i, "<RRD::SETVAR", rrdsetvar); |
177 |
@@ -929,7 +935,7 @@ |
178 |
} |
179 |
|
180 |
|
181 |
- |
182 |
+#ifdef HAVE_RRD_GRAPH |
183 |
char *drawgraph( |
184 |
long argc, |
185 |
const char **args) |
186 |
@@ -961,6 +967,7 @@ |
187 |
} |
188 |
return NULL; |
189 |
} |
190 |
+#endif /* HAVE_RRD_GRAPH */ |
191 |
|
192 |
char *drawprint( |
193 |
long argc, |
194 |
|
195 |
|
196 |
|
197 |
1.1 net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-python.patch |
198 |
|
199 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-python.patch?rev=1.1&view=markup |
200 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-python.patch?rev=1.1&content-type=text/plain |
201 |
|
202 |
Index: rrdtool-1.4.9-disable-rrd_graph-python.patch |
203 |
=================================================================== |
204 |
--- a/bindings/python/rrdtoolmodule.c |
205 |
+++ b/bindings/python/rrdtoolmodule.c |
206 |
@@ -261,6 +261,7 @@ |
207 |
return r; |
208 |
} |
209 |
|
210 |
+#ifdef HAVE_RRD_GRAPH |
211 |
static char PyRRD_graph__doc__[] = |
212 |
"graph(args..): Create a graph based on data from one or several RRD\n" |
213 |
" graph filename [-s|--start seconds] " |
214 |
@@ -327,6 +328,7 @@ |
215 |
destroy_args(&argv); |
216 |
return r; |
217 |
} |
218 |
+#endif /* HAVE_RRD_GRAPH */ |
219 |
|
220 |
static char PyRRD_tune__doc__[] = |
221 |
"tune(args...): Modify some basic properties of a Round Robin Database\n" |
222 |
@@ -503,6 +505,7 @@ |
223 |
return r; |
224 |
} |
225 |
|
226 |
+#ifdef HAVE_RRD_GRAPH |
227 |
static char PyRRD_graphv__doc__[] = |
228 |
"graphv is called in the same manner as graph"; |
229 |
|
230 |
@@ -530,6 +533,7 @@ |
231 |
destroy_args(&argv); |
232 |
return r; |
233 |
} |
234 |
+#endif /* HAVE_RRD_GRAPH */ |
235 |
|
236 |
static char PyRRD_updatev__doc__[] = |
237 |
"updatev is called in the same manner as update"; |
238 |
@@ -587,6 +591,7 @@ |
239 |
return r; |
240 |
} |
241 |
|
242 |
+#ifdef HAVE_RRD_GRAPH |
243 |
static char PyRRD_xport__doc__[] = |
244 |
"xport(args..): dictionary representation of data stored in RRDs\n" |
245 |
" [-s|--start seconds] [-e|--end seconds] [-m|--maxrows rows]" |
246 |
@@ -664,6 +669,7 @@ |
247 |
destroy_args(&argv); |
248 |
return r; |
249 |
} |
250 |
+#endif /* HAVE_RRD_GRAPH */ |
251 |
|
252 |
/* List of methods defined in the module */ |
253 |
#define meth(name, func, doc) {name, (PyCFunction)func, METH_VARARGS, doc} |
254 |
@@ -677,11 +683,11 @@ |
255 |
meth("last", PyRRD_last, PyRRD_last__doc__), |
256 |
meth("resize", PyRRD_resize, PyRRD_resize__doc__), |
257 |
meth("info", PyRRD_info, PyRRD_info__doc__), |
258 |
-#ifdef HAVE_RRD_GRAPH |
259 |
+#ifdef HAVE_RRD_GRAPH |
260 |
meth("graph", PyRRD_graph, PyRRD_graph__doc__), |
261 |
meth("graphv", PyRRD_graphv, PyRRD_graphv__doc__), |
262 |
meth("xport", PyRRD_xport, PyRRD_xport__doc__), |
263 |
-#endif |
264 |
+#endif /* HAVE_RRD_GRAPH */ |
265 |
meth("updatev", PyRRD_updatev, PyRRD_updatev__doc__), |
266 |
meth("flushcached", PyRRD_flushcached, PyRRD_flushcached__doc__), |
267 |
{NULL, NULL, 0, NULL} |