rrdtool: update to 1.6.0

Signed-off-by: Marcel Lorenz <marcel.lorenz@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/common/rrdtool b/config/rootfiles/common/rrdtool
index 98d76b582a7f6827cfac2fb9baf247e0f492dadf..909b5a2b56dd5213df48689b2f6fd6b31bd683d2 100644 (file)
--- a/config/rootfiles/common/rrdtool
+++ b/config/rootfiles/common/rrdtool
@@ -1,7 +1,7 @@
 #srv/web/ipfire/html/graphs
 usr/bin/rrdcached
-#usr/bin/rrdcreate
-#usr/bin/rrdinfo
+usr/bin/rrdcreate
+usr/bin/rrdinfo
 usr/bin/rrdtool
 usr/bin/rrdupdate
 #usr/include/rrd.h
@@ -10,114 +10,118 @@ usr/bin/rrdupdate
 #usr/lib/librrd.a
 #usr/lib/librrd.la
 #usr/lib/librrd.so
-usr/lib/librrd.so.4
-usr/lib/librrd.so.4.3.5
-#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.3.5
+usr/lib/librrd.so.8
+usr/lib/librrd.so.8.0.0
+#usr/lib/lua
+#usr/lib/lua/5.3
+#usr/lib/lua/5.3/rrd.a
+#usr/lib/lua/5.3/rrd.la
+usr/lib/lua/5.3/rrd.so
+usr/lib/lua/5.3/rrd.so.0
+usr/lib/lua/5.3/rrd.so.0.0.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
 #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/RRDp/.packlist
 #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/RRDs
 #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/RRDs/.packlist
