This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, next has been updated via d4767896cb27880c2e042ffd49bdbcf7b99a2c64 (commit) via 3210e92212b70ab886fe31847c6397a273e784e6 (commit) via 6bc94afa0d36ecaa4691eaa4dbefa4322861893f (commit) via 67b943c18a36aa9801684ca85ac3390292651e87 (commit) via b3a7120c1556bd060caf894fa0b4a5084fc7436a (commit) from b6c60092db15360cd51091b9f5bcff637ee2ea7c (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit d4767896cb27880c2e042ffd49bdbcf7b99a2c64 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Mar 21 20:50:30 2019 +0000

make.sh: Build libedit very early

Many packages can make use of this

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 3210e92212b70ab886fe31847c6397a273e784e6 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Mar 21 20:48:39 2019 +0000

core130: Ship updated lua

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 6bc94afa0d36ecaa4691eaa4dbefa4322861893f Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sun Mar 24 18:34:37 2019 +0100

lua: Update to 5.3.5

For details see:

http://www.lua.org/bugs.html

Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 67b943c18a36aa9801684ca85ac3390292651e87 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Mar 21 20:39:51 2019 +0000

core130: Ship rrdtool and collectd

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit b3a7120c1556bd060caf894fa0b4a5084fc7436a Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sun Mar 24 18:21:20 2019 +0100

rrdtool: Update to 1.7.1

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@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/common/rrdtool | 205 +++++++++++---------- .../{oldcore/125 => core/130}/filelists/collectd | 0 .../{oldcore/100 => core/130}/filelists/lua | 0 .../{oldcore/111 => core/130}/filelists/rrdtool | 0 lfs/lua | 11 +- lfs/rrdtool | 7 +- make.sh | 2 +- .../lua-5.3.5-autotoolize.patch} | 2 +- src/patches/lua/lua-5.3.5-shared_library-1.patch | 61 ++++++ 9 files changed, 182 insertions(+), 106 deletions(-) copy config/rootfiles/{oldcore/125 => core/130}/filelists/collectd (100%) copy config/rootfiles/{oldcore/100 => core/130}/filelists/lua (100%) copy config/rootfiles/{oldcore/111 => core/130}/filelists/rrdtool (100%) rename src/patches/{lua-5.3.0-autotoolize.patch => lua/lua-5.3.5-autotoolize.patch} (99%) create mode 100644 src/patches/lua/lua-5.3.5-shared_library-1.patch

Difference in files: 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/config/rootfiles/core/130/filelists/collectd b/config/rootfiles/core/130/filelists/collectd new file mode 120000 index 000000000..871b32f14 --- /dev/null +++ b/config/rootfiles/core/130/filelists/collectd @@ -0,0 +1 @@ +../../../common/collectd \ No newline at end of file diff --git a/config/rootfiles/core/130/filelists/lua b/config/rootfiles/core/130/filelists/lua new file mode 120000 index 000000000..951f661c5 --- /dev/null +++ b/config/rootfiles/core/130/filelists/lua @@ -0,0 +1 @@ +../../../common/lua \ No newline at end of file diff --git a/config/rootfiles/core/130/filelists/rrdtool b/config/rootfiles/core/130/filelists/rrdtool new file mode 120000 index 000000000..7a82e414b --- /dev/null +++ b/config/rootfiles/core/130/filelists/rrdtool @@ -0,0 +1 @@ +../../../common/rrdtool \ No newline at end of file diff --git a/lfs/lua b/lfs/lua index 9217e8bac..e70b9cd00 100644 --- a/lfs/lua +++ b/lfs/lua @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2019 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 = 5.3.0 +VER = 5.3.5

THISAPP = lua-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = a1b0a7e92d0c85bbff7a8d27bf29f8af +$(DL_FILE)_MD5 = 4f4b4f323fd3514a68e0ab3da8ce3455

install : $(TARGET)

