Development March 2019

development@lists.ipfire.org

17 participants
64 discussions

[PATCH] nginx: Update to 1.15.9
by Erik Kapfer 26 Mar '19

26 Mar '19

Fixes #12023 . Added support for http2. Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org> --- config/rootfiles/packages/nginx | 6 +++--- lfs/nginx | 10 ++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/config/rootfiles/packages/nginx b/config/rootfiles/packages/nginx index 3560e45b9..2ea271bd9 100644 --- a/config/rootfiles/packages/nginx +++ b/config/rootfiles/packages/nginx @@ -1,4 +1,4 @@ -etc/nginx +#etc/nginx etc/nginx/fastcgi.conf etc/nginx/fastcgi.conf.default etc/nginx/fastcgi_params @@ -16,8 +16,8 @@ etc/nginx/uwsgi_params.default etc/nginx/win-utf etc/rc.d/init.d/nginx usr/sbin/nginx -usr/share/nginx -usr/share/nginx/html +#usr/share/nginx +#usr/share/nginx/html usr/share/nginx/html/50x.html usr/share/nginx/html/index.html var/ipfire/backup/addons/includes/nginx diff --git a/lfs/nginx b/lfs/nginx index f6496196c..5a24678c8 100644 --- a/lfs/nginx +++ b/lfs/nginx @@ -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.15.1 +VER = 1.15.9 THISAPP = nginx-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nginx -PAK_VER = 8 +PAK_VER = 9 ############################################################################### # Top-level Rules @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 2dd5a265c54a76b699443931d80a61b9 +$(DL_FILE)_MD5 = 00dde20d4d2cc65bdaf8950a5bd3e14b install : $(TARGET) @@ -99,7 +99,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --with-http_stub_status_module \ --with-http_dav_module \ --with-http_sub_module \ + --with-http_v2_module \ --with-pcre + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install mkdir -p /var/log/nginx /var/spool/nginx -- 2.12.2

3 2

[PATCH] lua: Update to 5.3.5
by Matthias Fischer 25 Mar '19

25 Mar '19

For details see: http://www.lua.org/bugs.html Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/lua | 11 ++-- .../lua-5.3.5-autotoolize.patch} | 2 +- .../lua/lua-5.3.5-shared_library-1.patch | 61 +++++++++++++++++++ 3 files changed, 69 insertions(+), 5 deletions(-) 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 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(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 = 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/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(a)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) + -- 2.18.0

2 1

[PATCH] rrdtool: Update to 1.7.1
by Matthias Fischer 25 Mar '19

25 Mar '19

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

2 1

[PATCH] make.sh: 'dnsdist' has to built after 'libedit'
by Matthias Fischer 25 Mar '19

