From 7cc9e1cfa6a27840682e92354d4ef8cf2d57bca5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 1 Jul 2013 11:10:06 +0200 Subject: [PATCH] Minor doc / man fixes --- rrdtool-1.4.8-doc-fix.patch | 286 ++++++++++++++++++++++++++++++++++++ rrdtool.spec | 8 +- 2 files changed, 293 insertions(+), 1 deletion(-) create mode 100644 rrdtool-1.4.8-doc-fix.patch diff --git a/rrdtool-1.4.8-doc-fix.patch b/rrdtool-1.4.8-doc-fix.patch new file mode 100644 index 0000000..2f593db --- /dev/null +++ b/rrdtool-1.4.8-doc-fix.patch @@ -0,0 +1,286 @@ +diff -up rrdtool-1.4.8/doc/rrdtool.html.orig4 rrdtool-1.4.8/doc/rrdtool.html +--- rrdtool-1.4.8/doc/rrdtool.html.orig4 2013-05-23 09:55:51.000000000 +0200 ++++ rrdtool-1.4.8/doc/rrdtool.html 2013-07-01 10:51:11.150276130 +0200 +@@ -105,6 +105,12 @@ PHP, etc.

+

Create a graph from data stored in one or several RRDs. Apart from + generating graphs, data can also be extracted to stdout. Check the rrdgraph manpage.

+ ++
graphv
++ ++
++

Create a graph from data stored in one or several RRDs. Same as graph, but ++metadata are printed before the graph. Check the rrdgraph manpage.

++
+
dump
+ +
+@@ -128,17 +134,28 @@ uses fetch to retrieve its data from an +
+

Alter setup of an RRD. Check the rrdtune manpage.

+
++
first
++ ++
++

Find the first update time of an RRD. Check the rrdfirst manpage.

++
+
last
+ +
+

Find the last update time of an RRD. Check the rrdlast manpage.

+
++
lastupdate
++ ++
++

Find the last update time of an RRD. It also returns the value stored for each ++datum in the most recent update. Check the rrdlastupdate manpage.

++
+
info
+ +
+

Get information about an RRD. Check the rrdinfo manpage.

+
+-
rrdresize
++
resize
+ +
+

Change the size of individual RRAs. This is dangerous! Check the rrdresize manpage.

+@@ -153,12 +170,6 @@ uses fetch to retrieve its data from an +
+

Flush the values for a specific RRD file from memory. Check the rrdflushcached manpage.

+
+-
rrdcgi
+- +-
+-

This is a standalone tool for producing RRD graphs on the fly. Check +-the rrdcgi manpage.

+-
+ +

+