@@ -71,7 +71,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && cp -v src/luaconf.h src/luaconf.h.template.in - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/lua-5.3.0-autotoolize.patch + + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/lua/lua-5.3.5-autotoolize.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/lua/lua-5.3.5-shared_library-1.patch + cd $(DIR_APP) && autoreconf -vfi cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) 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@ipfire.org # +# Copyright (C) 2007-2019 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.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 diff --git a/make.sh b/make.sh index bb4269d5d..c05e4b590 100755 --- a/make.sh +++ b/make.sh @@ -1084,6 +1084,7 @@ buildipfire() { lfsmake2 openssl [ "${BUILD_ARCH}" = "i586" ] && lfsmake2 openssl KCFG='-sse2' lfsmake2 popt + lfsmake2 libedit lfsmake2 libusb lfsmake2 libusb-compat lfsmake2 libpcap @@ -1587,7 +1588,6 @@ buildipfire() { lfsmake2 dehydrated lfsmake2 shairport-sync lfsmake2 borgbackup - lfsmake2 libedit lfsmake2 knot lfsmake2 spectre-meltdown-checker lfsmake2 zabbix_agentd diff --git a/src/patches/lua-5.3.0-autotoolize.patch b/src/patches/lua/lua-5.3.5-autotoolize.patch similarity index 99% rename from src/patches/lua-5.3.0-autotoolize.patch rename to src/patches/lua/lua-5.3.5-autotoolize.patch index 3e4723a57..76747923a 100644 --- a/src/patches/lua-5.3.0-autotoolize.patch +++ b/src/patches/lua/lua-5.3.5-autotoolize.patch @@ -110,7 +110,7 @@ diff -up lua-5.3.0/src/luaconf.h.template.in.autoxxx lua-5.3.0/src/luaconf.h.tem

/* ** =================================================================== -@@ -175,9 +180,9 @@ +@@ -200,9 +205,9 @@

#else /* }{ */

diff --git a/src/patches/lua/lua-5.3.5-shared_library-1.patch b/src/patches/lua/lua-5.3.5-shared_library-1.patch new file mode 100644 index 000000000..857fddc6c --- /dev/null +++ b/src/patches/lua/lua-5.3.5-shared_library-1.patch @@ -0,0 +1,61 @@ +Submitted By: Igor Živković contact@igor-zivkovic.from.hr +Date: 2013-06-19 +Initial Package Version: 5.2.2 +Upstream Status: Rejected +Origin: Arch Linux packages repository +Description: Adds the compilation of a shared library. + +diff -Naur lua-5.3.0.orig/Makefile lua-5.3.0/Makefile +--- lua-5.3.0.orig/Makefile 2014-10-30 00:14:41.000000000 +0100 ++++ lua-5.3.0/Makefile 2015-01-19 22:14:09.822290828 +0100 +@@ -52,7 +52,7 @@ + all: $(PLAT) + + $(PLATS) clean: +- cd src && $(MAKE) $@ ++ cd src && $(MAKE) $@ V=$(V) R=$(R) + + test: dummy + src/lua -v +diff -Naur lua-5.3.0.orig/src/Makefile lua-5.3.0/src/Makefile +--- lua-5.3.0.orig/src/Makefile 2015-01-05 17:04:52.000000000 +0100 ++++ lua-5.3.0/src/Makefile 2015-01-19 22:14:52.559378543 +0100 +@@ -7,7 +7,7 @@ + PLAT= none + + CC= gcc -std=gnu99 +-CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS) ++CFLAGS= -fPIC -O2 -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS) + LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS) + LIBS= -lm $(SYSLIBS) $(MYLIBS) + +@@ -29,6 +29,7 @@ + PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris + + LUA_A= liblua.a ++LUA_SO= liblua.so + CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \ + lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \ + ltm.o lundump.o lvm.o lzio.o +@@ -43,7 +44,7 @@ + LUAC_O= luac.o + + ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) +-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) ++ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO) + ALL_A= $(LUA_A) + + # Targets start here. +@@ -59,6 +60,12 @@ + $(AR) $@ $(BASE_O) + $(RANLIB) $@ + ++$(LUA_SO): $(CORE_O) $(LIB_O) ++ $(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS) ++ ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V) ++ ln -sf $(LUA_SO).$(R) $(LUA_SO) ++ ++ + $(LUA_T): $(LUA_O) $(LUA_A) + $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) +

hooks/post-receive -- IPFire 2.x development tree