+ 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