+diff -up rrdtool-1.4.8/doc/rrdtool.pod.orig4 rrdtool-1.4.8/doc/rrdtool.pod +--- rrdtool-1.4.8/doc/rrdtool.pod.orig4 2013-05-23 09:55:07.000000000 +0200 ++++ rrdtool-1.4.8/doc/rrdtool.pod 2013-07-01 10:53:44.366207403 +0200 +@@ -58,6 +58,11 @@ Operationally equivalent to B ex + Create a graph from data stored in one or several RRDs. Apart from + generating graphs, data can also be extracted to stdout. Check L. + ++=item B ++ ++Create a graph from data stored in one or several RRDs. Same as graph, but ++metadata are printed before the graph. Check L. ++ + =item B + + Dump the contents of an RRD in plain ASCII. In connection with restore +@@ -77,15 +82,24 @@ uses fetch to retrieve its data from an + + Alter setup of an RRD. Check L. + ++=item B ++ ++Find the first update time of an RRD. Check L. ++ + =item B + + Find the last update time of an RRD. Check L. + ++=item B ++ ++Find the last update time of an RRD. It also returns the value stored ++for each datum in the most recent update. Check L. ++ + =item B + + Get information about an RRD. Check L. + +-=item B ++=item B + + Change the size of individual RRAs. This is dangerous! Check L. + +@@ -97,11 +111,6 @@ Export data retrieved from one or severa + + Flush the values for a specific RRD file from memory. Check L. + +-=item B +- +-This is a standalone tool for producing RRD graphs on the fly. Check +-L. +- + =back + + =head2 HOW DOES RRDTOOL WORK? +diff -up rrdtool-1.4.8/doc/rrdtool.txt.orig4 rrdtool-1.4.8/doc/rrdtool.txt +--- rrdtool-1.4.8/doc/rrdtool.txt.orig4 2013-05-23 09:55:56.000000000 +0200 ++++ rrdtool-1.4.8/doc/rrdtool.txt 2013-07-01 10:59:33.167060537 +0200 +@@ -48,6 +48,10 @@ DDEESSCCRRIIPPTTIIOONN + from generating graphs, data can also be extracted to stdout. + Check rrdgraph. + ++ ggrraapphhvv Create a graph from data stored in one or several RRDs. Same as graph, but ++ metadata are printed before the graph.. ++ Check rrdgraph. ++ + dduummpp Dump the contents of an RRD in plain ASCII. In connection with + restore you can use this to move an RRD from one computer + architecture to another. Check rrddump. +@@ -60,11 +64,17 @@ DDEESSCCRRIIPPTTIIOONN + + ttuunnee Alter setup of an RRD. Check rrdtune. + ++ ffiirrsstt Find the first update time of an RRD. Check rrdfirst. ++ + llaasstt Find the last update time of an RRD. Check rrdlast. + ++ llaassttuuppddaattee Find the last update time of an RRD. ++ It also returns the value stored for each datum in the most recent update. ++ Check rrdlastupdate. ++ + iinnffoo Get information about an RRD. Check rrdinfo. + +- rrrrddrreessiizzee ++ rreessiizzee + Change the size of individual RRAs. This is dangerous! Check + rrdresize. + +@@ -74,9 +84,6 @@ DDEESSCCRRIIPPTTIIOONN + Flush the values for a specific RRD file from memory. Check + rrdflushcached. + +- rrrrddccggii This is a standalone tool for producing RRD graphs on the fly. +- Check rrdcgi. +- + HHOOWW DDOOEESS RRRRDDTTOOOOLL WWOORRKK?? + Data Acquisition + When monitoring the state of a system, it is convenient to have +diff -up rrdtool-1.4.8/doc/rrdtool.1.orig4 rrdtool-1.4.8/doc/rrdtool.1 +--- rrdtool-1.4.8/doc/rrdtool.1.orig4 2013-05-23 09:55:53.000000000 +0200 ++++ rrdtool-1.4.8/doc/rrdtool.1 2013-07-01 10:51:26.645269268 +0200 +@@ -178,6 +178,10 @@ Operationally equivalent to \fBupdate\fR + .IX Item "graph" + Create a graph from data stored in one or several RRDs. Apart from + generating graphs, data can also be extracted to stdout. Check rrdgraph. ++.IP "\fBgraphv\fR" 8 ++.IX Item "graphv" ++Create a graph from data stored in one or several RRDs. Same as graph, but ++metadata are printed before the graph. Check rrdgraph. + .IP "\fBdump\fR" 8 + .IX Item "dump" + Dump the contents of an \s-1RRD\s0 in plain \s-1ASCII\s0. In connection with restore +@@ -193,13 +197,20 @@ uses fetch to retrieve its data from an + .IP "\fBtune\fR" 8 + .IX Item "tune" + Alter setup of an \s-1RRD\s0. Check rrdtune. ++.IP "\fBfirst\fR" 8 ++.IX Item "first" ++Find the first update time of an \s-1RRD\s0. Check rrdfirst. + .IP "\fBlast\fR" 8 + .IX Item "last" + Find the last update time of an \s-1RRD\s0. Check rrdlast. ++.IP "\fBlastupdate\fR" 8 ++.IX Item "lastupdate" ++Find the last update time of an \s-1RRD\s0. It also returns the value stored for each ++datum in the most recent update. Check rrdlastupdate. + .IP "\fBinfo\fR" 8 + .IX Item "info" + Get information about an \s-1RRD\s0. Check rrdinfo. +-.IP "\fBrrdresize\fR" 8 ++.IP "\fBresize\fR" 8 + .IX Item "rrdresize" + Change the size of individual RRAs. This is dangerous! Check rrdresize. + .IP "\fBxport\fR" 8 +@@ -208,10 +219,6 @@ Export data retrieved from one or severa + .IP "\fBflushcached\fR" 8 + .IX Item "flushcached" + Flush the values for a specific \s-1RRD\s0 file from memory. Check rrdflushcached. +-.IP "\fBrrdcgi\fR" 8 +-.IX Item "rrdcgi" +-This is a standalone tool for producing \s-1RRD\s0 graphs on the fly. Check +-rrdcgi. + .SS "\s-1HOW\s0 \s-1DOES\s0 \s-1RRDTOOL\s0 \s-1WORK\s0?" + .IX Subsection "HOW DOES RRDTOOL WORK?" + .IP "Data Acquisition" 8 +diff -up rrdtool-1.4.8/doc/rrdupdate.html.orig4 rrdtool-1.4.8/doc/rrdupdate.html +--- rrdtool-1.4.8/doc/rrdupdate.html.orig4 2013-05-23 09:55:50.000000000 +0200 ++++ rrdtool-1.4.8/doc/rrdupdate.html 2013-07-01 11:01:44.550003526 +0200 +@@ -41,7 +41,7 @@ +