25 Mar '19

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- make.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make.sh b/make.sh index bb4269d5d..dafb613d3 100755 --- a/make.sh +++ b/make.sh @@ -1565,7 +1565,6 @@ buildipfire() { lfsmake2 haproxy lfsmake2 ipset lfsmake2 lua - lfsmake2 dnsdist lfsmake2 bird lfsmake2 frr lfsmake2 dmidecode @@ -1588,6 +1587,7 @@ buildipfire() { lfsmake2 shairport-sync lfsmake2 borgbackup lfsmake2 libedit + lfsmake2 dnsdist lfsmake2 knot lfsmake2 spectre-meltdown-checker lfsmake2 zabbix_agentd -- 2.18.0

2 1

IPFire-3.x Images
by Jonatan Schlag 21 Mar '19

21 Mar '19

Hi list, I want to inform you all that new images for IPFire-3.x are available. See this wiki page for more information: https://wiki.ipfire.org/devel/get_image/start I also want to use this E-Mail as a reminder that we not only have IPFire-2.x. I have worked with IPFire-3.x a lot and compared to IPFire- 2.x this version makes a lot of things better than IPFire-2.x A lot of things are very limited in IPFire-2.x. For example, the network in IPFire-2.x does not support IPv6. It is not productive to implement IPv6 in IPFire-2.x. and that's why we build IPFire-3.x from scratch. That means unfortunately that the effort for IPFire-2.x cannot or only partly reused iPFire-3.x. IPFire-3.x is build to support IPv6 and if we want to support this we need IPFire-3.x. Currently, the development work is done by Michael Tremer, Arne Fitzenreiten, Peter Müller, Stefan Schantl and me. My time is very limited at this moment and the other 4 have to work also on IPFire-2.x. As stated time is limited and 4 persons are not enough to build IPFire- 3.x. To push the development of IPFire-3.x it would be cool If everybody would thinking about working on this next major version too. A good starting point is the IPFire-3.x step by step guide here https://wiki.ipfire.org/devel/start So thank you all for your efforts and maybe we can increase the speed of IPFire-3.x development a little bit. :-) Greetings Jonatan

5 5

[PATCH] openvpn: Tie client to use IPv4
by Michael Tremer 18 Mar '19

18 Mar '19

OpenVPN might try to connect via IPv6 in rare occasions. To avoid that, we can tell it to use IPv4 exclusively. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> --- html/cgi-bin/ovpnmain.cgi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 4fb2349..282456e 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -967,14 +967,14 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General print SERVERCONF "port $cgiparams{'DEST_PORT'}\n"; if ($cgiparams{'PROTOCOL'} eq 'tcp') { - print SERVERCONF "proto tcp-server\n"; + print SERVERCONF "proto tcp4-server\n"; print SERVERCONF "# Packet size\n"; if ($cgiparams{'MTU'} eq '') {$tunmtu = '1400'} else {$tunmtu = $cgiparams{'MTU'}}; print SERVERCONF "tun-mtu $tunmtu\n"; } if ($cgiparams{'PROTOCOL'} eq 'udp') { - print SERVERCONF "proto udp\n"; + print SERVERCONF "proto udp4\n"; print SERVERCONF "# Paketsize\n"; if ($cgiparams{'MTU'} eq '') {$tunmtu = '1500'} else {$tunmtu = $cgiparams{'MTU'}}; print SERVERCONF "tun-mtu $tunmtu\n"; @@ -1063,14 +1063,14 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General print CLIENTCONF "port $cgiparams{'DEST_PORT'}\n"; if ($cgiparams{'PROTOCOL'} eq 'tcp') { - print CLIENTCONF "proto tcp-client\n"; + print CLIENTCONF "proto tcp4-client\n"; print CLIENTCONF "# Packet size\n"; if ($cgiparams{'MTU'} eq '') {$tunmtu = '1400'} else {$tunmtu = $cgiparams{'MTU'}}; print CLIENTCONF "tun-mtu $tunmtu\n"; } if ($cgiparams{'PROTOCOL'} eq 'udp') { - print CLIENTCONF "proto udp\n"; + print CLIENTCONF "proto udp4\n"; print CLIENTCONF "# Paketsize\n"; if ($cgiparams{'MTU'} eq '') {$tunmtu = '1500'} else {$tunmtu = $cgiparams{'MTU'}}; print CLIENTCONF "tun-mtu $tunmtu\n"; @@ -2178,14 +2178,14 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ print CLIENTCONF "port $confighash{$cgiparams{'KEY'}}[29]\n"; if ($confighash{$cgiparams{'KEY'}}[28] eq 'tcp') { - print CLIENTCONF "proto tcp-client\n"; + print CLIENTCONF "proto tcp4-client\n"; print CLIENTCONF "# Packet size\n"; if ($confighash{$cgiparams{'KEY'}}[31] eq '') {$tunmtu = '1400'} else {$tunmtu = $confighash{$cgiparams{'KEY'}}[31]}; print CLIENTCONF "tun-mtu $tunmtu\n"; } if ($confighash{$cgiparams{'KEY'}}[28] eq 'udp') { - print CLIENTCONF "proto udp\n"; + print CLIENTCONF "proto udp4\n"; print CLIENTCONF "# Paketsize\n"; if ($confighash{$cgiparams{'KEY'}}[31] eq '') {$tunmtu = '1500'} else {$tunmtu = $confighash{$cgiparams{'KEY'}}[31]}; print CLIENTCONF "tun-mtu $tunmtu\n"; -- 2.6.3

1 0

[PATCH] core 130: Remove snort settings dir after convert has run.
by Stefan Schantl 18 Mar '19

18 Mar '19

When all settings have been converted, the files and directory are not needed anymore. If they will be left and at a later time an backup will be restored, the converter will be started by the backup script again and would be restore those old snort settings and replace the current IPS settings. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- config/rootfiles/core/130/update.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/rootfiles/core/130/update.sh b/config/rootfiles/core/130/update.sh index d33321c32..f3dc0d85a 100644 --- a/config/rootfiles/core/130/update.sh +++ b/config/rootfiles/core/130/update.sh @@ -74,6 +74,9 @@ ldconfig # Migrate snort configuration to suricata /usr/sbin/convert-snort +# Remove snort settings +rm -rvf /var/ipfire/snort + # Start services /etc/init.d/collectd restart /etc/init.d/firewall restart -- 2.20.1

3 13

[PATCH] unbound: Update to 1.9.1
by Matthias Fischer 18 Mar '19

18 Mar '19

For details see: https://nlnetlabs.nl/pipermail/unbound-users/2019-March/011415.html Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/common/unbound | 2 +- lfs/unbound | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/common/unbound b/config/rootfiles/common/unbound index 843e0eeca..a130a059b 100644 --- a/config/rootfiles/common/unbound +++ b/config/rootfiles/common/unbound @@ -11,7 +11,7 @@ etc/unbound/unbound.conf #usr/lib/libunbound.la #usr/lib/libunbound.so usr/lib/libunbound.so.8 -usr/lib/libunbound.so.8.1.0 +usr/lib/libunbound.so.8.1.1 #usr/lib/pkgconfig/libunbound.pc usr/sbin/unbound usr/sbin/unbound-anchor diff --git a/lfs/unbound b/lfs/unbound index b090010d4..87666dfce 100644 --- a/lfs/unbound +++ b/lfs/unbound @@ -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.9.0 +VER = 1.9.1 THISAPP = unbound-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 1026159991a3883518525bc18e25582f +$(DL_FILE)_MD5 = 5d954920d192b33f7c88f015dd969940 install : $(TARGET) -- 2.18.0

2 1

[PATCH] hostapd: make client isolation configurable via WebUI
by Peter Müller 18 Mar '19

18 Mar '19

hostapd supports client-isolation, but this feature could not be configured via the WebUI so far. Since it might be desired in public wireless networks, or even private ones, it makes sense to provide a radio button to let the user decide on. Fixes #11974. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- html/cgi-bin/wlanap.cgi | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi index 72c9a1298..cae191101 100644 --- a/html/cgi-bin/wlanap.cgi +++ b/html/cgi-bin/wlanap.cgi @@ -75,6 +75,7 @@ $wlanapsettings{'DRIVER'} = 'NL80211'; $wlanapsettings{'HTCAPS'} = ''; $wlanapsettings{'VHTCAPS'} = ''; $wlanapsettings{'NOSCAN'} = 'off'; +$wlanapsettings{'CLIENTISOLATION'} = 'off'; &General::readhash("/var/ipfire/wlanap/settings", \%wlanapsettings); &Header::getcgihash(\%wlanapsettings); @@ -252,6 +253,10 @@ $checked{'NOSCAN'}{'off'} = ''; $checked{'NOSCAN'}{'on'} = ''; $checked{'NOSCAN'}{$wlanapsettings{'NOSCAN'}} = "checked='checked'"; +$checked{'CLIENTISOLATION'}{'off'} = ''; +$checked{'CLIENTISOLATION'}{'on'} = ''; +$checked{'CLIENTISOLATION'}{$wlanapsettings{'CLIENTISOLATION'}} = "checked='checked'"; + $selected{'ENC'}{$wlanapsettings{'ENC'}} = "selected='selected'"; $selected{'CHANNEL'}{$wlanapsettings{'CHANNEL'}} = "selected='selected'"; $selected{'COUNTRY'}{$wlanapsettings{'COUNTRY'}} = "selected='selected'"; @@ -377,6 +382,7 @@ print <<END <tr><td width='25%' class='base'>SSID: </td><td class='base' colspan='3'><input type='text' name='SSID' size='30' value='$wlanapsettings{'SSID'}' /></td></tr>  <tr><td width='25%' class='base'>SSID Broadcast: </td><td class='base' colspan='3'>on <input type='radio' name='HIDESSID' value='off' $checked{'HIDESSID'}{'off'} /> | <input type='radio' name='HIDESSID' value='on' $checked{'HIDESSID'}{'on'} /> off</td></tr> +<tr><td width='25%' class='base'>Client Isolation: </td><td class='base' colspan='3'>on <input type='radio' name='CLIENTISOLATION' value='off' $checked{'CLIENTISOLATION'}{'off'} /> | <input type='radio' name='CLIENTISOLATION' value='on' $checked{'CLIENTISOLATION'}{'on'} /> off</td></tr> <tr><td width='25%' class='base'>$Lang::tr{'wlanap country'}: </td><td class='base' colspan='3'> @@ -632,6 +638,14 @@ END } + # https://forum.ipfire.org/viewtopic.php?f=22&t=12274&p=79070#p79070 + if ( $wlanapsettings{'CLIENTISOLATION'} eq 'on' ){ + print CONFIGFILE <<END +ap_isolate=1 +END +; + } + if ( $wlanapsettings{'NOSCAN'} eq 'on' ){ print CONFIGFILE <<END noscan=1 -- 2.16.4

2 1

[PATCH] suricata: Fix ownership and file permissions of files inside /var/lib/suricata.
by Stefan Schantl 16 Mar '19

16 Mar '19

These files needs to have nobody.nobody as owner but requires read-acces from everyone to allow the suricata user reading-in this files during startup. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- lfs/suricata | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lfs/suricata b/lfs/suricata index 0a561ef8b..d7b5b71d6 100644 --- a/lfs/suricata +++ b/lfs/suricata @@ -101,8 +101,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # to the rules directory. mv /etc/suricata/*.config /var/lib/suricata - # Set correct ownership for /var/lib/suricata - chown nobody:nobody /var/lib/suricata + # Set correct permissions for the files. + chmod 644 /var/lib/suricata/*.config + + # Set correct ownership for /var/lib/suricata and the + # contained files + chown -R nobody:nobody /var/lib/suricata # Create logging directory. -mkdir -p /var/log/suricata -- 2.20.1

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development March 2019