From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] rrdtool: Update to 1.7.1
Date: Mon, 25 Mar 2019 10:06:25 +0000 [thread overview]
Message-ID: <8002336A-55A5-45B2-9C03-F164BF217F06@ipfire.org> (raw)
In-Reply-To: <20190324172120.12895-1-matthias.fischer@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 14210 bytes --]
Merged & I am shipping collectd as well with Core Update 130.
-Michael
> On 24 Mar 2019, at 17:21, Matthias Fischer <matthias.fischer(a)ipfire.org> wrote:
>
> Disabled 'lua' because otherwise building failed.
>
> I didn't find any place or reason where 'lua' was used by 'rrdtool', so it
> was deactivated.
>
> Disabling had no noticeable effects by now. Running.
>
> Please note:
> '/usr/lib/collectd/rrdcached.so' and '/usr/lib/collectd/rrdtool.so' have to
> be updated, too.
>
> Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
> ---
> config/rootfiles/common/rrdtool | 205 +++++++++++++++++---------------
> lfs/rrdtool | 7 +-
> 2 files changed, 112 insertions(+), 100 deletions(-)
>
> diff --git a/config/rootfiles/common/rrdtool b/config/rootfiles/common/rrdtool
> 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-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.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-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/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-multi/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 <info(a)ipfire.org> #
> +# Copyright (C) 2007-2019 IPFire Team <info(a)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.6.0
> +VER = 1.7.1
>
> THISAPP = rrdtool-$(VER)
> DL_FILE = $(THISAPP).tar.gz
> @@ -40,7 +40,7 @@ objects = $(DL_FILE)
>
> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>
> -$(DL_FILE)_MD5 = 4ff52cc44b935b02d2742e6875094da5
> +$(DL_FILE)_MD5 = 5f6133630324efe82c8dcefab2056818
>
> install : $(TARGET)
>
> @@ -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
> --
> 2.18.0
>
prev parent reply other threads:[~2019-03-25 10:06 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-24 17:21 Matthias Fischer
2019-03-25 10:06 ` Michael Tremer [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8002336A-55A5-45B2-9C03-F164BF217F06@ipfire.org \
--to=michael.tremer@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox