Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
index 40c1bc87eba1c852b23dbc9230b996d04b2ac576..c3fb43eeb83246e3a31efffb5ecf5503d85210ce 100644 (file)
--- a/config/cfgroot/graphs.pl
+++ b/config/cfgroot/graphs.pl
@@ -257,11 +257,11 @@ sub updateloadgraph {
                "DEF:load1=".$mainsettings{'RRDLOG'}."/collectd/localhost/load/load.rrd:shortterm:AVERAGE",
                "DEF:load5=".$mainsettings{'RRDLOG'}."/collectd/localhost/load/load.rrd:midterm:AVERAGE",
                "DEF:load15=".$mainsettings{'RRDLOG'}."/collectd/localhost/load/load.rrd:longterm:AVERAGE",
-               "AREA:load1".$color{"color13"}."A0:1 ".$Lang::tr{'minute'}.":",
+               "AREA:load1".$color{"color13"}."A0:1 ".$Lang::tr{'minute'},
                "GPRINT:load1:LAST:%5.2lf",
-               "AREA:load5".$color{"color18"}."A0:5 ".$Lang::tr{'minutes'}.":",
+               "AREA:load5".$color{"color18"}."A0:5 ".$Lang::tr{'minutes'},
                "GPRINT:load5:LAST:%5.2lf",
-               "AREA:load15".$color{"color14"}."A0:15 ".$Lang::tr{'minutes'}.":",
+               "AREA:load15".$color{"color14"}."A0:15 ".$Lang::tr{'minutes'},
                "GPRINT:load15:LAST:%5.2lf\\j",
                "LINE1:load5".$color{"color13"},
                "LINE1:load1".$color{"color18"},
@@ -519,7 +519,7 @@ sub updatediskgraph {
                "CDEF:writen=write,-1,*",
                "DEF:standby=".$mainsettings{'RRDLOG'}."/hddshutdown-".$disk.".rrd:standby:AVERAGE",
                "CDEF:st=standby,INF,*",
-               "CDEF:st1=standby,-INF,*",
+               "CDEF:st1=standby,NEGINF,*",
                "COMMENT:".sprintf("%-25s",$Lang::tr{'caption'}),
                "COMMENT:".sprintf("%15s",$Lang::tr{'maximal'}),
                "COMMENT:".sprintf("%15s",$Lang::tr{'average'}),

diff --git a/config/rootfiles/common/rrdtool b/config/rootfiles/common/rrdtool
index c957d523bdfa7a25644a0217f536db4924bb8da0..738fe37105a45bfddc1a900ae25430fbb8932ab6 100644 (file)
--- a/config/rootfiles/common/rrdtool
+++ b/config/rootfiles/common/rrdtool
@@ -1,5 +1,7 @@
 #srv/web/ipfire/html/graphs
 usr/bin/rrdcached
+#usr/bin/rrdcreate
+#usr/bin/rrdinfo
 usr/bin/rrdtool
 usr/bin/rrdupdate
 #usr/include/rrd.h
@@ -9,12 +11,12 @@ usr/bin/rrdupdate
 #usr/lib/librrd.la
 #usr/lib/librrd.so
 usr/lib/librrd.so.4
-usr/lib/librrd.so.4.2.0
+usr/lib/librrd.so.4.3.0
 #usr/lib/librrd_th.a
 #usr/lib/librrd_th.la
 #usr/lib/librrd_th.so
 usr/lib/librrd_th.so.4
-usr/lib/librrd_th.so.4.2.0
+usr/lib/librrd_th.so.4.3.0
 usr/lib/perl5/site_perl/5.12.3/RRDp.pm
 usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/RRDs.pm
 #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/RRDp
@@ -24,98 +26,98 @@ usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/RRDs.pm
 #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/RRDs/RRDs.bs
 usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/RRDs/RRDs.so
 #usr/lib/pkgconfig/librrd.pc
-#usr/share/doc/rrdtool-1.4.7
-#usr/share/doc/rrdtool-1.4.7/html
-#usr/share/doc/rrdtool-1.4.7/html/RRDp.html
-#usr/share/doc/rrdtool-1.4.7/html/RRDs.html
-#usr/share/doc/rrdtool-1.4.7/html/bin_dec_hex.html
-#usr/share/doc/rrdtool-1.4.7/html/cdeftutorial.html
-#usr/share/doc/rrdtool-1.4.7/html/index.html
-#usr/share/doc/rrdtool-1.4.7/html/librrd.html
-#usr/share/doc/rrdtool-1.4.7/html/rpntutorial.html
-#usr/share/doc/rrdtool-1.4.7/html/rrd-beginners.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdbuild.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdcached.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdcgi.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdcreate.html
-#usr/share/doc/rrdtool-1.4.7/html/rrddump.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdfetch.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdfirst.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdflushcached.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdgraph.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdgraph_data.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdgraph_examples.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdgraph_graph.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdgraph_rpn.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdinfo.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdlast.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdlastupdate.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdresize.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdrestore.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdthreads.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdtool.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdtune.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdtutorial.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdupdate.html
-#usr/share/doc/rrdtool-1.4.7/html/rrdxport.html
-#usr/share/doc/rrdtool-1.4.7/txt
-#usr/share/doc/rrdtool-1.4.7/txt/bin_dec_hex.pod
-#usr/share/doc/rrdtool-1.4.7/txt/bin_dec_hex.txt
-#usr/share/doc/rrdtool-1.4.7/txt/cdeftutorial.pod
-#usr/share/doc/rrdtool-1.4.7/txt/cdeftutorial.txt
-#usr/share/doc/rrdtool-1.4.7/txt/librrd.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rpntutorial.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rpntutorial.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrd-beginners.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrd-beginners.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdbuild.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdbuild.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdcached.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdcached.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdcgi.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdcgi.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdcreate.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdcreate.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrddump.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrddump.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdfetch.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdfetch.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdfirst.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdfirst.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdflushcached.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdflushcached.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdgraph.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdgraph.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdgraph_data.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdgraph_data.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdgraph_examples.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdgraph_examples.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdgraph_graph.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdgraph_graph.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdgraph_rpn.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdgraph_rpn.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdinfo.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdinfo.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdlast.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdlast.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdlastupdate.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdlastupdate.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdresize.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdresize.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdrestore.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdrestore.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdthreads.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdthreads.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdtool.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdtool.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdtune.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdtune.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdtutorial.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdtutorial.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdupdate.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdupdate.txt
-#usr/share/doc/rrdtool-1.4.7/txt/rrdxport.pod
-#usr/share/doc/rrdtool-1.4.7/txt/rrdxport.txt
+#usr/share/doc/rrdtool-1.5.3
+#usr/share/doc/rrdtool-1.5.3/html
+#usr/share/doc/rrdtool-1.5.3/html/RRDp.html
+#usr/share/doc/rrdtool-1.5.3/html/RRDs.html
+#usr/share/doc/rrdtool-1.5.3/html/bin_dec_hex.html
+#usr/share/doc/rrdtool-1.5.3/html/cdeftutorial.html
+#usr/share/doc/rrdtool-1.5.3/html/index.html
+#usr/share/doc/rrdtool-1.5.3/html/librrd.html
+#usr/share/doc/rrdtool-1.5.3/html/rpntutorial.html
+#usr/share/doc/rrdtool-1.5.3/html/rrd-beginners.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdbuild.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdcached.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdcgi.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdcreate.html
+#usr/share/doc/rrdtool-1.5.3/html/rrddump.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdfetch.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdfirst.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdflushcached.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdgraph.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdgraph_data.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdgraph_examples.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdgraph_graph.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdgraph_rpn.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdinfo.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdlast.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdlastupdate.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdresize.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdrestore.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdthreads.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdtool.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdtune.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdtutorial.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdupdate.html
+#usr/share/doc/rrdtool-1.5.3/html/rrdxport.html
+#usr/share/doc/rrdtool-1.5.3/txt
+#usr/share/doc/rrdtool-1.5.3/txt/bin_dec_hex.pod
+#usr/share/doc/rrdtool-1.5.3/txt/bin_dec_hex.txt
+#usr/share/doc/rrdtool-1.5.3/txt/cdeftutorial.pod
+#usr/share/doc/rrdtool-1.5.3/txt/cdeftutorial.txt
+#usr/share/doc/rrdtool-1.5.3/txt/librrd.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rpntutorial.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rpntutorial.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrd-beginners.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrd-beginners.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdbuild.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdbuild.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdcached.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdcached.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdcgi.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdcgi.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdcreate.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdcreate.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrddump.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrddump.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdfetch.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdfetch.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdfirst.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdfirst.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdflushcached.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdflushcached.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_data.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_data.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_examples.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_examples.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_graph.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_graph.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_rpn.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_rpn.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdinfo.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdinfo.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdlast.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdlast.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdlastupdate.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdlastupdate.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdresize.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdresize.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdrestore.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdrestore.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdthreads.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdthreads.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdtool.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdtool.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdtune.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdtune.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdtutorial.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdtutorial.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdupdate.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdupdate.txt
+#usr/share/doc/rrdtool-1.5.3/txt/rrdxport.pod
+#usr/share/doc/rrdtool-1.5.3/txt/rrdxport.txt
 #usr/share/man/man1/bin_dec_hex.1
 #usr/share/man/man1/cdeftutorial.1
 #usr/share/man/man1/rpntutorial.1

diff --git a/lfs/rrdtool b/lfs/rrdtool
index 0237b89f2e48d5dff2f1c7a3c218f342b3e27809..d0a11817566c9e5dc040793c18f2efb703d06247 100644 (file)
--- a/lfs/rrdtool
+++ b/lfs/rrdtool
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2015  Michael Tremer & Christian Schmidt                      #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.4.7
+VER        = 1.5.3
 
 THISAPP    = rrdtool-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ffe369d8921b4dfdeaaf43812100c38f
+$(DL_FILE)_MD5 = 868a828cc6b10654c440a85054240ae2
 
 install : $(TARGET)