SYNOPSIS

+

rrdtool {update | updatev} filename + [--template|-t ds-name[:ds-name]...] +-[--daemon address] [--] ++[--daemon|-d address] [--] + N|timestamp:value[:value...] + at-timestamp@value[:value...] + [timestamp:value[:value...] ...]

+@@ -93,7 +93,7 @@ function. If this is done accidentally ( + using the template switch), RRDtool will ignore the value specified + for the COMPUTE DST.

+ +-
--daemon address
++
--daemon|-d address
+ +
+

If given, RRDTool will try to connect to the caching daemon the rrdcached manpage +diff -up rrdtool-1.4.8/doc/rrdupdate.pod.orig4 rrdtool-1.4.8/doc/rrdupdate.pod +--- rrdtool-1.4.8/doc/rrdupdate.pod.orig4 2013-05-23 09:55:07.000000000 +0200 ++++ rrdtool-1.4.8/doc/rrdupdate.pod 2013-07-01 11:03:03.399968652 +0200 +@@ -6,7 +6,7 @@ rrdupdate - Store a new set of values in + + B {B | B} I + S<[B<--template>|B<-t> I[B<:>I]...]> +-S<[B<--daemon> I

]> [B<-->] ++S<[B<--daemon>|B<-d> I
]> [B<-->] + S|IB<:>I[B<:>I...]> + SB<@>I[B<:>I...]> + S<[IB<:>I[B<:>I...] ...]> +@@ -60,7 +60,7 @@ function. If this is done accidentally ( + using the template switch), B will ignore the value specified + for the COMPUTE B. + +-=item B<--daemon> I
++=item B<--daemon>|B<-d> I
+ + If given, B will try to connect to the caching daemon L + at I
and will fail if the connection cannot be established. If the +diff -up rrdtool-1.4.8/doc/rrdupdate.txt.orig4 rrdtool-1.4.8/doc/rrdupdate.txt +--- rrdtool-1.4.8/doc/rrdupdate.txt.orig4 2013-05-23 09:55:55.000000000 +0200 ++++ rrdtool-1.4.8/doc/rrdupdate.txt 2013-07-01 11:05:34.620978121 +0200 +@@ -7,7 +7,7 @@ NNAAMMEE + + SSYYNNOOPPSSIISS + rrrrddttooooll {uuppddaattee | uuppddaatteevv} _f_i_l_e_n_a_m_e [----tteemmppllaattee|--tt _d_s_-_n_a_m_e[::_d_s_- +- _n_a_m_e]...] [----ddaaeemmoonn _a_d_d_r_e_s_s] [----] NN|_t_i_m_e_s_t_a_m_p::_v_a_l_u_e[::_v_a_l_u_e...] _a_t_- ++ _n_a_m_e]...] [----ddaaeemmoonn|--dd _a_d_d_r_e_s_s] [----] NN|_t_i_m_e_s_t_a_m_p::_v_a_l_u_e[::_v_a_l_u_e...] _a_t_- + _t_i_m_e_s_t_a_m_p@@_v_a_l_u_e[::_v_a_l_u_e...] [_t_i_m_e_s_t_a_m_p::_v_a_l_u_e[::_v_a_l_u_e...] ...] + + DDEESSCCRRIIPPTTIIOONN +@@ -54,7 +54,7 @@ DDEESSCCRRIIPPTTIIOONN + done using the template switch), RRRRDDttooooll will ignore the value + specified for the COMPUTE DDSSTT. + +- ----ddaaeemmoonn _a_d_d_r_e_s_s ++ ----ddaaeemmoonn|--dd _a_d_d_r_e_s_s + If given, RRRRDDTTooooll will try to connect to the caching daemon + rrdcached at _a_d_d_r_e_s_s and will fail if the connection cannot be + established. If the connection is successfully established the +diff -up rrdtool-1.4.8/doc/rrdupdate.1.orig4 rrdtool-1.4.8/doc/rrdupdate.1 +--- rrdtool-1.4.8/doc/rrdupdate.1.orig4 2013-05-23 09:55:52.000000000 +0200 ++++ rrdtool-1.4.8/doc/rrdupdate.1 2013-07-01 10:43:39.179478104 +0200 +@@ -135,7 +135,7 @@ rrdupdate \- Store a new set of values i + .IX Header "SYNOPSIS" + \&\fBrrdtool\fR {\fBupdate\fR | \fBupdatev\fR} \fIfilename\fR + [\fB\-\-template\fR|\fB\-t\fR\ \fIds-name\fR[\fB:\fR\fIds-name\fR]...] +-[\fB\-\-daemon\fR\ \fIaddress\fR] [\fB\-\-\fR] ++[\fB\-\-daemon\fR|\fB\-d\fR\ \fIaddress\fR] [\fB\-\-\fR] + \&\fBN\fR|\fItimestamp\fR\fB:\fR\fIvalue\fR[\fB:\fR\fIvalue\fR...] + \&\fIat-timestamp\fR\fB@\fR\fIvalue\fR[\fB:\fR\fIvalue\fR...] + [\fItimestamp\fR\fB:\fR\fIvalue\fR[\fB:\fR\fIvalue\fR...]\ ...] +@@ -182,7 +182,7 @@ Do not specify a value for a \s-1COMPUTE + function. If this is done accidentally (and this can only be done + using the template switch), \fBRRDtool\fR will ignore the value specified + for the \s-1COMPUTE\s0 \fB\s-1DST\s0\fR. +-.IP "\fB\-\-daemon\fR \fIaddress\fR" 8 ++.IP "\fB\-\-daemon\fR|\fB\-d\fR \fIaddress\fR" 8 + .IX Item "--daemon address" + If given, \fBRRDTool\fR will try to connect to the caching daemon rrdcached + at \fIaddress\fR and will fail if the connection cannot be established. If the diff --git a/rrdtool.spec b/rrdtool.spec index 4213d0c..1d983a5 100644 --- a/rrdtool.spec +++ b/rrdtool.spec @@ -18,7 +18,7 @@ Summary: Round Robin Database Tool to store and display time-series data Name: rrdtool Version: 1.4.8 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ with exceptions Group: Applications/Databases URL: http://oss.oetiker.ch/rrdtool/ @@ -33,6 +33,8 @@ Patch4: rrdtool-1.4.7-autoconf-fix.patch Patch5: rrdtool-1.4.7-lua-5.2.patch # patch merged upstream, http://github.com/oetiker/rrdtool-1.x/pull/397 Patch6: rrdtool-1.4.8-imginfo-check.patch +# patch sent upstream +Patch7: rrdtool-1.4.8-doc-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: dejavu-sans-mono-fonts @@ -176,6 +178,7 @@ The %{name}-lua package includes RRDtool bindings for Lua. %patch4 -p1 -b .autoconf-fix %patch5 -p1 -b .lua-52 %patch6 -p1 -b .imginfo-check +%patch7 -p1 -b .doc-fix # Fix to find correct python dir on lib64 %{__perl} -pi -e 's|get_python_lib\(0,0,prefix|get_python_lib\(1,0,prefix|g' \ @@ -389,6 +392,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \ %endif %changelog +* Mon Jul 1 2013 Jaroslav Škarvada - 1.4.8-3 +- Minor doc / man fixes + * Fri Jun 7 2013 Jaroslav Škarvada - 1.4.8-2 - Added imginfo format check Resolves: CVE-2013-2131