From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH] rrdtool: Update to 1.7.1 Date: Mon, 25 Mar 2019 10:06:25 +0000 Message-ID: <8002336A-55A5-45B2-9C03-F164BF217F06@ipfire.org> In-Reply-To: <20190324172120.12895-1-matthias.fischer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5781456728533572716==" List-Id: --===============5781456728533572716== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Merged & I am shipping collectd as well with Core Update 130. -Michael > On 24 Mar 2019, at 17:21, Matthias Fischer = wrote: >=20 > Disabled 'lua' because otherwise building failed. >=20 > I didn't find any place or reason where 'lua' was used by 'rrdtool', so it > was deactivated. >=20 > Disabling had no noticeable effects by now. Running. >=20 > Please note: > '/usr/lib/collectd/rrdcached.so' and '/usr/lib/collectd/rrdtool.so' have to > be updated, too. >=20 > Signed-off-by: Matthias Fischer > --- > config/rootfiles/common/rrdtool | 205 +++++++++++++++++--------------- > lfs/rrdtool | 7 +- > 2 files changed, 112 insertions(+), 100 deletions(-) >=20 > diff --git a/config/rootfiles/common/rrdtool b/config/rootfiles/common/rrdt= ool > index 4254b2ec9..9edf10c01 100644 > --- a/config/rootfiles/common/rrdtool > +++ b/config/rootfiles/common/rrdtool > @@ -11,7 +11,7 @@ usr/bin/rrdupdate > #usr/lib/librrd.la > #usr/lib/librrd.so > usr/lib/librrd.so.8 > -usr/lib/librrd.so.8.0.0 > +usr/lib/librrd.so.8.2.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 > @@ -21,105 +21,114 @@ usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-m= ulti/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.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/doc/rrdtool-1.7.1 > +#usr/share/doc/rrdtool-1.7.1/html > +#usr/share/doc/rrdtool-1.7.1/html/RRDp.html > +#usr/share/doc/rrdtool-1.7.1/html/RRDs.html > +#usr/share/doc/rrdtool-1.7.1/html/bin_dec_hex.html > +#usr/share/doc/rrdtool-1.7.1/html/cdeftutorial.html > +#usr/share/doc/rrdtool-1.7.1/html/index.html > +#usr/share/doc/rrdtool-1.7.1/html/librrd.html > +#usr/share/doc/rrdtool-1.7.1/html/rpntutorial.html > +#usr/share/doc/rrdtool-1.7.1/html/rrd-beginners.html > +#usr/share/doc/rrdtool-1.7.1/html/rrd_pdpcalc.html > +#usr/share/doc/rrdtool-1.7.1/html/rrdbuild.html > +#usr/share/doc/rrdtool-1.7.1/html/rrdcached.html > +#usr/share/doc/rrdtool-1.7.1/html/rrdcgi.html > +#usr/share/doc/rrdtool-1.7.1/html/rrdcreate.html > +#usr/share/doc/rrdtool-1.7.1/html/rrddump.html > +#usr/share/doc/rrdtool-1.7.1/html/rrdfetch.html > +#usr/share/doc/rrdtool-1.7.1/html/rrdfirst.html > +#usr/share/doc/rrdtool-1.7.1/html/rrdflushcached.html > +#usr/share/doc/rrdtool-1.7.1/html/rrdgraph.html > +#usr/share/doc/rrdtool-1.7.1/html/rrdgraph_data.html > +#usr/share/doc/rrdtool-1.7.1/html/rrdgraph_examples.html > +#usr/share/doc/rrdtool-1.7.1/html/rrdgraph_graph.html > +#usr/share/doc/rrdtool-1.7.1/html/rrdgraph_rpn.html > +#usr/share/doc/rrdtool-1.7.1/html/rrdinfo.html > +#usr/share/doc/rrdtool-1.7.1/html/rrdlast.html > +#usr/share/doc/rrdtool-1.7.1/html/rrdlastupdate.html > +#usr/share/doc/rrdtool-1.7.1/html/rrdlist.html > +#usr/share/doc/rrdtool-1.7.1/html/rrdlua.html > +#usr/share/doc/rrdtool-1.7.1/html/rrdresize.html > +#usr/share/doc/rrdtool-1.7.1/html/rrdrestore.html > +#usr/share/doc/rrdtool-1.7.1/html/rrdthreads.html > +#usr/share/doc/rrdtool-1.7.1/html/rrdtool.html > +#usr/share/doc/rrdtool-1.7.1/html/rrdtune.html > +#usr/share/doc/rrdtool-1.7.1/html/rrdtutorial.html > +#usr/share/doc/rrdtool-1.7.1/html/rrdupdate.html > +#usr/share/doc/rrdtool-1.7.1/html/rrdxport.html > +#usr/share/doc/rrdtool-1.7.1/txt > +#usr/share/doc/rrdtool-1.7.1/txt/bin_dec_hex.pod > +#usr/share/doc/rrdtool-1.7.1/txt/bin_dec_hex.txt > +#usr/share/doc/rrdtool-1.7.1/txt/cdeftutorial.pod > +#usr/share/doc/rrdtool-1.7.1/txt/cdeftutorial.txt > +#usr/share/doc/rrdtool-1.7.1/txt/librrd.txt > +#usr/share/doc/rrdtool-1.7.1/txt/rpntutorial.pod > +#usr/share/doc/rrdtool-1.7.1/txt/rpntutorial.txt > +#usr/share/doc/rrdtool-1.7.1/txt/rrd-beginners.pod > +#usr/share/doc/rrdtool-1.7.1/txt/rrd-beginners.txt > +#usr/share/doc/rrdtool-1.7.1/txt/rrd_pdpcalc.pod > +#usr/share/doc/rrdtool-1.7.1/txt/rrd_pdpcalc.txt > +#usr/share/doc/rrdtool-1.7.1/txt/rrdbuild.pod > +#usr/share/doc/rrdtool-1.7.1/txt/rrdbuild.txt > +#usr/share/doc/rrdtool-1.7.1/txt/rrdcached.pod > +#usr/share/doc/rrdtool-1.7.1/txt/rrdcached.txt > +#usr/share/doc/rrdtool-1.7.1/txt/rrdcgi.pod > +#usr/share/doc/rrdtool-1.7.1/txt/rrdcgi.txt > +#usr/share/doc/rrdtool-1.7.1/txt/rrdcreate.pod > +#usr/share/doc/rrdtool-1.7.1/txt/rrdcreate.txt > +#usr/share/doc/rrdtool-1.7.1/txt/rrddump.pod > +#usr/share/doc/rrdtool-1.7.1/txt/rrddump.txt > +#usr/share/doc/rrdtool-1.7.1/txt/rrdfetch.pod > +#usr/share/doc/rrdtool-1.7.1/txt/rrdfetch.txt > +#usr/share/doc/rrdtool-1.7.1/txt/rrdfirst.pod > +#usr/share/doc/rrdtool-1.7.1/txt/rrdfirst.txt > +#usr/share/doc/rrdtool-1.7.1/txt/rrdflushcached.pod > +#usr/share/doc/rrdtool-1.7.1/txt/rrdflushcached.txt > +#usr/share/doc/rrdtool-1.7.1/txt/rrdgraph.pod > +#usr/share/doc/rrdtool-1.7.1/txt/rrdgraph.txt > +#usr/share/doc/rrdtool-1.7.1/txt/rrdgraph_data.pod > +#usr/share/doc/rrdtool-1.7.1/txt/rrdgraph_data.txt > +#usr/share/doc/rrdtool-1.7.1/txt/rrdgraph_examples.pod > +#usr/share/doc/rrdtool-1.7.1/txt/rrdgraph_examples.txt > +#usr/share/doc/rrdtool-1.7.1/txt/rrdgraph_graph.pod > +#usr/share/doc/rrdtool-1.7.1/txt/rrdgraph_graph.txt > +#usr/share/doc/rrdtool-1.7.1/txt/rrdgraph_rpn.pod > +#usr/share/doc/rrdtool-1.7.1/txt/rrdgraph_rpn.txt > +#usr/share/doc/rrdtool-1.7.1/txt/rrdinfo.pod > +#usr/share/doc/rrdtool-1.7.1/txt/rrdinfo.txt > +#usr/share/doc/rrdtool-1.7.1/txt/rrdlast.pod > +#usr/share/doc/rrdtool-1.7.1/txt/rrdlast.txt > +#usr/share/doc/rrdtool-1.7.1/txt/rrdlastupdate.pod > +#usr/share/doc/rrdtool-1.7.1/txt/rrdlastupdate.txt > +#usr/share/doc/rrdtool-1.7.1/txt/rrdlist.pod > +#usr/share/doc/rrdtool-1.7.1/txt/rrdlist.txt > +#usr/share/doc/rrdtool-1.7.1/txt/rrdlua.pod > +#usr/share/doc/rrdtool-1.7.1/txt/rrdlua.txt > +#usr/share/doc/rrdtool-1.7.1/txt/rrdresize.pod > +#usr/share/doc/rrdtool-1.7.1/txt/rrdresize.txt > +#usr/share/doc/rrdtool-1.7.1/txt/rrdrestore.pod > +#usr/share/doc/rrdtool-1.7.1/txt/rrdrestore.txt > +#usr/share/doc/rrdtool-1.7.1/txt/rrdthreads.pod > +#usr/share/doc/rrdtool-1.7.1/txt/rrdthreads.txt > +#usr/share/doc/rrdtool-1.7.1/txt/rrdtool.pod > +#usr/share/doc/rrdtool-1.7.1/txt/rrdtool.txt > +#usr/share/doc/rrdtool-1.7.1/txt/rrdtune.pod > +#usr/share/doc/rrdtool-1.7.1/txt/rrdtune.txt > +#usr/share/doc/rrdtool-1.7.1/txt/rrdtutorial.pod > +#usr/share/doc/rrdtool-1.7.1/txt/rrdtutorial.txt > +#usr/share/doc/rrdtool-1.7.1/txt/rrdupdate.pod > +#usr/share/doc/rrdtool-1.7.1/txt/rrdupdate.txt > +#usr/share/doc/rrdtool-1.7.1/txt/rrdxport.pod > +#usr/share/doc/rrdtool-1.7.1/txt/rrdxport.txt > +#usr/share/locale/fr/LC_MESSAGES/rrdtool.mo > +#usr/share/locale/hu/LC_MESSAGES/rrdtool.mo > #usr/share/man/man1/bin_dec_hex.1 > #usr/share/man/man1/cdeftutorial.1 > #usr/share/man/man1/rpntutorial.1 > #usr/share/man/man1/rrd-beginners.1 > +#usr/share/man/man1/rrd_pdpcalc.1 > #usr/share/man/man1/rrdbuild.1 > #usr/share/man/man1/rrdcached.1 > #usr/share/man/man1/rrdcgi.1 > @@ -136,7 +145,7 @@ usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-mul= ti/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/rrdlist.1 > #usr/share/man/man1/rrdresize.1 > #usr/share/man/man1/rrdrestore.1 > #usr/share/man/man1/rrdthreads.1 > @@ -163,3 +172,5 @@ usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-mul= ti/auto/RRDs/RRDs.so > #usr/share/rrdtool/examples/stripes.pl > #usr/share/rrdtool/examples/stripes.py > var/log/rrd > +usr/lib/collectd/rrdcached.so > +usr/lib/collectd/rrdtool.so > diff --git a/lfs/rrdtool b/lfs/rrdtool > index 36d373d2c..9244bc75a 100644 > --- a/lfs/rrdtool > +++ b/lfs/rrdtool > @@ -1,7 +1,7 @@ > ###########################################################################= #### > # = # > # IPFire.org - A linux based firewall = # > -# Copyright (C) 2007-2018 IPFire Team = # > +# Copyright (C) 2007-2019 IPFire Team = # > # = # > # 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 @@ >=20 > include Config >=20 > -VER =3D 1.6.0 > +VER =3D 1.7.1 >=20 > THISAPP =3D rrdtool-$(VER) > DL_FILE =3D $(THISAPP).tar.gz > @@ -40,7 +40,7 @@ objects =3D $(DL_FILE) >=20 > $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) >=20 > -$(DL_FILE)_MD5 =3D 4ff52cc44b935b02d2742e6875094da5 > +$(DL_FILE)_MD5 =3D 5f6133630324efe82c8dcefab2056818 >=20 > install : $(TARGET) >=20 > @@ -75,6 +75,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) > --disable-rrdcgi \ > --enable-perl \ > --enable-perl-site-install \ > + --disable-lua \ > --disable-tcl \ > --disable-ruby \ > --disable-python > --=20 > 2.18.0 >=20 --===============5781456728533572716==--