From patchwork Mon Mar 25 04:21:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Fischer X-Patchwork-Id: 2160 Return-Path: Received: from mail01.ipfire.org (mail01.i.ipfire.org [172.28.1.200]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail01.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web07.i.ipfire.org (Postfix) with ESMTPS id 9305385A0DD for ; Sun, 24 Mar 2019 17:21:28 +0000 (GMT) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 44S41g5209z55gPN; Sun, 24 Mar 2019 17:21:27 +0000 (GMT) Received: from Devel.localdomain (p4FF56007.dip0.t-ipconnect.de [79.245.96.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 44S41c4klvz4y73P for ; Sun, 24 Mar 2019 17:21:24 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1553448084; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=++o2IjWdyhc9HPYkVoCqG/AMV4RFye/xfwzAngvaBUA=; b=imRlSC++3kriE+NIIN18lvToR6hp/fNHzyb1ozLUftdcjwWSIs8ORnTX7p7SdWkd0DQ8CG QpXoM7th6igvflq8VJC5G3vMq8JKiUga/tk55wsh1cjR9ByBUW+lTtFZaoSuXItBIE10Dj hvgy7TxuDlaei8OZkqaIn/bXwUQRWm1p1LF7T9G/LOOe/p5m3bdw4/9YlBWPzyrTAryNnG yvB9HbRucbPhnx1e6p+Ve2MXeYP41BZqt/W8XejcaZsULTIYvQpWkoCGH0op6iivifoMJ8 1I54xqXfBYDPuIKBlDC1PJp7wM0S1CuqYWYpRxE5ge9+zKxzk/hXgrICgpCjAQ== From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH] rrdtool: Update to 1.7.1 Date: Sun, 24 Mar 2019 18:21:20 +0100 Message-Id: <20190324172120.12895-1-matthias.fischer@ipfire.org> X-Mailer: git-send-email 2.18.0 X-Spamd-Result: default: False [-2.10 / 11.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; DKIM_SIGNED(0.00)[]; MID_CONTAINS_FROM(1.00)[]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:3320, ipnet:79.192.0.0/10, country:DE]; BAYES_HAM(-3.00)[100.00%] Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=mfischer smtp.mailfrom=matthias.fischer@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" 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 --- 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 # +# 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 @@ 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