-#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.5.5
-#usr/share/doc/rrdtool-1.5.5/html
-#usr/share/doc/rrdtool-1.5.5/html/RRDp.html
-#usr/share/doc/rrdtool-1.5.5/html/RRDs.html
-#usr/share/doc/rrdtool-1.5.5/html/bin_dec_hex.html
-#usr/share/doc/rrdtool-1.5.5/html/cdeftutorial.html
-#usr/share/doc/rrdtool-1.5.5/html/index.html
-#usr/share/doc/rrdtool-1.5.5/html/librrd.html
-#usr/share/doc/rrdtool-1.5.5/html/rpntutorial.html
-#usr/share/doc/rrdtool-1.5.5/html/rrd-beginners.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdbuild.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdcached.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdcgi.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdcreate.html
-#usr/share/doc/rrdtool-1.5.5/html/rrddump.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdfetch.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdfirst.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdflushcached.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdgraph.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdgraph_data.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdgraph_examples.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdgraph_graph.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdgraph_rpn.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdinfo.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdlast.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdlastupdate.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdresize.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdrestore.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdthreads.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdtool.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdtune.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdtutorial.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdupdate.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdxport.html
-#usr/share/doc/rrdtool-1.5.5/txt
-#usr/share/doc/rrdtool-1.5.5/txt/bin_dec_hex.pod
-#usr/share/doc/rrdtool-1.5.5/txt/bin_dec_hex.txt
-#usr/share/doc/rrdtool-1.5.5/txt/cdeftutorial.pod
-#usr/share/doc/rrdtool-1.5.5/txt/cdeftutorial.txt
-#usr/share/doc/rrdtool-1.5.5/txt/librrd.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rpntutorial.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rpntutorial.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrd-beginners.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrd-beginners.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdbuild.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdbuild.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdcached.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdcached.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdcgi.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdcgi.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdcreate.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdcreate.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrddump.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrddump.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdfetch.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdfetch.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdfirst.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdfirst.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdflushcached.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdflushcached.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdgraph.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdgraph.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdgraph_data.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdgraph_data.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdgraph_examples.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdgraph_examples.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdgraph_graph.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdgraph_graph.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdgraph_rpn.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdgraph_rpn.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdinfo.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdinfo.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdlast.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdlast.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdlastupdate.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdlastupdate.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdresize.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdresize.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdrestore.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdrestore.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdthreads.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdthreads.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdtool.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdtool.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdtune.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdtune.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdtutorial.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdtutorial.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdupdate.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdupdate.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdxport.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdxport.txt
+#usr/share/doc/rrdtool-1.6.0
+#usr/share/doc/rrdtool-1.6.0/html
+#usr/share/doc/rrdtool-1.6.0/html/RRDp.html
+#usr/share/doc/rrdtool-1.6.0/html/RRDs.html
+#usr/share/doc/rrdtool-1.6.0/html/bin_dec_hex.html
+#usr/share/doc/rrdtool-1.6.0/html/cdeftutorial.html
+#usr/share/doc/rrdtool-1.6.0/html/index.html
+#usr/share/doc/rrdtool-1.6.0/html/librrd.html
+#usr/share/doc/rrdtool-1.6.0/html/rpntutorial.html
+#usr/share/doc/rrdtool-1.6.0/html/rrd-beginners.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdbuild.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdcached.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdcgi.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdcreate.html
+#usr/share/doc/rrdtool-1.6.0/html/rrddump.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdfetch.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdfirst.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdflushcached.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdgraph.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdgraph_data.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdgraph_examples.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdgraph_graph.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdgraph_rpn.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdinfo.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdlast.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdlastupdate.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdlua.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdresize.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdrestore.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdthreads.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdtool.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdtune.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdtutorial.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdupdate.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdxport.html
+#usr/share/doc/rrdtool-1.6.0/txt
+#usr/share/doc/rrdtool-1.6.0/txt/bin_dec_hex.pod
+#usr/share/doc/rrdtool-1.6.0/txt/bin_dec_hex.txt
+#usr/share/doc/rrdtool-1.6.0/txt/cdeftutorial.pod
+#usr/share/doc/rrdtool-1.6.0/txt/cdeftutorial.txt
+#usr/share/doc/rrdtool-1.6.0/txt/librrd.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rpntutorial.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rpntutorial.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrd-beginners.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrd-beginners.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdbuild.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdbuild.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdcached.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdcached.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdcgi.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdcgi.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdcreate.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdcreate.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrddump.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrddump.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdfetch.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdfetch.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdfirst.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdfirst.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdflushcached.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdflushcached.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdgraph.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdgraph.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdgraph_data.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdgraph_data.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdgraph_examples.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdgraph_examples.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdgraph_graph.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdgraph_graph.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdgraph_rpn.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdgraph_rpn.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdinfo.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdinfo.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdlast.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdlast.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdlastupdate.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdlastupdate.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdlua.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdlua.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdresize.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdresize.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdrestore.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdrestore.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdthreads.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdthreads.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdtool.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdtool.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdtune.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdtune.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdtutorial.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdtutorial.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdupdate.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdupdate.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdxport.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdxport.txt
 #usr/share/man/man1/bin_dec_hex.1
 #usr/share/man/man1/cdeftutorial.1
 #usr/share/man/man1/rpntutorial.1
@@ -138,6 +142,7 @@ usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/RRDs/RRDs.so
 #usr/share/man/man1/rrdinfo.1
 #usr/share/man/man1/rrdlast.1
 #usr/share/man/man1/rrdlastupdate.1
+#usr/share/man/man1/rrdlua.1
 #usr/share/man/man1/rrdresize.1
 #usr/share/man/man1/rrdrestore.1
 #usr/share/man/man1/rrdthreads.1

diff --git a/lfs/rrdtool b/lfs/rrdtool
index b85c797364cd5c84944ca81e9f52f3f3dfe61c91..5d7c8943dd4ea07795c6eeab2aeac9226e185c13 100644 (file)
--- a/lfs/rrdtool
+++ b/lfs/rrdtool
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2015  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2016  IPFire Team  <info@ipfire.org>                          #
 #                                                                             #
 # 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.5.5
+VER        = 1.6.0
 
 THISAPP    = rrdtool-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = d8b3dcb3d193c2d6ad0a282bde69ee11
+$(DL_FILE)_MD5 = 4ff52cc44b935b02d2742e6875094da5
 
 install : $(TARGET)