summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2016-04-23 13:41:04 +0200
committerJeroen Roovers <jer@gentoo.org>2016-04-23 13:41:04 +0200
commit155ba315e1496a3cb6288928025c77a151ff139a (patch)
treeb2d48a4008ccf7f1f6396c8046067000340be444 /net-analyzer/rrdtool/files
parentnet-analyzer/rrdtool-bindings: Version bump. (diff)
downloadgentoo-155ba315e1496a3cb6288928025c77a151ff139a.tar.gz
gentoo-155ba315e1496a3cb6288928025c77a151ff139a.tar.bz2
gentoo-155ba315e1496a3cb6288928025c77a151ff139a.zip
net-analyzer/rrdtool: Old.
Package-Manager: portage-2.2.28
Diffstat (limited to 'net-analyzer/rrdtool/files')
-rw-r--r--net-analyzer/rrdtool/files/rrdtool-1.4.8-disable-rrd_graph.patch227
-rw-r--r--net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-lua.patch52
-rw-r--r--net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-python.patch64
-rw-r--r--net-analyzer/rrdtool/files/rrdtool-1.5.3-rrd_rados.h24
-rw-r--r--net-analyzer/rrdtool/files/rrdtool-1.5.3-rrdrados.pod68
-rw-r--r--net-analyzer/rrdtool/files/rrdtool-1.5.4-rrdrados.pod68
6 files changed, 0 insertions, 503 deletions
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.4.8-disable-rrd_graph.patch b/net-analyzer/rrdtool/files/rrdtool-1.4.8-disable-rrd_graph.patch
deleted file mode 100644
index 24c264e920d3..000000000000
--- a/net-analyzer/rrdtool/files/rrdtool-1.4.8-disable-rrd_graph.patch
+++ /dev/null
@@ -1,227 +0,0 @@
---- a/bindings/perl-shared/RRDs.xs
-+++ b/bindings/perl-shared/RRDs.xs
-@@ -189,6 +189,7 @@
- OUTPUT:
- RETVAL
-
-+#ifdef HAVE_RRD_GRAPH
- SV *
- rrd_graph(...)
- PROTOTYPE: @
-@@ -235,6 +236,8 @@
- PUSHs(sv_2mortal(newSViv(xsize)));
- PUSHs(sv_2mortal(newSViv(ysize)));
-
-+#endif /* HAVE_RRD_GRAPH */
-+
- SV *
- rrd_fetch(...)
- PROTOTYPE: @
-@@ -313,6 +316,7 @@
- PUSHs(sv_2mortal(newSVuv(start_tmp)));
- PUSHs(sv_2mortal(newSVuv(end_tmp)));
-
-+#ifdef HAVE_RRD_GRAPH
- int
- rrd_xport(...)
- PROTOTYPE: @
-@@ -371,6 +375,8 @@
- PUSHs(sv_2mortal(newRV_noinc((SV*)names)));
- PUSHs(sv_2mortal(newRV_noinc((SV*)retar)));
-
-+#endif /* HAVE_RRD_GRAPH */
-+
- SV*
- rrd_info(...)
- PROTOTYPE: @
-@@ -397,6 +403,7 @@
- OUTPUT:
- RETVAL
-
-+#ifdef HAVE_RRD_GRAPH
- SV*
- rrd_graphv(...)
- PROTOTYPE: @
-@@ -410,6 +417,8 @@
- OUTPUT:
- RETVAL
-
-+#endif /* HAVE_RRD_GRAPH */
-+
- int
- rrd_dump(...)
- PROTOTYPE: @
---- a/bindings/lua/rrdlua.c
-+++ b/bindings/lua/rrdlua.c
-@@ -267,6 +267,7 @@
- return 1;
- }
-
-+#ifdef HAVE_RRD_GRAPH
- static int
- lua_rrd_graph (lua_State * L)
- {
-@@ -291,6 +292,7 @@
- rrd_freemem(calcpr);
- return 3;
- }
-+#endif /* HAVE_RRD_GRAPH */
-
- static int
- lua_rrd_flushcached(lua_State *L)
-@@ -305,11 +307,13 @@
- return lua_rrd_infocall(L, "info", rrd_info);
- }
-
-+#ifdef HAVE_RRD_GRAPH
- static int
- lua_rrd_graphv (lua_State * L)
- {
- return lua_rrd_infocall(L, "graphv", rrd_graph_v);
- }
-+#endif /* HAVE_RRD_GRAPH */
-
- static int
- lua_rrd_updatev (lua_State * L)
-@@ -347,7 +351,9 @@
- {"dump", lua_rrd_dump},
- {"fetch", lua_rrd_fetch},
- {"first", lua_rrd_first},
-+#ifdef HAVE_RRD_GRAPH
- {"graph", lua_rrd_graph},
-+#endif /* HAVE_RRD_GRAPH */
- {"last", lua_rrd_last},
- {"resize", lua_rrd_resize},
- {"restore", lua_rrd_restore},
-@@ -357,7 +363,9 @@
- #if defined(DINF)
- {"info", lua_rrd_info},
- {"updatev", lua_rrd_updatev},
-+#ifdef HAVE_RRD_GRAPH
- {"graphv", lua_rrd_graphv},
-+#endif /* HAVE_RRD_GRAPH */
- #endif
- {NULL, NULL}
- };
---- a/bindings/python/rrdtoolmodule.c
-+++ b/bindings/python/rrdtoolmodule.c
-@@ -261,6 +261,7 @@
- return r;
- }
-
-+#ifdef HAVE_RRD_GRAPH
- static char PyRRD_graph__doc__[] =
- "graph(args..): Create a graph based on data from one or several RRD\n"
- " graph filename [-s|--start seconds] "
-@@ -327,6 +328,7 @@
- destroy_args(&argv);
- return r;
- }
-+#endif /* HAVE_RRD_GRAPH */
-
- static char PyRRD_tune__doc__[] =
- "tune(args...): Modify some basic properties of a Round Robin Database\n"
-@@ -503,6 +505,7 @@
- return r;
- }
-
-+#ifdef HAVE_RRD_GRAPH
- static char PyRRD_graphv__doc__[] =
- "graphv is called in the same manner as graph";
-
-@@ -530,6 +533,7 @@
- destroy_args(&argv);
- return r;
- }
-+#endif /* HAVE_RRD_GRAPH */
-
- static char PyRRD_updatev__doc__[] =
- "updatev is called in the same manner as update";
-@@ -587,6 +591,7 @@
- return r;
- }
-
-+#ifdef HAVE_RRD_GRAPH
- static char PyRRD_xport__doc__[] =
- "xport(args..): dictionary representation of data stored in RRDs\n"
- " [-s|--start seconds] [-e|--end seconds] [-m|--maxrows rows]"
-@@ -664,6 +669,7 @@
- destroy_args(&argv);
- return r;
- }
-+#endif /* HAVE_RRD_GRAPH */
-
- /* List of methods defined in the module */
- #define meth(name, func, doc) {name, (PyCFunction)func, METH_VARARGS, doc}
-@@ -672,16 +678,22 @@
- meth("create", PyRRD_create, PyRRD_create__doc__),
- meth("update", PyRRD_update, PyRRD_update__doc__),
- meth("fetch", PyRRD_fetch, PyRRD_fetch__doc__),
-+#ifdef HAVE_RRD_GRAPH
- meth("graph", PyRRD_graph, PyRRD_graph__doc__),
-+#endif /* HAVE_RRD_GRAPH */
- meth("tune", PyRRD_tune, PyRRD_tune__doc__),
- meth("first", PyRRD_first, PyRRD_first__doc__),
- meth("last", PyRRD_last, PyRRD_last__doc__),
- meth("resize", PyRRD_resize, PyRRD_resize__doc__),
- meth("info", PyRRD_info, PyRRD_info__doc__),
-+#ifdef HAVE_RRD_GRAPH
- meth("graphv", PyRRD_graphv, PyRRD_graphv__doc__),
-+#endif /* HAVE_RRD_GRAPH */
- meth("updatev", PyRRD_updatev, PyRRD_updatev__doc__),
- meth("flushcached", PyRRD_flushcached, PyRRD_flushcached__doc__),
-+#ifdef HAVE_RRD_GRAPH
- meth("xport", PyRRD_xport, PyRRD_xport__doc__),
-+#endif /* HAVE_RRD_GRAPH */
- {NULL, NULL, 0, NULL}
- };
-
---- a/src/rrd_cgi.c
-+++ b/src/rrd_cgi.c
-@@ -56,6 +56,7 @@
- const char **);
-
- /* call rrd_graph and insert appropriate image tag */
-+#ifdef HAVE_RRD_GRAPH
- char *drawgraph(
- long,
- const char **);
-@@ -64,6 +65,7 @@
- char *drawprint(
- long,
- const char **);
-+#endif /* HAVE_RRD_GRAPH */
-
- /* pretty-print the <last></last> value for some.rrd via strftime() */
- char *printtimelast(
-@@ -542,9 +544,13 @@
- }
- parse(&buffer, i, "<RRD::GETVAR", rrdgetvar);
- parse(&buffer, i, "<RRD::GOODFOR", rrdgoodfor);
-+#ifdef HAVE_RRD_GRAPH
- parse(&buffer, i, "<RRD::GRAPH", drawgraph);
-+#endif /* HAVE_RRD_GRAPH */
- parse(&buffer, i, "<RRD::INCLUDE", includefile);
-+#ifdef HAVE_RRD_GRAPH
- parse(&buffer, i, "<RRD::PRINT", drawprint);
-+#endif /* HAVE_RRD_GRAPH */
- parse(&buffer, i, "<RRD::SETCONSTVAR", rrdsetvarconst);
- parse(&buffer, i, "<RRD::SETENV", rrdsetenv);
- parse(&buffer, i, "<RRD::SETVAR", rrdsetvar);
-@@ -929,7 +935,7 @@
- }
-
-
--
-+#ifdef HAVE_RRD_GRAPH
- char *drawgraph(
- long argc,
- const char **args)
-@@ -961,6 +967,7 @@
- }
- return NULL;
- }
-+#endif /* HAVE_RRD_GRAPH */
-
- char *drawprint(
- long argc,
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-lua.patch b/net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-lua.patch
deleted file mode 100644
index be8095c438b4..000000000000
--- a/net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-lua.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- a/bindings/lua/rrdlua.c
-+++ b/bindings/lua/rrdlua.c
-@@ -267,6 +267,7 @@
- return 1;
- }
-
-+#ifdef HAVE_RRD_GRAPH
- static int
- lua_rrd_graph (lua_State * L)
- {
-@@ -291,6 +292,7 @@
- rrd_freemem(calcpr);
- return 3;
- }
-+#endif /* HAVE_RRD_GRAPH */
-
- static int
- lua_rrd_flushcached(lua_State *L)
-@@ -305,11 +307,13 @@
- return lua_rrd_infocall(L, "info", rrd_info);
- }
-
-+#ifdef HAVE_RRD_GRAPH
- static int
- lua_rrd_graphv (lua_State * L)
- {
- return lua_rrd_infocall(L, "graphv", rrd_graph_v);
- }
-+#endif /* HAVE_RRD_GRAPH */
-
- static int
- lua_rrd_updatev (lua_State * L)
-@@ -347,7 +351,9 @@
- {"dump", lua_rrd_dump},
- {"fetch", lua_rrd_fetch},
- {"first", lua_rrd_first},
-+#ifdef HAVE_RRD_GRAPH
- {"graph", lua_rrd_graph},
-+#endif /* HAVE_RRD_GRAPH */
- {"last", lua_rrd_last},
- {"resize", lua_rrd_resize},
- {"restore", lua_rrd_restore},
-@@ -357,7 +363,9 @@
- #if defined(DINF)
- {"info", lua_rrd_info},
- {"updatev", lua_rrd_updatev},
-+#ifdef HAVE_RRD_GRAPH
- {"graphv", lua_rrd_graphv},
-+#endif /* HAVE_RRD_GRAPH */
- #endif
- {NULL, NULL}
- };
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-python.patch b/net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-python.patch
deleted file mode 100644
index 72be8163330f..000000000000
--- a/net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-python.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- a/bindings/python/rrdtoolmodule.c
-+++ b/bindings/python/rrdtoolmodule.c
-@@ -261,6 +261,7 @@
- return r;
- }
-
-+#ifdef HAVE_RRD_GRAPH
- static char PyRRD_graph__doc__[] =
- "graph(args..): Create a graph based on data from one or several RRD\n"
- " graph filename [-s|--start seconds] "
-@@ -327,6 +328,7 @@
- destroy_args(&argv);
- return r;
- }
-+#endif /* HAVE_RRD_GRAPH */
-
- static char PyRRD_tune__doc__[] =
- "tune(args...): Modify some basic properties of a Round Robin Database\n"
-@@ -503,6 +505,7 @@
- return r;
- }
-
-+#ifdef HAVE_RRD_GRAPH
- static char PyRRD_graphv__doc__[] =
- "graphv is called in the same manner as graph";
-
-@@ -530,6 +533,7 @@
- destroy_args(&argv);
- return r;
- }
-+#endif /* HAVE_RRD_GRAPH */
-
- static char PyRRD_updatev__doc__[] =
- "updatev is called in the same manner as update";
-@@ -587,6 +591,7 @@
- return r;
- }
-
-+#ifdef HAVE_RRD_GRAPH
- static char PyRRD_xport__doc__[] =
- "xport(args..): dictionary representation of data stored in RRDs\n"
- " [-s|--start seconds] [-e|--end seconds] [-m|--maxrows rows]"
-@@ -664,6 +669,7 @@
- destroy_args(&argv);
- return r;
- }
-+#endif /* HAVE_RRD_GRAPH */
-
- /* List of methods defined in the module */
- #define meth(name, func, doc) {name, (PyCFunction)func, METH_VARARGS, doc}
-@@ -677,11 +683,11 @@
- meth("last", PyRRD_last, PyRRD_last__doc__),
- meth("resize", PyRRD_resize, PyRRD_resize__doc__),
- meth("info", PyRRD_info, PyRRD_info__doc__),
--#ifdef HAVE_RRD_GRAPH
-+#ifdef HAVE_RRD_GRAPH
- meth("graph", PyRRD_graph, PyRRD_graph__doc__),
- meth("graphv", PyRRD_graphv, PyRRD_graphv__doc__),
- meth("xport", PyRRD_xport, PyRRD_xport__doc__),
--#endif
-+#endif /* HAVE_RRD_GRAPH */
- meth("updatev", PyRRD_updatev, PyRRD_updatev__doc__),
- meth("flushcached", PyRRD_flushcached, PyRRD_flushcached__doc__),
- {NULL, NULL, 0, NULL}
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.5.3-rrd_rados.h b/net-analyzer/rrdtool/files/rrdtool-1.5.3-rrd_rados.h
deleted file mode 100644
index 135536af1c72..000000000000
--- a/net-analyzer/rrdtool/files/rrdtool-1.5.3-rrd_rados.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef RRD_RADOS_H
-#define RRD_RADOS_H
-
-#include <rados/librados.h>
-
-#include "rrd_tool.h"
-
-typedef struct rrd_rados_t {
- rados_t cluster;
- rados_ioctx_t ioctx;
- const char *oid;
- rados_write_op_t write_op;
- int lock;
-} rrd_rados_t;
-
-rrd_rados_t* rrd_rados_open(const char *oid);
-int rrd_rados_close(rrd_rados_t *rrd_rados);
-int rrd_rados_create(const char *oid, rrd_t *rrd);
-size_t rrd_rados_read(rrd_rados_t *rrd_rados, void *data, size_t len, uint64_t offset);
-size_t rrd_rados_write(rrd_rados_t *rrd_rados, const void *data, size_t len, uint64_t offset);
-int rrd_rados_flush(rrd_rados_t *rrd_rados);
-int rrd_rados_lock(rrd_rados_t *rrd_rados);
-
-#endif
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.5.3-rrdrados.pod b/net-analyzer/rrdtool/files/rrdtool-1.5.3-rrdrados.pod
deleted file mode 100644
index 0c645548a202..000000000000
--- a/net-analyzer/rrdtool/files/rrdtool-1.5.3-rrdrados.pod
+++ /dev/null
@@ -1,68 +0,0 @@
-=head1 NAME
-
-rrdrados - Creating, updating and retrieving RRD files from Ceph
-
-=head1 SYNOPSIS
-
-E<lt>rrdfileE<gt> = B<ceph//E<lt>nameE<gt>>
-
-
-=head1 DESCRIPTION
-
-This module adds support for creating, updating and retrieving RRD files
-directly from a Ceph cluster using librados.
-
-It adds a ceph// prefix to RRD file name which is used to instruct rrdtool to
-operate on a file that is stored in Ceph.
-
-Currently the module expects to find the Ceph configuration file in the default
-location at /etc/ceph/ceph.conf. By default it uses Ceph client ID "admin" and a
-Ceph pool named "rrd".
-
-
-=head1 ENVIRONMENT VARIABLES
-
-=over 4
-
-=item B<CEPH_ID>
-
-Sets the Ceph Client ID to use when connecting. By default the client ID "admin"
-is used.
-
-=item B<CEPH_POOL>
-
-Sets the name of the Ceph Pool to connect to. By default, the pool "rrd" is
-used.
-
-=back
-
-
-=head1 EXAMPLES
-
-B<Creating an RRD file on Ceph>
-
- rrdtool create ceph//temperature.rrd --step 300 \
- DS:temp:GAUGE:600:-273:5000 \
- RRA:AVERAGE:0.5:1:1200 \
- RRA:MIN:0.5:12:2400 \
- RRA:MAX:0.5:12:2400 \
- RRA:AVERAGE:0.5:12:2400
-
-
-B<Importing an existing RRD into Ceph>
-
- rrdtool dump existing.rrd | rrdtool restore - ceph//new.rrd
-
-Or you could also copy the RRD file directly into Ceph using the rados command
-line utility.
-
-
-B<Retrieving RRD data from Ceph>
-
- rrdtool fetch ceph//file.rrd AVERAGE
-
-
-=head1 AUTHOR
-
-Simon Boulet E<lt>simon@nostalgeek.comE<gt>
-
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.5.4-rrdrados.pod b/net-analyzer/rrdtool/files/rrdtool-1.5.4-rrdrados.pod
deleted file mode 100644
index 0c645548a202..000000000000
--- a/net-analyzer/rrdtool/files/rrdtool-1.5.4-rrdrados.pod
+++ /dev/null
@@ -1,68 +0,0 @@
-=head1 NAME
-
-rrdrados - Creating, updating and retrieving RRD files from Ceph
-
-=head1 SYNOPSIS
-
-E<lt>rrdfileE<gt> = B<ceph//E<lt>nameE<gt>>
-
-
-=head1 DESCRIPTION
-
-This module adds support for creating, updating and retrieving RRD files
-directly from a Ceph cluster using librados.
-
-It adds a ceph// prefix to RRD file name which is used to instruct rrdtool to
-operate on a file that is stored in Ceph.
-
-Currently the module expects to find the Ceph configuration file in the default
-location at /etc/ceph/ceph.conf. By default it uses Ceph client ID "admin" and a
-Ceph pool named "rrd".
-
-
-=head1 ENVIRONMENT VARIABLES
-
-=over 4
-
-=item B<CEPH_ID>
-
-Sets the Ceph Client ID to use when connecting. By default the client ID "admin"
-is used.
-
-=item B<CEPH_POOL>
-
-Sets the name of the Ceph Pool to connect to. By default, the pool "rrd" is
-used.
-
-=back
-
-
-=head1 EXAMPLES
-
-B<Creating an RRD file on Ceph>
-
- rrdtool create ceph//temperature.rrd --step 300 \
- DS:temp:GAUGE:600:-273:5000 \
- RRA:AVERAGE:0.5:1:1200 \
- RRA:MIN:0.5:12:2400 \
- RRA:MAX:0.5:12:2400 \
- RRA:AVERAGE:0.5:12:2400
-
-
-B<Importing an existing RRD into Ceph>
-
- rrdtool dump existing.rrd | rrdtool restore - ceph//new.rrd
-
-Or you could also copy the RRD file directly into Ceph using the rados command
-line utility.
-
-
-B<Retrieving RRD data from Ceph>
-
- rrdtool fetch ceph//file.rrd AVERAGE
-
-
-=head1 AUTHOR
-
-Simon Boulet E<lt>simon@nostalgeek.comE<gt>
-