Development March 2021

development@lists.ipfire.org

14 participants
107 discussions

[PATCH] swig: Update to 4.0.2
by Adolf Belka 23 Nov '22

23 Nov '22

- Update from 3.0.12 to 4.0.2 - Updated rootfile - Changelog is too large to include here Full chagelog can be found in the tarball in CHANGES and CHANGES.current Large number of bugs fixed in the two versions between 3.0.12 and 4.0.2 Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/common/swig | 1517 +++++++++++++++++----------------- lfs/swig | 4 +- 2 files changed, 741 insertions(+), 780 deletions(-) diff --git a/config/rootfiles/common/swig b/config/rootfiles/common/swig index f028767e2..d1a9fd34d 100644 --- a/config/rootfiles/common/swig +++ b/config/rootfiles/common/swig @@ -1,781 +1,742 @@ #usr/bin/ccache-swig #usr/bin/swig -#usr/share/man/man1/ccache-swig.1 #usr/share/swig -#usr/share/swig/3.0.12 -#usr/share/swig/3.0.12/allegrocl -#usr/share/swig/3.0.12/allegrocl/allegrocl.swg -#usr/share/swig/3.0.12/allegrocl/inout_typemaps.i -#usr/share/swig/3.0.12/allegrocl/longlongs.i -#usr/share/swig/3.0.12/allegrocl/std_list.i -#usr/share/swig/3.0.12/allegrocl/std_string.i -#usr/share/swig/3.0.12/allegrocl/typemaps.i -#usr/share/swig/3.0.12/allkw.swg -#usr/share/swig/3.0.12/attribute.i -#usr/share/swig/3.0.12/carrays.i -#usr/share/swig/3.0.12/cdata.i -#usr/share/swig/3.0.12/cffi -#usr/share/swig/3.0.12/cffi/cffi.swg -#usr/share/swig/3.0.12/chicken -#usr/share/swig/3.0.12/chicken/chicken.swg -#usr/share/swig/3.0.12/chicken/chickenkw.swg -#usr/share/swig/3.0.12/chicken/chickenrun.swg -#usr/share/swig/3.0.12/chicken/multi-generic.scm -#usr/share/swig/3.0.12/chicken/std_string.i -#usr/share/swig/3.0.12/chicken/swigclosprefix.scm -#usr/share/swig/3.0.12/chicken/tinyclos-multi-generic.patch -#usr/share/swig/3.0.12/chicken/typemaps.i -#usr/share/swig/3.0.12/clisp -#usr/share/swig/3.0.12/clisp/clisp.swg -#usr/share/swig/3.0.12/cmalloc.i -#usr/share/swig/3.0.12/constraints.i -#usr/share/swig/3.0.12/cpointer.i -#usr/share/swig/3.0.12/csharp -#usr/share/swig/3.0.12/csharp/arrays_csharp.i -#usr/share/swig/3.0.12/csharp/boost_intrusive_ptr.i -#usr/share/swig/3.0.12/csharp/boost_shared_ptr.i -#usr/share/swig/3.0.12/csharp/csharp.swg -#usr/share/swig/3.0.12/csharp/csharphead.swg -#usr/share/swig/3.0.12/csharp/csharpkw.swg -#usr/share/swig/3.0.12/csharp/director.swg -#usr/share/swig/3.0.12/csharp/enums.swg -#usr/share/swig/3.0.12/csharp/enumsimple.swg -#usr/share/swig/3.0.12/csharp/enumtypesafe.swg -#usr/share/swig/3.0.12/csharp/std_array.i -#usr/share/swig/3.0.12/csharp/std_auto_ptr.i -#usr/share/swig/3.0.12/csharp/std_common.i -#usr/share/swig/3.0.12/csharp/std_deque.i -#usr/share/swig/3.0.12/csharp/std_except.i -#usr/share/swig/3.0.12/csharp/std_map.i -#usr/share/swig/3.0.12/csharp/std_pair.i -#usr/share/swig/3.0.12/csharp/std_shared_ptr.i -#usr/share/swig/3.0.12/csharp/std_string.i -#usr/share/swig/3.0.12/csharp/std_vector.i -#usr/share/swig/3.0.12/csharp/std_wstring.i -#usr/share/swig/3.0.12/csharp/stl.i -#usr/share/swig/3.0.12/csharp/swiginterface.i -#usr/share/swig/3.0.12/csharp/swigtype_inout.i -#usr/share/swig/3.0.12/csharp/typemaps.i -#usr/share/swig/3.0.12/csharp/wchar.i -#usr/share/swig/3.0.12/cstring.i -#usr/share/swig/3.0.12/cwstring.i -#usr/share/swig/3.0.12/d -#usr/share/swig/3.0.12/d/boost_shared_ptr.i -#usr/share/swig/3.0.12/d/carrays.i -#usr/share/swig/3.0.12/d/cpointer.i -#usr/share/swig/3.0.12/d/d.swg -#usr/share/swig/3.0.12/d/dclassgen.swg -#usr/share/swig/3.0.12/d/ddirectives.swg -#usr/share/swig/3.0.12/d/denums.swg -#usr/share/swig/3.0.12/d/dexception.swg -#usr/share/swig/3.0.12/d/dhead.swg -#usr/share/swig/3.0.12/d/director.swg -#usr/share/swig/3.0.12/d/dkw.swg -#usr/share/swig/3.0.12/d/dmemberfunctionpointers.swg -#usr/share/swig/3.0.12/d/doperators.swg -#usr/share/swig/3.0.12/d/dprimitives.swg -#usr/share/swig/3.0.12/d/dstrings.swg -#usr/share/swig/3.0.12/d/dswigtype.swg -#usr/share/swig/3.0.12/d/dvoid.swg -#usr/share/swig/3.0.12/d/std_common.i -#usr/share/swig/3.0.12/d/std_deque.i -#usr/share/swig/3.0.12/d/std_except.i -#usr/share/swig/3.0.12/d/std_map.i -#usr/share/swig/3.0.12/d/std_pair.i -#usr/share/swig/3.0.12/d/std_shared_ptr.i -#usr/share/swig/3.0.12/d/std_string.i -#usr/share/swig/3.0.12/d/std_vector.i -#usr/share/swig/3.0.12/d/stl.i -#usr/share/swig/3.0.12/d/typemaps.i -#usr/share/swig/3.0.12/d/wrapperloader.swg -#usr/share/swig/3.0.12/director_common.swg -#usr/share/swig/3.0.12/exception.i -#usr/share/swig/3.0.12/gcj -#usr/share/swig/3.0.12/gcj/cni.i -#usr/share/swig/3.0.12/gcj/cni.swg -#usr/share/swig/3.0.12/gcj/javaprims.i -#usr/share/swig/3.0.12/go -#usr/share/swig/3.0.12/go/cdata.i -#usr/share/swig/3.0.12/go/exception.i -#usr/share/swig/3.0.12/go/go.swg -#usr/share/swig/3.0.12/go/gokw.swg -#usr/share/swig/3.0.12/go/goruntime.swg -#usr/share/swig/3.0.12/go/gostring.swg -#usr/share/swig/3.0.12/go/std_common.i -#usr/share/swig/3.0.12/go/std_deque.i -#usr/share/swig/3.0.12/go/std_except.i -#usr/share/swig/3.0.12/go/std_list.i -#usr/share/swig/3.0.12/go/std_map.i -#usr/share/swig/3.0.12/go/std_pair.i -#usr/share/swig/3.0.12/go/std_string.i -#usr/share/swig/3.0.12/go/std_vector.i -#usr/share/swig/3.0.12/go/stl.i -#usr/share/swig/3.0.12/go/typemaps.i -#usr/share/swig/3.0.12/guile -#usr/share/swig/3.0.12/guile/common.scm -#usr/share/swig/3.0.12/guile/cplusplus.i -#usr/share/swig/3.0.12/guile/guile.i -#usr/share/swig/3.0.12/guile/guile_scm.swg -#usr/share/swig/3.0.12/guile/guile_scm_run.swg -#usr/share/swig/3.0.12/guile/guilemain.i -#usr/share/swig/3.0.12/guile/interpreter.i -#usr/share/swig/3.0.12/guile/list-vector.i -#usr/share/swig/3.0.12/guile/pointer-in-out.i -#usr/share/swig/3.0.12/guile/ports.i -#usr/share/swig/3.0.12/guile/std_common.i -#usr/share/swig/3.0.12/guile/std_deque.i -#usr/share/swig/3.0.12/guile/std_except.i -#usr/share/swig/3.0.12/guile/std_map.i -#usr/share/swig/3.0.12/guile/std_pair.i -#usr/share/swig/3.0.12/guile/std_string.i -#usr/share/swig/3.0.12/guile/std_vector.i -#usr/share/swig/3.0.12/guile/stl.i -#usr/share/swig/3.0.12/guile/swigrun.i -#usr/share/swig/3.0.12/guile/typemaps.i -#usr/share/swig/3.0.12/intrusive_ptr.i -#usr/share/swig/3.0.12/inttypes.i -#usr/share/swig/3.0.12/java -#usr/share/swig/3.0.12/java/arrays_java.i -#usr/share/swig/3.0.12/java/boost_intrusive_ptr.i -#usr/share/swig/3.0.12/java/boost_shared_ptr.i -#usr/share/swig/3.0.12/java/director.swg -#usr/share/swig/3.0.12/java/enums.swg -#usr/share/swig/3.0.12/java/enumsimple.swg -#usr/share/swig/3.0.12/java/enumtypesafe.swg -#usr/share/swig/3.0.12/java/enumtypeunsafe.swg -#usr/share/swig/3.0.12/java/java.swg -#usr/share/swig/3.0.12/java/javahead.swg -#usr/share/swig/3.0.12/java/javakw.swg -#usr/share/swig/3.0.12/java/std_array.i -#usr/share/swig/3.0.12/java/std_auto_ptr.i -#usr/share/swig/3.0.12/java/std_common.i -#usr/share/swig/3.0.12/java/std_deque.i -#usr/share/swig/3.0.12/java/std_except.i -#usr/share/swig/3.0.12/java/std_map.i -#usr/share/swig/3.0.12/java/std_pair.i -#usr/share/swig/3.0.12/java/std_shared_ptr.i -#usr/share/swig/3.0.12/java/std_string.i -#usr/share/swig/3.0.12/java/std_vector.i -#usr/share/swig/3.0.12/java/std_wstring.i -#usr/share/swig/3.0.12/java/stl.i -#usr/share/swig/3.0.12/java/swiginterface.i -#usr/share/swig/3.0.12/java/typemaps.i -#usr/share/swig/3.0.12/java/various.i -#usr/share/swig/3.0.12/javascript -#usr/share/swig/3.0.12/javascript/jsc -#usr/share/swig/3.0.12/javascript/jsc/arrays_javascript.i -#usr/share/swig/3.0.12/javascript/jsc/ccomplex.i -#usr/share/swig/3.0.12/javascript/jsc/cdata.i -#usr/share/swig/3.0.12/javascript/jsc/complex.i -#usr/share/swig/3.0.12/javascript/jsc/exception.i -#usr/share/swig/3.0.12/javascript/jsc/javascript.swg -#usr/share/swig/3.0.12/javascript/jsc/javascriptcode.swg -#usr/share/swig/3.0.12/javascript/jsc/javascriptcomplex.swg -#usr/share/swig/3.0.12/javascript/jsc/javascriptfragments.swg -#usr/share/swig/3.0.12/javascript/jsc/javascripthelpers.swg -#usr/share/swig/3.0.12/javascript/jsc/javascriptinit.swg -#usr/share/swig/3.0.12/javascript/jsc/javascriptkw.swg -#usr/share/swig/3.0.12/javascript/jsc/javascriptprimtypes.swg -#usr/share/swig/3.0.12/javascript/jsc/javascriptrun.swg -#usr/share/swig/3.0.12/javascript/jsc/javascriptruntime.swg -#usr/share/swig/3.0.12/javascript/jsc/javascriptstrings.swg -#usr/share/swig/3.0.12/javascript/jsc/javascripttypemaps.swg -#usr/share/swig/3.0.12/javascript/jsc/std_common.i -#usr/share/swig/3.0.12/javascript/jsc/std_complex.i -#usr/share/swig/3.0.12/javascript/jsc/std_deque.i -#usr/share/swig/3.0.12/javascript/jsc/std_except.i -#usr/share/swig/3.0.12/javascript/jsc/std_map.i -#usr/share/swig/3.0.12/javascript/jsc/std_pair.i -#usr/share/swig/3.0.12/javascript/jsc/std_string.i -#usr/share/swig/3.0.12/javascript/jsc/std_vector.i -#usr/share/swig/3.0.12/javascript/jsc/stl.i -#usr/share/swig/3.0.12/javascript/jsc/typemaps.i -#usr/share/swig/3.0.12/javascript/v8 -#usr/share/swig/3.0.12/javascript/v8/arrays_javascript.i -#usr/share/swig/3.0.12/javascript/v8/ccomplex.i -#usr/share/swig/3.0.12/javascript/v8/cdata.i -#usr/share/swig/3.0.12/javascript/v8/complex.i -#usr/share/swig/3.0.12/javascript/v8/exception.i -#usr/share/swig/3.0.12/javascript/v8/javascript.swg -#usr/share/swig/3.0.12/javascript/v8/javascriptcode.swg -#usr/share/swig/3.0.12/javascript/v8/javascriptcomplex.swg -#usr/share/swig/3.0.12/javascript/v8/javascriptfragments.swg -#usr/share/swig/3.0.12/javascript/v8/javascripthelpers.swg -#usr/share/swig/3.0.12/javascript/v8/javascriptinit.swg -#usr/share/swig/3.0.12/javascript/v8/javascriptkw.swg -#usr/share/swig/3.0.12/javascript/v8/javascriptprimtypes.swg -#usr/share/swig/3.0.12/javascript/v8/javascriptrun.swg -#usr/share/swig/3.0.12/javascript/v8/javascriptruntime.swg -#usr/share/swig/3.0.12/javascript/v8/javascriptstrings.swg -#usr/share/swig/3.0.12/javascript/v8/javascripttypemaps.swg -#usr/share/swig/3.0.12/javascript/v8/std_common.i -#usr/share/swig/3.0.12/javascript/v8/std_complex.i -#usr/share/swig/3.0.12/javascript/v8/std_deque.i -#usr/share/swig/3.0.12/javascript/v8/std_except.i -#usr/share/swig/3.0.12/javascript/v8/std_map.i -#usr/share/swig/3.0.12/javascript/v8/std_pair.i -#usr/share/swig/3.0.12/javascript/v8/std_string.i -#usr/share/swig/3.0.12/javascript/v8/std_vector.i -#usr/share/swig/3.0.12/javascript/v8/stl.i -#usr/share/swig/3.0.12/javascript/v8/typemaps.i -#usr/share/swig/3.0.12/lua -#usr/share/swig/3.0.12/lua/_std_common.i -#usr/share/swig/3.0.12/lua/carrays.i -#usr/share/swig/3.0.12/lua/factory.i -#usr/share/swig/3.0.12/lua/lua.swg -#usr/share/swig/3.0.12/lua/lua_fnptr.i -#usr/share/swig/3.0.12/lua/luakw.swg -#usr/share/swig/3.0.12/lua/luarun.swg -#usr/share/swig/3.0.12/lua/luaruntime.swg -#usr/share/swig/3.0.12/lua/luatypemaps.swg -#usr/share/swig/3.0.12/lua/std_common.i -#usr/share/swig/3.0.12/lua/std_deque.i -#usr/share/swig/3.0.12/lua/std_except.i -#usr/share/swig/3.0.12/lua/std_map.i -#usr/share/swig/3.0.12/lua/std_pair.i -#usr/share/swig/3.0.12/lua/std_string.i -#usr/share/swig/3.0.12/lua/std_vector.i -#usr/share/swig/3.0.12/lua/stl.i -#usr/share/swig/3.0.12/lua/typemaps.i -#usr/share/swig/3.0.12/lua/wchar.i -#usr/share/swig/3.0.12/math.i -#usr/share/swig/3.0.12/modula3 -#usr/share/swig/3.0.12/modula3/modula3.swg -#usr/share/swig/3.0.12/modula3/modula3head.swg -#usr/share/swig/3.0.12/modula3/typemaps.i -#usr/share/swig/3.0.12/mzscheme -#usr/share/swig/3.0.12/mzscheme/mzrun.swg -#usr/share/swig/3.0.12/mzscheme/mzscheme.swg -#usr/share/swig/3.0.12/mzscheme/std_common.i -#usr/share/swig/3.0.12/mzscheme/std_deque.i -#usr/share/swig/3.0.12/mzscheme/std_map.i -#usr/share/swig/3.0.12/mzscheme/std_pair.i -#usr/share/swig/3.0.12/mzscheme/std_string.i -#usr/share/swig/3.0.12/mzscheme/std_vector.i -#usr/share/swig/3.0.12/mzscheme/stl.i -#usr/share/swig/3.0.12/mzscheme/typemaps.i -#usr/share/swig/3.0.12/ocaml -#usr/share/swig/3.0.12/ocaml/carray.i -#usr/share/swig/3.0.12/ocaml/class.swg -#usr/share/swig/3.0.12/ocaml/cstring.i -#usr/share/swig/3.0.12/ocaml/director.swg -#usr/share/swig/3.0.12/ocaml/ocaml.i -#usr/share/swig/3.0.12/ocaml/ocaml.swg -#usr/share/swig/3.0.12/ocaml/ocamldec.swg -#usr/share/swig/3.0.12/ocaml/ocamlkw.swg -#usr/share/swig/3.0.12/ocaml/preamble.swg -#usr/share/swig/3.0.12/ocaml/std_common.i -#usr/share/swig/3.0.12/ocaml/std_complex.i -#usr/share/swig/3.0.12/ocaml/std_deque.i -#usr/share/swig/3.0.12/ocaml/std_list.i -#usr/share/swig/3.0.12/ocaml/std_map.i -#usr/share/swig/3.0.12/ocaml/std_pair.i -#usr/share/swig/3.0.12/ocaml/std_string.i -#usr/share/swig/3.0.12/ocaml/std_vector.i -#usr/share/swig/3.0.12/ocaml/stl.i -#usr/share/swig/3.0.12/ocaml/swig.ml -#usr/share/swig/3.0.12/ocaml/swig.mli -#usr/share/swig/3.0.12/ocaml/swigp4.ml -#usr/share/swig/3.0.12/ocaml/typecheck.i -#usr/share/swig/3.0.12/ocaml/typemaps.i -#usr/share/swig/3.0.12/ocaml/typeregister.swg -#usr/share/swig/3.0.12/octave -#usr/share/swig/3.0.12/octave/attribute.i -#usr/share/swig/3.0.12/octave/boost_shared_ptr.i -#usr/share/swig/3.0.12/octave/carrays.i -#usr/share/swig/3.0.12/octave/cdata.i -#usr/share/swig/3.0.12/octave/cmalloc.i -#usr/share/swig/3.0.12/octave/director.swg -#usr/share/swig/3.0.12/octave/exception.i -#usr/share/swig/3.0.12/octave/factory.i -#usr/share/swig/3.0.12/octave/implicit.i -#usr/share/swig/3.0.12/octave/octave.swg -#usr/share/swig/3.0.12/octave/octcomplex.swg -#usr/share/swig/3.0.12/octave/octcontainer.swg -#usr/share/swig/3.0.12/octave/octfragments.swg -#usr/share/swig/3.0.12/octave/octiterators.swg -#usr/share/swig/3.0.12/octave/octopers.swg -#usr/share/swig/3.0.12/octave/octprimtypes.swg -#usr/share/swig/3.0.12/octave/octrun.swg -#usr/share/swig/3.0.12/octave/octruntime.swg -#usr/share/swig/3.0.12/octave/octstdcommon.swg -#usr/share/swig/3.0.12/octave/octtypemaps.swg -#usr/share/swig/3.0.12/octave/octuserdir.swg -#usr/share/swig/3.0.12/octave/std_alloc.i -#usr/share/swig/3.0.12/octave/std_basic_string.i -#usr/share/swig/3.0.12/octave/std_carray.i -#usr/share/swig/3.0.12/octave/std_char_traits.i -#usr/share/swig/3.0.12/octave/std_common.i -#usr/share/swig/3.0.12/octave/std_complex.i -#usr/share/swig/3.0.12/octave/std_container.i -#usr/share/swig/3.0.12/octave/std_deque.i -#usr/share/swig/3.0.12/octave/std_except.i -#usr/share/swig/3.0.12/octave/std_list.i -#usr/share/swig/3.0.12/octave/std_map.i -#usr/share/swig/3.0.12/octave/std_pair.i -#usr/share/swig/3.0.12/octave/std_shared_ptr.i -#usr/share/swig/3.0.12/octave/std_string.i -#usr/share/swig/3.0.12/octave/std_vector.i -#usr/share/swig/3.0.12/octave/std_wstring.i -#usr/share/swig/3.0.12/octave/stl.i -#usr/share/swig/3.0.12/octave/typemaps.i -#usr/share/swig/3.0.12/perl5 -#usr/share/swig/3.0.12/perl5/Makefile.pl -#usr/share/swig/3.0.12/perl5/attribute.i -#usr/share/swig/3.0.12/perl5/carrays.i -#usr/share/swig/3.0.12/perl5/cdata.i -#usr/share/swig/3.0.12/perl5/cmalloc.i -#usr/share/swig/3.0.12/perl5/cni.i -#usr/share/swig/3.0.12/perl5/cpointer.i -#usr/share/swig/3.0.12/perl5/cstring.i -#usr/share/swig/3.0.12/perl5/director.swg -#usr/share/swig/3.0.12/perl5/exception.i -#usr/share/swig/3.0.12/perl5/factory.i -#usr/share/swig/3.0.12/perl5/jstring.i -#usr/share/swig/3.0.12/perl5/noembed.h -#usr/share/swig/3.0.12/perl5/perl5.swg -#usr/share/swig/3.0.12/perl5/perlerrors.swg -#usr/share/swig/3.0.12/perl5/perlfragments.swg -#usr/share/swig/3.0.12/perl5/perlhead.swg -#usr/share/swig/3.0.12/perl5/perlinit.swg -#usr/share/swig/3.0.12/perl5/perlkw.swg -#usr/share/swig/3.0.12/perl5/perlmacros.swg -#usr/share/swig/3.0.12/perl5/perlmain.i -#usr/share/swig/3.0.12/perl5/perlopers.swg -#usr/share/swig/3.0.12/perl5/perlprimtypes.swg -#usr/share/swig/3.0.12/perl5/perlrun.swg -#usr/share/swig/3.0.12/perl5/perlruntime.swg -#usr/share/swig/3.0.12/perl5/perlstrings.swg -#usr/share/swig/3.0.12/perl5/perltypemaps.swg -#usr/share/swig/3.0.12/perl5/perluserdir.swg -#usr/share/swig/3.0.12/perl5/reference.i -#usr/share/swig/3.0.12/perl5/std_common.i -#usr/share/swig/3.0.12/perl5/std_deque.i -#usr/share/swig/3.0.12/perl5/std_except.i -#usr/share/swig/3.0.12/perl5/std_list.i -#usr/share/swig/3.0.12/perl5/std_map.i -#usr/share/swig/3.0.12/perl5/std_pair.i -#usr/share/swig/3.0.12/perl5/std_string.i -#usr/share/swig/3.0.12/perl5/std_vector.i -#usr/share/swig/3.0.12/perl5/stl.i -#usr/share/swig/3.0.12/perl5/typemaps.i -#usr/share/swig/3.0.12/php -#usr/share/swig/3.0.12/php/const.i -#usr/share/swig/3.0.12/php/director.swg -#usr/share/swig/3.0.12/php/factory.i -#usr/share/swig/3.0.12/php/globalvar.i -#usr/share/swig/3.0.12/php/php.swg -#usr/share/swig/3.0.12/php/phpinit.swg -#usr/share/swig/3.0.12/php/phpkw.swg -#usr/share/swig/3.0.12/php/phppointers.i -#usr/share/swig/3.0.12/php/phprun.swg -#usr/share/swig/3.0.12/php/std_common.i -#usr/share/swig/3.0.12/php/std_deque.i -#usr/share/swig/3.0.12/php/std_map.i -#usr/share/swig/3.0.12/php/std_pair.i -#usr/share/swig/3.0.12/php/std_string.i -#usr/share/swig/3.0.12/php/std_vector.i -#usr/share/swig/3.0.12/php/stl.i -#usr/share/swig/3.0.12/php/typemaps.i -#usr/share/swig/3.0.12/php/utils.i -#usr/share/swig/3.0.12/php5 -#usr/share/swig/3.0.12/php5/const.i -#usr/share/swig/3.0.12/php5/director.swg -#usr/share/swig/3.0.12/php5/factory.i -#usr/share/swig/3.0.12/php5/globalvar.i -#usr/share/swig/3.0.12/php5/php.swg -#usr/share/swig/3.0.12/php5/phpinit.swg -#usr/share/swig/3.0.12/php5/phpkw.swg -#usr/share/swig/3.0.12/php5/phppointers.i -#usr/share/swig/3.0.12/php5/phprun.swg -#usr/share/swig/3.0.12/php5/std_common.i -#usr/share/swig/3.0.12/php5/std_deque.i -#usr/share/swig/3.0.12/php5/std_map.i -#usr/share/swig/3.0.12/php5/std_pair.i -#usr/share/swig/3.0.12/php5/std_string.i -#usr/share/swig/3.0.12/php5/std_vector.i -#usr/share/swig/3.0.12/php5/stl.i -#usr/share/swig/3.0.12/php5/typemaps.i -#usr/share/swig/3.0.12/php5/utils.i -#usr/share/swig/3.0.12/pike -#usr/share/swig/3.0.12/pike/pike.swg -#usr/share/swig/3.0.12/pike/pikekw.swg -#usr/share/swig/3.0.12/pike/pikerun.swg -#usr/share/swig/3.0.12/pike/std_string.i -#usr/share/swig/3.0.12/pointer.i -#usr/share/swig/3.0.12/python -#usr/share/swig/3.0.12/python/argcargv.i -#usr/share/swig/3.0.12/python/attribute.i -#usr/share/swig/3.0.12/python/boost_shared_ptr.i -#usr/share/swig/3.0.12/python/builtin.swg -#usr/share/swig/3.0.12/python/carrays.i -#usr/share/swig/3.0.12/python/ccomplex.i -#usr/share/swig/3.0.12/python/cdata.i -#usr/share/swig/3.0.12/python/cmalloc.i -#usr/share/swig/3.0.12/python/cni.i -#usr/share/swig/3.0.12/python/complex.i -#usr/share/swig/3.0.12/python/cpointer.i -#usr/share/swig/3.0.12/python/cstring.i -#usr/share/swig/3.0.12/python/cwstring.i -#usr/share/swig/3.0.12/python/defarg.swg -#usr/share/swig/3.0.12/python/director.swg -#usr/share/swig/3.0.12/python/embed.i -#usr/share/swig/3.0.12/python/exception.i -#usr/share/swig/3.0.12/python/factory.i -#usr/share/swig/3.0.12/python/file.i -#usr/share/swig/3.0.12/python/implicit.i -#usr/share/swig/3.0.12/python/jstring.i -#usr/share/swig/3.0.12/python/pyabc.i -#usr/share/swig/3.0.12/python/pyapi.swg -#usr/share/swig/3.0.12/python/pybackward.swg -#usr/share/swig/3.0.12/python/pybuffer.i -#usr/share/swig/3.0.12/python/pyclasses.swg -#usr/share/swig/3.0.12/python/pycomplex.swg -#usr/share/swig/3.0.12/python/pycontainer.swg -#usr/share/swig/3.0.12/python/pydocs.swg -#usr/share/swig/3.0.12/python/pyerrors.swg -#usr/share/swig/3.0.12/python/pyfragments.swg -#usr/share/swig/3.0.12/python/pyhead.swg -#usr/share/swig/3.0.12/python/pyinit.swg -#usr/share/swig/3.0.12/python/pyiterators.swg -#usr/share/swig/3.0.12/python/pymacros.swg -#usr/share/swig/3.0.12/python/pyname_compat.i -#usr/share/swig/3.0.12/python/pyopers.swg -#usr/share/swig/3.0.12/python/pyprimtypes.swg -#usr/share/swig/3.0.12/python/pyrun.swg -#usr/share/swig/3.0.12/python/pyruntime.swg -#usr/share/swig/3.0.12/python/pystdcommon.swg -#usr/share/swig/3.0.12/python/pystrings.swg -#usr/share/swig/3.0.12/python/python.swg -#usr/share/swig/3.0.12/python/pythonkw.swg -#usr/share/swig/3.0.12/python/pythreads.swg -#usr/share/swig/3.0.12/python/pytuplehlp.swg -#usr/share/swig/3.0.12/python/pytypemaps.swg -#usr/share/swig/3.0.12/python/pyuserdir.swg -#usr/share/swig/3.0.12/python/pywstrings.swg -#usr/share/swig/3.0.12/python/std_alloc.i -#usr/share/swig/3.0.12/python/std_array.i -#usr/share/swig/3.0.12/python/std_auto_ptr.i -#usr/share/swig/3.0.12/python/std_basic_string.i -#usr/share/swig/3.0.12/python/std_carray.i -#usr/share/swig/3.0.12/python/std_char_traits.i -#usr/share/swig/3.0.12/python/std_common.i -#usr/share/swig/3.0.12/python/std_complex.i -#usr/share/swig/3.0.12/python/std_container.i -#usr/share/swig/3.0.12/python/std_deque.i -#usr/share/swig/3.0.12/python/std_except.i -#usr/share/swig/3.0.12/python/std_ios.i -#usr/share/swig/3.0.12/python/std_iostream.i -#usr/share/swig/3.0.12/python/std_list.i -#usr/share/swig/3.0.12/python/std_map.i -#usr/share/swig/3.0.12/python/std_multimap.i -#usr/share/swig/3.0.12/python/std_multiset.i -#usr/share/swig/3.0.12/python/std_pair.i -#usr/share/swig/3.0.12/python/std_set.i -#usr/share/swig/3.0.12/python/std_shared_ptr.i -#usr/share/swig/3.0.12/python/std_sstream.i -#usr/share/swig/3.0.12/python/std_streambuf.i -#usr/share/swig/3.0.12/python/std_string.i -#usr/share/swig/3.0.12/python/std_unordered_map.i -#usr/share/swig/3.0.12/python/std_unordered_multimap.i -#usr/share/swig/3.0.12/python/std_unordered_multiset.i -#usr/share/swig/3.0.12/python/std_unordered_set.i -#usr/share/swig/3.0.12/python/std_vector.i -#usr/share/swig/3.0.12/python/std_vectora.i -#usr/share/swig/3.0.12/python/std_wios.i -#usr/share/swig/3.0.12/python/std_wiostream.i -#usr/share/swig/3.0.12/python/std_wsstream.i -#usr/share/swig/3.0.12/python/std_wstreambuf.i -#usr/share/swig/3.0.12/python/std_wstring.i -#usr/share/swig/3.0.12/python/stl.i -#usr/share/swig/3.0.12/python/typemaps.i -#usr/share/swig/3.0.12/python/wchar.i -#usr/share/swig/3.0.12/r -#usr/share/swig/3.0.12/r/boost_shared_ptr.i -#usr/share/swig/3.0.12/r/cdata.i -#usr/share/swig/3.0.12/r/exception.i -#usr/share/swig/3.0.12/r/r.swg -#usr/share/swig/3.0.12/r/rcontainer.swg -#usr/share/swig/3.0.12/r/rfragments.swg -#usr/share/swig/3.0.12/r/rkw.swg -#usr/share/swig/3.0.12/r/ropers.swg -#usr/share/swig/3.0.12/r/rrun.swg -#usr/share/swig/3.0.12/r/rstdcommon.swg -#usr/share/swig/3.0.12/r/rtype.swg -#usr/share/swig/3.0.12/r/srun.swg -#usr/share/swig/3.0.12/r/std_alloc.i -#usr/share/swig/3.0.12/r/std_common.i -#usr/share/swig/3.0.12/r/std_container.i -#usr/share/swig/3.0.12/r/std_deque.i -#usr/share/swig/3.0.12/r/std_except.i -#usr/share/swig/3.0.12/r/std_list.i -#usr/share/swig/3.0.12/r/std_map.i -#usr/share/swig/3.0.12/r/std_pair.i -#usr/share/swig/3.0.12/r/std_string.i -#usr/share/swig/3.0.12/r/std_vector.i -#usr/share/swig/3.0.12/r/stl.i -#usr/share/swig/3.0.12/r/typemaps.i -#usr/share/swig/3.0.12/ruby -#usr/share/swig/3.0.12/ruby/Makefile.swig -#usr/share/swig/3.0.12/ruby/argcargv.i -#usr/share/swig/3.0.12/ruby/attribute.i -#usr/share/swig/3.0.12/ruby/boost_shared_ptr.i -#usr/share/swig/3.0.12/ruby/carrays.i -#usr/share/swig/3.0.12/ruby/cdata.i -#usr/share/swig/3.0.12/ruby/cmalloc.i -#usr/share/swig/3.0.12/ruby/cni.i -#usr/share/swig/3.0.12/ruby/cpointer.i -#usr/share/swig/3.0.12/ruby/cstring.i -#usr/share/swig/3.0.12/ruby/director.swg -#usr/share/swig/3.0.12/ruby/embed.i -#usr/share/swig/3.0.12/ruby/exception.i -#usr/share/swig/3.0.12/ruby/extconf.rb -#usr/share/swig/3.0.12/ruby/factory.i -#usr/share/swig/3.0.12/ruby/file.i -#usr/share/swig/3.0.12/ruby/jstring.i -#usr/share/swig/3.0.12/ruby/progargcargv.i -#usr/share/swig/3.0.12/ruby/ruby.swg -#usr/share/swig/3.0.12/ruby/rubyapi.swg -#usr/share/swig/3.0.12/ruby/rubyautodoc.swg -#usr/share/swig/3.0.12/ruby/rubyclasses.swg -#usr/share/swig/3.0.12/ruby/rubycomplex.swg -#usr/share/swig/3.0.12/ruby/rubycontainer.swg -#usr/share/swig/3.0.12/ruby/rubycontainer_extended.swg -#usr/share/swig/3.0.12/ruby/rubydef.swg -#usr/share/swig/3.0.12/ruby/rubyerrors.swg -#usr/share/swig/3.0.12/ruby/rubyfragments.swg -#usr/share/swig/3.0.12/ruby/rubyhead.swg -#usr/share/swig/3.0.12/ruby/rubyinit.swg -#usr/share/swig/3.0.12/ruby/rubyiterators.swg -#usr/share/swig/3.0.12/ruby/rubykw.swg -#usr/share/swig/3.0.12/ruby/rubymacros.swg -#usr/share/swig/3.0.12/ruby/rubyopers.swg -#usr/share/swig/3.0.12/ruby/rubyprimtypes.swg -#usr/share/swig/3.0.12/ruby/rubyrun.swg -#usr/share/swig/3.0.12/ruby/rubyruntime.swg -#usr/share/swig/3.0.12/ruby/rubystdautodoc.swg -#usr/share/swig/3.0.12/ruby/rubystdcommon.swg -#usr/share/swig/3.0.12/ruby/rubystdfunctors.swg -#usr/share/swig/3.0.12/ruby/rubystrings.swg -#usr/share/swig/3.0.12/ruby/rubytracking.swg -#usr/share/swig/3.0.12/ruby/rubytypemaps.swg -#usr/share/swig/3.0.12/ruby/rubyuserdir.swg -#usr/share/swig/3.0.12/ruby/rubywstrings.swg -#usr/share/swig/3.0.12/ruby/std_alloc.i -#usr/share/swig/3.0.12/ruby/std_array.i -#usr/share/swig/3.0.12/ruby/std_basic_string.i -#usr/share/swig/3.0.12/ruby/std_char_traits.i -#usr/share/swig/3.0.12/ruby/std_common.i -#usr/share/swig/3.0.12/ruby/std_complex.i -#usr/share/swig/3.0.12/ruby/std_container.i -#usr/share/swig/3.0.12/ruby/std_deque.i -#usr/share/swig/3.0.12/ruby/std_except.i -#usr/share/swig/3.0.12/ruby/std_functors.i -#usr/share/swig/3.0.12/ruby/std_ios.i -#usr/share/swig/3.0.12/ruby/std_iostream.i -#usr/share/swig/3.0.12/ruby/std_list.i -#usr/share/swig/3.0.12/ruby/std_map.i -#usr/share/swig/3.0.12/ruby/std_multimap.i -#usr/share/swig/3.0.12/ruby/std_multiset.i -#usr/share/swig/3.0.12/ruby/std_pair.i -#usr/share/swig/3.0.12/ruby/std_queue.i -#usr/share/swig/3.0.12/ruby/std_set.i -#usr/share/swig/3.0.12/ruby/std_shared_ptr.i -#usr/share/swig/3.0.12/ruby/std_sstream.i -#usr/share/swig/3.0.12/ruby/std_stack.i -#usr/share/swig/3.0.12/ruby/std_streambuf.i -#usr/share/swig/3.0.12/ruby/std_string.i -#usr/share/swig/3.0.12/ruby/std_vector.i -#usr/share/swig/3.0.12/ruby/std_vectora.i -#usr/share/swig/3.0.12/ruby/std_wstring.i -#usr/share/swig/3.0.12/ruby/stl.i -#usr/share/swig/3.0.12/ruby/timeval.i -#usr/share/swig/3.0.12/ruby/typemaps.i -#usr/share/swig/3.0.12/runtime.swg -#usr/share/swig/3.0.12/scilab -#usr/share/swig/3.0.12/scilab/boost_shared_ptr.i -#usr/share/swig/3.0.12/scilab/carrays.i -#usr/share/swig/3.0.12/scilab/cmalloc.i -#usr/share/swig/3.0.12/scilab/cpointer.i -#usr/share/swig/3.0.12/scilab/exception.i -#usr/share/swig/3.0.12/scilab/matrix.i -#usr/share/swig/3.0.12/scilab/sciarray.swg -#usr/share/swig/3.0.12/scilab/scibool.swg -#usr/share/swig/3.0.12/scilab/scichar.swg -#usr/share/swig/3.0.12/scilab/scicontainer.swg -#usr/share/swig/3.0.12/scilab/scidouble.swg -#usr/share/swig/3.0.12/scilab/scienum.swg -#usr/share/swig/3.0.12/scilab/sciexception.swg -#usr/share/swig/3.0.12/scilab/scifloat.swg -#usr/share/swig/3.0.12/scilab/sciint.swg -#usr/share/swig/3.0.12/scilab/sciiterators.swg -#usr/share/swig/3.0.12/scilab/scilab.swg -#usr/share/swig/3.0.12/scilab/scilist.swg -#usr/share/swig/3.0.12/scilab/scilong.swg -#usr/share/swig/3.0.12/scilab/scilonglong.swg -#usr/share/swig/3.0.12/scilab/scimacros.swg -#usr/share/swig/3.0.12/scilab/scimatrixbool.swg -#usr/share/swig/3.0.12/scilab/scimatrixchar.swg -#usr/share/swig/3.0.12/scilab/scimatrixdouble.swg -#usr/share/swig/3.0.12/scilab/scimatrixint.swg -#usr/share/swig/3.0.12/scilab/scimisctypes.swg -#usr/share/swig/3.0.12/scilab/scipointer.swg -#usr/share/swig/3.0.12/scilab/sciprimtypes.swg -#usr/share/swig/3.0.12/scilab/scirun.swg -#usr/share/swig/3.0.12/scilab/sciruntime.swg -#usr/share/swig/3.0.12/scilab/scisequence.swg -#usr/share/swig/3.0.12/scilab/scisequencebool.swg -#usr/share/swig/3.0.12/scilab/scisequencedouble.swg -#usr/share/swig/3.0.12/scilab/scisequencefloat.swg -#usr/share/swig/3.0.12/scilab/scisequenceint.swg -#usr/share/swig/3.0.12/scilab/scisequencepointer.swg -#usr/share/swig/3.0.12/scilab/scisequencestring.swg -#usr/share/swig/3.0.12/scilab/scishort.swg -#usr/share/swig/3.0.12/scilab/scisignedchar.swg -#usr/share/swig/3.0.12/scilab/scistdcommon.swg -#usr/share/swig/3.0.12/scilab/scitypemaps.swg -#usr/share/swig/3.0.12/scilab/sciunsignedchar.swg -#usr/share/swig/3.0.12/scilab/sciunsignedint.swg -#usr/share/swig/3.0.12/scilab/sciunsignedlong.swg -#usr/share/swig/3.0.12/scilab/sciunsignedshort.swg -#usr/share/swig/3.0.12/scilab/std_alloc.i -#usr/share/swig/3.0.12/scilab/std_basic_string.i -#usr/share/swig/3.0.12/scilab/std_char_traits.i -#usr/share/swig/3.0.12/scilab/std_common.i -#usr/share/swig/3.0.12/scilab/std_container.i -#usr/share/swig/3.0.12/scilab/std_deque.i -#usr/share/swig/3.0.12/scilab/std_except.i -#usr/share/swig/3.0.12/scilab/std_list.i -#usr/share/swig/3.0.12/scilab/std_map.i -#usr/share/swig/3.0.12/scilab/std_multiset.i -#usr/share/swig/3.0.12/scilab/std_pair.i -#usr/share/swig/3.0.12/scilab/std_set.i -#usr/share/swig/3.0.12/scilab/std_string.i -#usr/share/swig/3.0.12/scilab/std_vector.i -#usr/share/swig/3.0.12/scilab/stl.i -#usr/share/swig/3.0.12/scilab/typemaps.i -#usr/share/swig/3.0.12/shared_ptr.i -#usr/share/swig/3.0.12/std -#usr/share/swig/3.0.12/std/_std_deque.i -#usr/share/swig/3.0.12/std/std_alloc.i -#usr/share/swig/3.0.12/std/std_array.i -#usr/share/swig/3.0.12/std/std_basic_string.i -#usr/share/swig/3.0.12/std/std_carray.swg -#usr/share/swig/3.0.12/std/std_char_traits.i -#usr/share/swig/3.0.12/std/std_common.i -#usr/share/swig/3.0.12/std/std_container.i -#usr/share/swig/3.0.12/std/std_deque.i -#usr/share/swig/3.0.12/std/std_except.i -#usr/share/swig/3.0.12/std/std_ios.i -#usr/share/swig/3.0.12/std/std_iostream.i -#usr/share/swig/3.0.12/std/std_list.i -#usr/share/swig/3.0.12/std/std_map.i -#usr/share/swig/3.0.12/std/std_multimap.i -#usr/share/swig/3.0.12/std/std_multiset.i -#usr/share/swig/3.0.12/std/std_pair.i -#usr/share/swig/3.0.12/std/std_queue.i -#usr/share/swig/3.0.12/std/std_set.i -#usr/share/swig/3.0.12/std/std_sstream.i -#usr/share/swig/3.0.12/std/std_stack.i -#usr/share/swig/3.0.12/std/std_streambuf.i -#usr/share/swig/3.0.12/std/std_string.i -#usr/share/swig/3.0.12/std/std_unordered_map.i -#usr/share/swig/3.0.12/std/std_unordered_multimap.i -#usr/share/swig/3.0.12/std/std_unordered_multiset.i -#usr/share/swig/3.0.12/std/std_unordered_set.i -#usr/share/swig/3.0.12/std/std_vector.i -#usr/share/swig/3.0.12/std/std_vectora.i -#usr/share/swig/3.0.12/std/std_wios.i -#usr/share/swig/3.0.12/std/std_wiostream.i -#usr/share/swig/3.0.12/std/std_wsstream.i -#usr/share/swig/3.0.12/std/std_wstreambuf.i -#usr/share/swig/3.0.12/std/std_wstring.i -#usr/share/swig/3.0.12/std_except.i -#usr/share/swig/3.0.12/stdint.i -#usr/share/swig/3.0.12/stl.i -#usr/share/swig/3.0.12/swig.swg -#usr/share/swig/3.0.12/swigarch.i -#usr/share/swig/3.0.12/swigerrors.swg -#usr/share/swig/3.0.12/swiginit.swg -#usr/share/swig/3.0.12/swiglabels.swg -#usr/share/swig/3.0.12/swigrun.i -#usr/share/swig/3.0.12/swigrun.swg -#usr/share/swig/3.0.12/swigwarn.swg -#usr/share/swig/3.0.12/swigwarnings.swg -#usr/share/swig/3.0.12/tcl -#usr/share/swig/3.0.12/tcl/attribute.i -#usr/share/swig/3.0.12/tcl/carrays.i -#usr/share/swig/3.0.12/tcl/cdata.i -#usr/share/swig/3.0.12/tcl/cmalloc.i -#usr/share/swig/3.0.12/tcl/cni.i -#usr/share/swig/3.0.12/tcl/cpointer.i -#usr/share/swig/3.0.12/tcl/cstring.i -#usr/share/swig/3.0.12/tcl/cwstring.i -#usr/share/swig/3.0.12/tcl/exception.i -#usr/share/swig/3.0.12/tcl/factory.i -#usr/share/swig/3.0.12/tcl/jstring.i -#usr/share/swig/3.0.12/tcl/std_common.i -#usr/share/swig/3.0.12/tcl/std_deque.i -#usr/share/swig/3.0.12/tcl/std_except.i -#usr/share/swig/3.0.12/tcl/std_map.i -#usr/share/swig/3.0.12/tcl/std_pair.i -#usr/share/swig/3.0.12/tcl/std_string.i -#usr/share/swig/3.0.12/tcl/std_vector.i -#usr/share/swig/3.0.12/tcl/std_wstring.i -#usr/share/swig/3.0.12/tcl/stl.i -#usr/share/swig/3.0.12/tcl/tcl8.swg -#usr/share/swig/3.0.12/tcl/tclapi.swg -#usr/share/swig/3.0.12/tcl/tclerrors.swg -#usr/share/swig/3.0.12/tcl/tclfragments.swg -#usr/share/swig/3.0.12/tcl/tclinit.swg -#usr/share/swig/3.0.12/tcl/tclinterp.i -#usr/share/swig/3.0.12/tcl/tclkw.swg -#usr/share/swig/3.0.12/tcl/tclmacros.swg -#usr/share/swig/3.0.12/tcl/tclopers.swg -#usr/share/swig/3.0.12/tcl/tclprimtypes.swg -#usr/share/swig/3.0.12/tcl/tclresult.i -#usr/share/swig/3.0.12/tcl/tclrun.swg -#usr/share/swig/3.0.12/tcl/tclruntime.swg -#usr/share/swig/3.0.12/tcl/tclsh.i -#usr/share/swig/3.0.12/tcl/tclstrings.swg -#usr/share/swig/3.0.12/tcl/tcltypemaps.swg -#usr/share/swig/3.0.12/tcl/tcluserdir.swg -#usr/share/swig/3.0.12/tcl/tclwstrings.swg -#usr/share/swig/3.0.12/tcl/typemaps.i -#usr/share/swig/3.0.12/tcl/wish.i -#usr/share/swig/3.0.12/typemaps -#usr/share/swig/3.0.12/typemaps/attribute.swg -#usr/share/swig/3.0.12/typemaps/carrays.swg -#usr/share/swig/3.0.12/typemaps/cdata.swg -#usr/share/swig/3.0.12/typemaps/cmalloc.swg -#usr/share/swig/3.0.12/typemaps/cpointer.swg -#usr/share/swig/3.0.12/typemaps/cstring.swg -#usr/share/swig/3.0.12/typemaps/cstrings.swg -#usr/share/swig/3.0.12/typemaps/cwstring.swg -#usr/share/swig/3.0.12/typemaps/enumint.swg -#usr/share/swig/3.0.12/typemaps/exception.swg -#usr/share/swig/3.0.12/typemaps/factory.swg -#usr/share/swig/3.0.12/typemaps/fragments.swg -#usr/share/swig/3.0.12/typemaps/implicit.swg -#usr/share/swig/3.0.12/typemaps/inoutlist.swg -#usr/share/swig/3.0.12/typemaps/misctypes.swg -#usr/share/swig/3.0.12/typemaps/primtypes.swg -#usr/share/swig/3.0.12/typemaps/ptrtypes.swg -#usr/share/swig/3.0.12/typemaps/std_except.swg -#usr/share/swig/3.0.12/typemaps/std_string.swg -#usr/share/swig/3.0.12/typemaps/std_strings.swg -#usr/share/swig/3.0.12/typemaps/std_wstring.swg -#usr/share/swig/3.0.12/typemaps/string.swg -#usr/share/swig/3.0.12/typemaps/strings.swg -#usr/share/swig/3.0.12/typemaps/swigmacros.swg -#usr/share/swig/3.0.12/typemaps/swigobject.swg -#usr/share/swig/3.0.12/typemaps/swigtype.swg -#usr/share/swig/3.0.12/typemaps/swigtypemaps.swg -#usr/share/swig/3.0.12/typemaps/typemaps.swg -#usr/share/swig/3.0.12/typemaps/valtypes.swg -#usr/share/swig/3.0.12/typemaps/void.swg -#usr/share/swig/3.0.12/typemaps/wstring.swg -#usr/share/swig/3.0.12/uffi -#usr/share/swig/3.0.12/uffi/uffi.swg -#usr/share/swig/3.0.12/wchar.i -#usr/share/swig/3.0.12/windows.i +#usr/share/swig/4.0.2 +#usr/share/swig/4.0.2/allkw.swg +#usr/share/swig/4.0.2/attribute.i +#usr/share/swig/4.0.2/carrays.i +#usr/share/swig/4.0.2/cdata.i +#usr/share/swig/4.0.2/cmalloc.i +#usr/share/swig/4.0.2/constraints.i +#usr/share/swig/4.0.2/cpointer.i +#usr/share/swig/4.0.2/csharp +#usr/share/swig/4.0.2/csharp/arrays_csharp.i +#usr/share/swig/4.0.2/csharp/boost_intrusive_ptr.i +#usr/share/swig/4.0.2/csharp/boost_shared_ptr.i +#usr/share/swig/4.0.2/csharp/complex.i +#usr/share/swig/4.0.2/csharp/csharp.swg +#usr/share/swig/4.0.2/csharp/csharphead.swg +#usr/share/swig/4.0.2/csharp/csharpkw.swg +#usr/share/swig/4.0.2/csharp/director.swg +#usr/share/swig/4.0.2/csharp/enums.swg +#usr/share/swig/4.0.2/csharp/enumsimple.swg +#usr/share/swig/4.0.2/csharp/enumtypesafe.swg +#usr/share/swig/4.0.2/csharp/std_array.i +#usr/share/swig/4.0.2/csharp/std_auto_ptr.i +#usr/share/swig/4.0.2/csharp/std_common.i +#usr/share/swig/4.0.2/csharp/std_complex.i +#usr/share/swig/4.0.2/csharp/std_deque.i +#usr/share/swig/4.0.2/csharp/std_except.i +#usr/share/swig/4.0.2/csharp/std_list.i +#usr/share/swig/4.0.2/csharp/std_map.i +#usr/share/swig/4.0.2/csharp/std_pair.i +#usr/share/swig/4.0.2/csharp/std_set.i +#usr/share/swig/4.0.2/csharp/std_shared_ptr.i +#usr/share/swig/4.0.2/csharp/std_string.i +#usr/share/swig/4.0.2/csharp/std_vector.i +#usr/share/swig/4.0.2/csharp/std_wstring.i +#usr/share/swig/4.0.2/csharp/stl.i +#usr/share/swig/4.0.2/csharp/swiginterface.i +#usr/share/swig/4.0.2/csharp/swigtype_inout.i +#usr/share/swig/4.0.2/csharp/typemaps.i +#usr/share/swig/4.0.2/csharp/wchar.i +#usr/share/swig/4.0.2/cstring.i +#usr/share/swig/4.0.2/cwstring.i +#usr/share/swig/4.0.2/d +#usr/share/swig/4.0.2/d/boost_shared_ptr.i +#usr/share/swig/4.0.2/d/carrays.i +#usr/share/swig/4.0.2/d/cpointer.i +#usr/share/swig/4.0.2/d/d.swg +#usr/share/swig/4.0.2/d/dclassgen.swg +#usr/share/swig/4.0.2/d/ddirectives.swg +#usr/share/swig/4.0.2/d/denums.swg +#usr/share/swig/4.0.2/d/dexception.swg +#usr/share/swig/4.0.2/d/dhead.swg +#usr/share/swig/4.0.2/d/director.swg +#usr/share/swig/4.0.2/d/dkw.swg +#usr/share/swig/4.0.2/d/dmemberfunctionpointers.swg +#usr/share/swig/4.0.2/d/doperators.swg +#usr/share/swig/4.0.2/d/dprimitives.swg +#usr/share/swig/4.0.2/d/dstrings.swg +#usr/share/swig/4.0.2/d/dswigtype.swg +#usr/share/swig/4.0.2/d/dvoid.swg +#usr/share/swig/4.0.2/d/std_common.i +#usr/share/swig/4.0.2/d/std_deque.i +#usr/share/swig/4.0.2/d/std_except.i +#usr/share/swig/4.0.2/d/std_map.i +#usr/share/swig/4.0.2/d/std_pair.i +#usr/share/swig/4.0.2/d/std_shared_ptr.i +#usr/share/swig/4.0.2/d/std_string.i +#usr/share/swig/4.0.2/d/std_vector.i +#usr/share/swig/4.0.2/d/stl.i +#usr/share/swig/4.0.2/d/typemaps.i +#usr/share/swig/4.0.2/d/wrapperloader.swg +#usr/share/swig/4.0.2/director_common.swg +#usr/share/swig/4.0.2/exception.i +#usr/share/swig/4.0.2/go +#usr/share/swig/4.0.2/go/cdata.i +#usr/share/swig/4.0.2/go/director.swg +#usr/share/swig/4.0.2/go/exception.i +#usr/share/swig/4.0.2/go/go.swg +#usr/share/swig/4.0.2/go/gokw.swg +#usr/share/swig/4.0.2/go/goruntime.swg +#usr/share/swig/4.0.2/go/gostring.swg +#usr/share/swig/4.0.2/go/std_common.i +#usr/share/swig/4.0.2/go/std_deque.i +#usr/share/swig/4.0.2/go/std_except.i +#usr/share/swig/4.0.2/go/std_list.i +#usr/share/swig/4.0.2/go/std_map.i +#usr/share/swig/4.0.2/go/std_pair.i +#usr/share/swig/4.0.2/go/std_string.i +#usr/share/swig/4.0.2/go/std_vector.i +#usr/share/swig/4.0.2/go/stl.i +#usr/share/swig/4.0.2/go/typemaps.i +#usr/share/swig/4.0.2/guile +#usr/share/swig/4.0.2/guile/common.scm +#usr/share/swig/4.0.2/guile/cplusplus.i +#usr/share/swig/4.0.2/guile/guile.i +#usr/share/swig/4.0.2/guile/guile_scm.swg +#usr/share/swig/4.0.2/guile/guile_scm_run.swg +#usr/share/swig/4.0.2/guile/guilemain.i +#usr/share/swig/4.0.2/guile/interpreter.i +#usr/share/swig/4.0.2/guile/list-vector.i +#usr/share/swig/4.0.2/guile/pointer-in-out.i +#usr/share/swig/4.0.2/guile/ports.i +#usr/share/swig/4.0.2/guile/std_common.i +#usr/share/swig/4.0.2/guile/std_deque.i +#usr/share/swig/4.0.2/guile/std_except.i +#usr/share/swig/4.0.2/guile/std_map.i +#usr/share/swig/4.0.2/guile/std_pair.i +#usr/share/swig/4.0.2/guile/std_string.i +#usr/share/swig/4.0.2/guile/std_vector.i +#usr/share/swig/4.0.2/guile/stl.i +#usr/share/swig/4.0.2/guile/swigrun.i +#usr/share/swig/4.0.2/guile/typemaps.i +#usr/share/swig/4.0.2/intrusive_ptr.i +#usr/share/swig/4.0.2/inttypes.i +#usr/share/swig/4.0.2/java +#usr/share/swig/4.0.2/java/arrays_java.i +#usr/share/swig/4.0.2/java/boost_intrusive_ptr.i +#usr/share/swig/4.0.2/java/boost_shared_ptr.i +#usr/share/swig/4.0.2/java/director.swg +#usr/share/swig/4.0.2/java/enums.swg +#usr/share/swig/4.0.2/java/enumsimple.swg +#usr/share/swig/4.0.2/java/enumtypesafe.swg +#usr/share/swig/4.0.2/java/enumtypeunsafe.swg +#usr/share/swig/4.0.2/java/java.swg +#usr/share/swig/4.0.2/java/javahead.swg +#usr/share/swig/4.0.2/java/javakw.swg +#usr/share/swig/4.0.2/java/std_array.i +#usr/share/swig/4.0.2/java/std_auto_ptr.i +#usr/share/swig/4.0.2/java/std_common.i +#usr/share/swig/4.0.2/java/std_deque.i +#usr/share/swig/4.0.2/java/std_except.i +#usr/share/swig/4.0.2/java/std_list.i +#usr/share/swig/4.0.2/java/std_map.i +#usr/share/swig/4.0.2/java/std_pair.i +#usr/share/swig/4.0.2/java/std_set.i +#usr/share/swig/4.0.2/java/std_shared_ptr.i +#usr/share/swig/4.0.2/java/std_string.i +#usr/share/swig/4.0.2/java/std_unordered_map.i +#usr/share/swig/4.0.2/java/std_unordered_set.i +#usr/share/swig/4.0.2/java/std_vector.i +#usr/share/swig/4.0.2/java/std_wstring.i +#usr/share/swig/4.0.2/java/stl.i +#usr/share/swig/4.0.2/java/swiginterface.i +#usr/share/swig/4.0.2/java/typemaps.i +#usr/share/swig/4.0.2/java/various.i +#usr/share/swig/4.0.2/javascript +#usr/share/swig/4.0.2/javascript/jsc +#usr/share/swig/4.0.2/javascript/jsc/arrays_javascript.i +#usr/share/swig/4.0.2/javascript/jsc/ccomplex.i +#usr/share/swig/4.0.2/javascript/jsc/cdata.i +#usr/share/swig/4.0.2/javascript/jsc/complex.i +#usr/share/swig/4.0.2/javascript/jsc/exception.i +#usr/share/swig/4.0.2/javascript/jsc/javascript.swg +#usr/share/swig/4.0.2/javascript/jsc/javascriptcode.swg +#usr/share/swig/4.0.2/javascript/jsc/javascriptcomplex.swg +#usr/share/swig/4.0.2/javascript/jsc/javascriptfragments.swg +#usr/share/swig/4.0.2/javascript/jsc/javascripthelpers.swg +#usr/share/swig/4.0.2/javascript/jsc/javascriptinit.swg +#usr/share/swig/4.0.2/javascript/jsc/javascriptkw.swg +#usr/share/swig/4.0.2/javascript/jsc/javascriptprimtypes.swg +#usr/share/swig/4.0.2/javascript/jsc/javascriptrun.swg +#usr/share/swig/4.0.2/javascript/jsc/javascriptruntime.swg +#usr/share/swig/4.0.2/javascript/jsc/javascriptstrings.swg +#usr/share/swig/4.0.2/javascript/jsc/javascripttypemaps.swg +#usr/share/swig/4.0.2/javascript/jsc/std_common.i +#usr/share/swig/4.0.2/javascript/jsc/std_complex.i +#usr/share/swig/4.0.2/javascript/jsc/std_deque.i +#usr/share/swig/4.0.2/javascript/jsc/std_except.i +#usr/share/swig/4.0.2/javascript/jsc/std_map.i +#usr/share/swig/4.0.2/javascript/jsc/std_pair.i +#usr/share/swig/4.0.2/javascript/jsc/std_string.i +#usr/share/swig/4.0.2/javascript/jsc/std_vector.i +#usr/share/swig/4.0.2/javascript/jsc/stl.i +#usr/share/swig/4.0.2/javascript/jsc/typemaps.i +#usr/share/swig/4.0.2/javascript/v8 +#usr/share/swig/4.0.2/javascript/v8/arrays_javascript.i +#usr/share/swig/4.0.2/javascript/v8/ccomplex.i +#usr/share/swig/4.0.2/javascript/v8/cdata.i +#usr/share/swig/4.0.2/javascript/v8/complex.i +#usr/share/swig/4.0.2/javascript/v8/exception.i +#usr/share/swig/4.0.2/javascript/v8/javascript.swg +#usr/share/swig/4.0.2/javascript/v8/javascriptcode.swg +#usr/share/swig/4.0.2/javascript/v8/javascriptcomplex.swg +#usr/share/swig/4.0.2/javascript/v8/javascriptfragments.swg +#usr/share/swig/4.0.2/javascript/v8/javascripthelpers.swg +#usr/share/swig/4.0.2/javascript/v8/javascriptinit.swg +#usr/share/swig/4.0.2/javascript/v8/javascriptkw.swg +#usr/share/swig/4.0.2/javascript/v8/javascriptprimtypes.swg +#usr/share/swig/4.0.2/javascript/v8/javascriptrun.swg +#usr/share/swig/4.0.2/javascript/v8/javascriptruntime.swg +#usr/share/swig/4.0.2/javascript/v8/javascriptstrings.swg +#usr/share/swig/4.0.2/javascript/v8/javascripttypemaps.swg +#usr/share/swig/4.0.2/javascript/v8/std_common.i +#usr/share/swig/4.0.2/javascript/v8/std_complex.i +#usr/share/swig/4.0.2/javascript/v8/std_deque.i +#usr/share/swig/4.0.2/javascript/v8/std_except.i +#usr/share/swig/4.0.2/javascript/v8/std_map.i +#usr/share/swig/4.0.2/javascript/v8/std_pair.i +#usr/share/swig/4.0.2/javascript/v8/std_string.i +#usr/share/swig/4.0.2/javascript/v8/std_vector.i +#usr/share/swig/4.0.2/javascript/v8/stl.i +#usr/share/swig/4.0.2/javascript/v8/typemaps.i +#usr/share/swig/4.0.2/lua +#usr/share/swig/4.0.2/lua/_std_common.i +#usr/share/swig/4.0.2/lua/carrays.i +#usr/share/swig/4.0.2/lua/factory.i +#usr/share/swig/4.0.2/lua/lua.swg +#usr/share/swig/4.0.2/lua/lua_fnptr.i +#usr/share/swig/4.0.2/lua/luakw.swg +#usr/share/swig/4.0.2/lua/luarun.swg +#usr/share/swig/4.0.2/lua/luaruntime.swg +#usr/share/swig/4.0.2/lua/luatypemaps.swg +#usr/share/swig/4.0.2/lua/std_common.i +#usr/share/swig/4.0.2/lua/std_deque.i +#usr/share/swig/4.0.2/lua/std_except.i +#usr/share/swig/4.0.2/lua/std_map.i +#usr/share/swig/4.0.2/lua/std_pair.i +#usr/share/swig/4.0.2/lua/std_string.i +#usr/share/swig/4.0.2/lua/std_vector.i +#usr/share/swig/4.0.2/lua/stl.i +#usr/share/swig/4.0.2/lua/typemaps.i +#usr/share/swig/4.0.2/lua/wchar.i +#usr/share/swig/4.0.2/math.i +#usr/share/swig/4.0.2/mzscheme +#usr/share/swig/4.0.2/mzscheme/mzrun.swg +#usr/share/swig/4.0.2/mzscheme/mzscheme.swg +#usr/share/swig/4.0.2/mzscheme/std_common.i +#usr/share/swig/4.0.2/mzscheme/std_deque.i +#usr/share/swig/4.0.2/mzscheme/std_map.i +#usr/share/swig/4.0.2/mzscheme/std_pair.i +#usr/share/swig/4.0.2/mzscheme/std_string.i +#usr/share/swig/4.0.2/mzscheme/std_vector.i +#usr/share/swig/4.0.2/mzscheme/stl.i +#usr/share/swig/4.0.2/mzscheme/typemaps.i +#usr/share/swig/4.0.2/ocaml +#usr/share/swig/4.0.2/ocaml/carray.i +#usr/share/swig/4.0.2/ocaml/class.swg +#usr/share/swig/4.0.2/ocaml/cstring.i +#usr/share/swig/4.0.2/ocaml/director.swg +#usr/share/swig/4.0.2/ocaml/ocaml.i +#usr/share/swig/4.0.2/ocaml/ocaml.swg +#usr/share/swig/4.0.2/ocaml/ocamlkw.swg +#usr/share/swig/4.0.2/ocaml/ocamlrun.swg +#usr/share/swig/4.0.2/ocaml/ocamlrundec.swg +#usr/share/swig/4.0.2/ocaml/preamble.swg +#usr/share/swig/4.0.2/ocaml/std_common.i +#usr/share/swig/4.0.2/ocaml/std_complex.i +#usr/share/swig/4.0.2/ocaml/std_deque.i +#usr/share/swig/4.0.2/ocaml/std_except.i +#usr/share/swig/4.0.2/ocaml/std_list.i +#usr/share/swig/4.0.2/ocaml/std_map.i +#usr/share/swig/4.0.2/ocaml/std_pair.i +#usr/share/swig/4.0.2/ocaml/std_string.i +#usr/share/swig/4.0.2/ocaml/std_vector.i +#usr/share/swig/4.0.2/ocaml/stl.i +#usr/share/swig/4.0.2/ocaml/swig.ml +#usr/share/swig/4.0.2/ocaml/swig.mli +#usr/share/swig/4.0.2/ocaml/swigp4.ml +#usr/share/swig/4.0.2/ocaml/typecheck.i +#usr/share/swig/4.0.2/ocaml/typemaps.i +#usr/share/swig/4.0.2/ocaml/typeregister.swg +#usr/share/swig/4.0.2/octave +#usr/share/swig/4.0.2/octave/attribute.i +#usr/share/swig/4.0.2/octave/boost_shared_ptr.i +#usr/share/swig/4.0.2/octave/carrays.i +#usr/share/swig/4.0.2/octave/cdata.i +#usr/share/swig/4.0.2/octave/cmalloc.i +#usr/share/swig/4.0.2/octave/director.swg +#usr/share/swig/4.0.2/octave/exception.i +#usr/share/swig/4.0.2/octave/factory.i +#usr/share/swig/4.0.2/octave/implicit.i +#usr/share/swig/4.0.2/octave/octave.swg +#usr/share/swig/4.0.2/octave/octcomplex.swg +#usr/share/swig/4.0.2/octave/octcontainer.swg +#usr/share/swig/4.0.2/octave/octfragments.swg +#usr/share/swig/4.0.2/octave/octheaders.hpp +#usr/share/swig/4.0.2/octave/octiterators.swg +#usr/share/swig/4.0.2/octave/octopers.swg +#usr/share/swig/4.0.2/octave/octprimtypes.swg +#usr/share/swig/4.0.2/octave/octrun.swg +#usr/share/swig/4.0.2/octave/octruntime.swg +#usr/share/swig/4.0.2/octave/octstdcommon.swg +#usr/share/swig/4.0.2/octave/octtypemaps.swg +#usr/share/swig/4.0.2/octave/octuserdir.swg +#usr/share/swig/4.0.2/octave/std_alloc.i +#usr/share/swig/4.0.2/octave/std_basic_string.i +#usr/share/swig/4.0.2/octave/std_carray.i +#usr/share/swig/4.0.2/octave/std_char_traits.i +#usr/share/swig/4.0.2/octave/std_common.i +#usr/share/swig/4.0.2/octave/std_complex.i +#usr/share/swig/4.0.2/octave/std_container.i +#usr/share/swig/4.0.2/octave/std_deque.i +#usr/share/swig/4.0.2/octave/std_except.i +#usr/share/swig/4.0.2/octave/std_list.i +#usr/share/swig/4.0.2/octave/std_map.i +#usr/share/swig/4.0.2/octave/std_pair.i +#usr/share/swig/4.0.2/octave/std_shared_ptr.i +#usr/share/swig/4.0.2/octave/std_string.i +#usr/share/swig/4.0.2/octave/std_vector.i +#usr/share/swig/4.0.2/octave/std_wstring.i +#usr/share/swig/4.0.2/octave/stl.i +#usr/share/swig/4.0.2/octave/typemaps.i +#usr/share/swig/4.0.2/perl5 +#usr/share/swig/4.0.2/perl5/Makefile.pl +#usr/share/swig/4.0.2/perl5/attribute.i +#usr/share/swig/4.0.2/perl5/carrays.i +#usr/share/swig/4.0.2/perl5/cdata.i +#usr/share/swig/4.0.2/perl5/cmalloc.i +#usr/share/swig/4.0.2/perl5/cpointer.i +#usr/share/swig/4.0.2/perl5/cstring.i +#usr/share/swig/4.0.2/perl5/director.swg +#usr/share/swig/4.0.2/perl5/exception.i +#usr/share/swig/4.0.2/perl5/factory.i +#usr/share/swig/4.0.2/perl5/noembed.h +#usr/share/swig/4.0.2/perl5/perl5.swg +#usr/share/swig/4.0.2/perl5/perlerrors.swg +#usr/share/swig/4.0.2/perl5/perlfragments.swg +#usr/share/swig/4.0.2/perl5/perlhead.swg +#usr/share/swig/4.0.2/perl5/perlinit.swg +#usr/share/swig/4.0.2/perl5/perlkw.swg +#usr/share/swig/4.0.2/perl5/perlmacros.swg +#usr/share/swig/4.0.2/perl5/perlmain.i +#usr/share/swig/4.0.2/perl5/perlopers.swg +#usr/share/swig/4.0.2/perl5/perlprimtypes.swg +#usr/share/swig/4.0.2/perl5/perlrun.swg +#usr/share/swig/4.0.2/perl5/perlruntime.swg +#usr/share/swig/4.0.2/perl5/perlstrings.swg +#usr/share/swig/4.0.2/perl5/perltypemaps.swg +#usr/share/swig/4.0.2/perl5/perluserdir.swg +#usr/share/swig/4.0.2/perl5/reference.i +#usr/share/swig/4.0.2/perl5/std_common.i +#usr/share/swig/4.0.2/perl5/std_deque.i +#usr/share/swig/4.0.2/perl5/std_except.i +#usr/share/swig/4.0.2/perl5/std_list.i +#usr/share/swig/4.0.2/perl5/std_map.i +#usr/share/swig/4.0.2/perl5/std_pair.i +#usr/share/swig/4.0.2/perl5/std_string.i +#usr/share/swig/4.0.2/perl5/std_vector.i +#usr/share/swig/4.0.2/perl5/stl.i +#usr/share/swig/4.0.2/perl5/typemaps.i +#usr/share/swig/4.0.2/php +#usr/share/swig/4.0.2/php/const.i +#usr/share/swig/4.0.2/php/director.swg +#usr/share/swig/4.0.2/php/factory.i +#usr/share/swig/4.0.2/php/globalvar.i +#usr/share/swig/4.0.2/php/php.swg +#usr/share/swig/4.0.2/php/phpinit.swg +#usr/share/swig/4.0.2/php/phpkw.swg +#usr/share/swig/4.0.2/php/phppointers.i +#usr/share/swig/4.0.2/php/phprun.swg +#usr/share/swig/4.0.2/php/std_common.i +#usr/share/swig/4.0.2/php/std_deque.i +#usr/share/swig/4.0.2/php/std_map.i +#usr/share/swig/4.0.2/php/std_pair.i +#usr/share/swig/4.0.2/php/std_string.i +#usr/share/swig/4.0.2/php/std_vector.i +#usr/share/swig/4.0.2/php/stl.i +#usr/share/swig/4.0.2/php/typemaps.i +#usr/share/swig/4.0.2/php/utils.i +#usr/share/swig/4.0.2/pointer.i +#usr/share/swig/4.0.2/python +#usr/share/swig/4.0.2/python/argcargv.i +#usr/share/swig/4.0.2/python/attribute.i +#usr/share/swig/4.0.2/python/boost_shared_ptr.i +#usr/share/swig/4.0.2/python/builtin.swg +#usr/share/swig/4.0.2/python/carrays.i +#usr/share/swig/4.0.2/python/ccomplex.i +#usr/share/swig/4.0.2/python/cdata.i +#usr/share/swig/4.0.2/python/cmalloc.i +#usr/share/swig/4.0.2/python/complex.i +#usr/share/swig/4.0.2/python/cpointer.i +#usr/share/swig/4.0.2/python/cstring.i +#usr/share/swig/4.0.2/python/cwstring.i +#usr/share/swig/4.0.2/python/defarg.swg +#usr/share/swig/4.0.2/python/director.swg +#usr/share/swig/4.0.2/python/embed.i +#usr/share/swig/4.0.2/python/exception.i +#usr/share/swig/4.0.2/python/factory.i +#usr/share/swig/4.0.2/python/file.i +#usr/share/swig/4.0.2/python/implicit.i +#usr/share/swig/4.0.2/python/pyabc.i +#usr/share/swig/4.0.2/python/pyapi.swg +#usr/share/swig/4.0.2/python/pybackward.swg +#usr/share/swig/4.0.2/python/pybuffer.i +#usr/share/swig/4.0.2/python/pyclasses.swg +#usr/share/swig/4.0.2/python/pycomplex.swg +#usr/share/swig/4.0.2/python/pycontainer.swg +#usr/share/swig/4.0.2/python/pydocs.swg +#usr/share/swig/4.0.2/python/pyerrors.swg +#usr/share/swig/4.0.2/python/pyfragments.swg +#usr/share/swig/4.0.2/python/pyhead.swg +#usr/share/swig/4.0.2/python/pyinit.swg +#usr/share/swig/4.0.2/python/pyiterators.swg +#usr/share/swig/4.0.2/python/pymacros.swg +#usr/share/swig/4.0.2/python/pyname_compat.i +#usr/share/swig/4.0.2/python/pyopers.swg +#usr/share/swig/4.0.2/python/pyprimtypes.swg +#usr/share/swig/4.0.2/python/pyrun.swg +#usr/share/swig/4.0.2/python/pyruntime.swg +#usr/share/swig/4.0.2/python/pystdcommon.swg +#usr/share/swig/4.0.2/python/pystrings.swg +#usr/share/swig/4.0.2/python/python.swg +#usr/share/swig/4.0.2/python/pythonkw.swg +#usr/share/swig/4.0.2/python/pythreads.swg +#usr/share/swig/4.0.2/python/pytuplehlp.swg +#usr/share/swig/4.0.2/python/pytypemaps.swg +#usr/share/swig/4.0.2/python/pyuserdir.swg +#usr/share/swig/4.0.2/python/pywstrings.swg +#usr/share/swig/4.0.2/python/std_alloc.i +#usr/share/swig/4.0.2/python/std_array.i +#usr/share/swig/4.0.2/python/std_auto_ptr.i +#usr/share/swig/4.0.2/python/std_basic_string.i +#usr/share/swig/4.0.2/python/std_carray.i +#usr/share/swig/4.0.2/python/std_char_traits.i +#usr/share/swig/4.0.2/python/std_common.i +#usr/share/swig/4.0.2/python/std_complex.i +#usr/share/swig/4.0.2/python/std_container.i +#usr/share/swig/4.0.2/python/std_deque.i +#usr/share/swig/4.0.2/python/std_except.i +#usr/share/swig/4.0.2/python/std_ios.i +#usr/share/swig/4.0.2/python/std_iostream.i +#usr/share/swig/4.0.2/python/std_list.i +#usr/share/swig/4.0.2/python/std_map.i +#usr/share/swig/4.0.2/python/std_multimap.i +#usr/share/swig/4.0.2/python/std_multiset.i +#usr/share/swig/4.0.2/python/std_pair.i +#usr/share/swig/4.0.2/python/std_set.i +#usr/share/swig/4.0.2/python/std_shared_ptr.i +#usr/share/swig/4.0.2/python/std_sstream.i +#usr/share/swig/4.0.2/python/std_streambuf.i +#usr/share/swig/4.0.2/python/std_string.i +#usr/share/swig/4.0.2/python/std_unordered_map.i +#usr/share/swig/4.0.2/python/std_unordered_multimap.i +#usr/share/swig/4.0.2/python/std_unordered_multiset.i +#usr/share/swig/4.0.2/python/std_unordered_set.i +#usr/share/swig/4.0.2/python/std_vector.i +#usr/share/swig/4.0.2/python/std_vectora.i +#usr/share/swig/4.0.2/python/std_wios.i +#usr/share/swig/4.0.2/python/std_wiostream.i +#usr/share/swig/4.0.2/python/std_wsstream.i +#usr/share/swig/4.0.2/python/std_wstreambuf.i +#usr/share/swig/4.0.2/python/std_wstring.i +#usr/share/swig/4.0.2/python/stl.i +#usr/share/swig/4.0.2/python/typemaps.i +#usr/share/swig/4.0.2/python/wchar.i +#usr/share/swig/4.0.2/r +#usr/share/swig/4.0.2/r/boost_shared_ptr.i +#usr/share/swig/4.0.2/r/cdata.i +#usr/share/swig/4.0.2/r/exception.i +#usr/share/swig/4.0.2/r/r.swg +#usr/share/swig/4.0.2/r/rcontainer.swg +#usr/share/swig/4.0.2/r/rfragments.swg +#usr/share/swig/4.0.2/r/rkw.swg +#usr/share/swig/4.0.2/r/ropers.swg +#usr/share/swig/4.0.2/r/rrun.swg +#usr/share/swig/4.0.2/r/rstdcommon.swg +#usr/share/swig/4.0.2/r/rtype.swg +#usr/share/swig/4.0.2/r/srun.swg +#usr/share/swig/4.0.2/r/std_alloc.i +#usr/share/swig/4.0.2/r/std_common.i +#usr/share/swig/4.0.2/r/std_container.i +#usr/share/swig/4.0.2/r/std_deque.i +#usr/share/swig/4.0.2/r/std_except.i +#usr/share/swig/4.0.2/r/std_list.i +#usr/share/swig/4.0.2/r/std_map.i +#usr/share/swig/4.0.2/r/std_pair.i +#usr/share/swig/4.0.2/r/std_shared_ptr.i +#usr/share/swig/4.0.2/r/std_string.i +#usr/share/swig/4.0.2/r/std_vector.i +#usr/share/swig/4.0.2/r/stl.i +#usr/share/swig/4.0.2/r/typemaps.i +#usr/share/swig/4.0.2/ruby +#usr/share/swig/4.0.2/ruby/Makefile.swig +#usr/share/swig/4.0.2/ruby/argcargv.i +#usr/share/swig/4.0.2/ruby/attribute.i +#usr/share/swig/4.0.2/ruby/boost_shared_ptr.i +#usr/share/swig/4.0.2/ruby/carrays.i +#usr/share/swig/4.0.2/ruby/cdata.i +#usr/share/swig/4.0.2/ruby/cmalloc.i +#usr/share/swig/4.0.2/ruby/cpointer.i +#usr/share/swig/4.0.2/ruby/cstring.i +#usr/share/swig/4.0.2/ruby/director.swg +#usr/share/swig/4.0.2/ruby/embed.i +#usr/share/swig/4.0.2/ruby/exception.i +#usr/share/swig/4.0.2/ruby/extconf.rb +#usr/share/swig/4.0.2/ruby/factory.i +#usr/share/swig/4.0.2/ruby/file.i +#usr/share/swig/4.0.2/ruby/progargcargv.i +#usr/share/swig/4.0.2/ruby/ruby.swg +#usr/share/swig/4.0.2/ruby/rubyapi.swg +#usr/share/swig/4.0.2/ruby/rubyautodoc.swg +#usr/share/swig/4.0.2/ruby/rubyclasses.swg +#usr/share/swig/4.0.2/ruby/rubycomplex.swg +#usr/share/swig/4.0.2/ruby/rubycontainer.swg +#usr/share/swig/4.0.2/ruby/rubycontainer_extended.swg +#usr/share/swig/4.0.2/ruby/rubydef.swg +#usr/share/swig/4.0.2/ruby/rubyerrors.swg +#usr/share/swig/4.0.2/ruby/rubyfragments.swg +#usr/share/swig/4.0.2/ruby/rubyhead.swg +#usr/share/swig/4.0.2/ruby/rubyinit.swg +#usr/share/swig/4.0.2/ruby/rubyiterators.swg +#usr/share/swig/4.0.2/ruby/rubykw.swg +#usr/share/swig/4.0.2/ruby/rubymacros.swg +#usr/share/swig/4.0.2/ruby/rubyopers.swg +#usr/share/swig/4.0.2/ruby/rubyprimtypes.swg +#usr/share/swig/4.0.2/ruby/rubyrun.swg +#usr/share/swig/4.0.2/ruby/rubyruntime.swg +#usr/share/swig/4.0.2/ruby/rubystdautodoc.swg +#usr/share/swig/4.0.2/ruby/rubystdcommon.swg +#usr/share/swig/4.0.2/ruby/rubystdcommon_forward.swg +#usr/share/swig/4.0.2/ruby/rubystdfunctors.swg +#usr/share/swig/4.0.2/ruby/rubystrings.swg +#usr/share/swig/4.0.2/ruby/rubytracking.swg +#usr/share/swig/4.0.2/ruby/rubytypemaps.swg +#usr/share/swig/4.0.2/ruby/rubyuserdir.swg +#usr/share/swig/4.0.2/ruby/rubywstrings.swg +#usr/share/swig/4.0.2/ruby/std_alloc.i +#usr/share/swig/4.0.2/ruby/std_array.i +#usr/share/swig/4.0.2/ruby/std_auto_ptr.i +#usr/share/swig/4.0.2/ruby/std_basic_string.i +#usr/share/swig/4.0.2/ruby/std_char_traits.i +#usr/share/swig/4.0.2/ruby/std_common.i +#usr/share/swig/4.0.2/ruby/std_complex.i +#usr/share/swig/4.0.2/ruby/std_container.i +#usr/share/swig/4.0.2/ruby/std_deque.i +#usr/share/swig/4.0.2/ruby/std_except.i +#usr/share/swig/4.0.2/ruby/std_functors.i +#usr/share/swig/4.0.2/ruby/std_ios.i +#usr/share/swig/4.0.2/ruby/std_iostream.i +#usr/share/swig/4.0.2/ruby/std_list.i +#usr/share/swig/4.0.2/ruby/std_map.i +#usr/share/swig/4.0.2/ruby/std_multimap.i +#usr/share/swig/4.0.2/ruby/std_multiset.i +#usr/share/swig/4.0.2/ruby/std_pair.i +#usr/share/swig/4.0.2/ruby/std_queue.i +#usr/share/swig/4.0.2/ruby/std_set.i +#usr/share/swig/4.0.2/ruby/std_shared_ptr.i +#usr/share/swig/4.0.2/ruby/std_sstream.i +#usr/share/swig/4.0.2/ruby/std_stack.i +#usr/share/swig/4.0.2/ruby/std_streambuf.i +#usr/share/swig/4.0.2/ruby/std_string.i +#usr/share/swig/4.0.2/ruby/std_unordered_map.i +#usr/share/swig/4.0.2/ruby/std_unordered_multimap.i +#usr/share/swig/4.0.2/ruby/std_unordered_multiset.i +#usr/share/swig/4.0.2/ruby/std_unordered_set.i +#usr/share/swig/4.0.2/ruby/std_vector.i +#usr/share/swig/4.0.2/ruby/std_vectora.i +#usr/share/swig/4.0.2/ruby/std_wstring.i +#usr/share/swig/4.0.2/ruby/stl.i +#usr/share/swig/4.0.2/ruby/timeval.i +#usr/share/swig/4.0.2/ruby/typemaps.i +#usr/share/swig/4.0.2/runtime.swg +#usr/share/swig/4.0.2/scilab +#usr/share/swig/4.0.2/scilab/boost_shared_ptr.i +#usr/share/swig/4.0.2/scilab/carrays.i +#usr/share/swig/4.0.2/scilab/cmalloc.i +#usr/share/swig/4.0.2/scilab/cpointer.i +#usr/share/swig/4.0.2/scilab/exception.i +#usr/share/swig/4.0.2/scilab/matrix.i +#usr/share/swig/4.0.2/scilab/sciarray.swg +#usr/share/swig/4.0.2/scilab/scibool.swg +#usr/share/swig/4.0.2/scilab/scichar.swg +#usr/share/swig/4.0.2/scilab/scicontainer.swg +#usr/share/swig/4.0.2/scilab/scidouble.swg +#usr/share/swig/4.0.2/scilab/scienum.swg +#usr/share/swig/4.0.2/scilab/sciexception.swg +#usr/share/swig/4.0.2/scilab/scifloat.swg +#usr/share/swig/4.0.2/scilab/sciint.swg +#usr/share/swig/4.0.2/scilab/sciiterators.swg +#usr/share/swig/4.0.2/scilab/scilab.swg +#usr/share/swig/4.0.2/scilab/scilist.swg +#usr/share/swig/4.0.2/scilab/scilong.swg +#usr/share/swig/4.0.2/scilab/scilonglong.swg +#usr/share/swig/4.0.2/scilab/scimacros.swg +#usr/share/swig/4.0.2/scilab/scimatrixbool.swg +#usr/share/swig/4.0.2/scilab/scimatrixchar.swg +#usr/share/swig/4.0.2/scilab/scimatrixdouble.swg +#usr/share/swig/4.0.2/scilab/scimatrixint.swg +#usr/share/swig/4.0.2/scilab/scimisctypes.swg +#usr/share/swig/4.0.2/scilab/scipointer.swg +#usr/share/swig/4.0.2/scilab/sciprimtypes.swg +#usr/share/swig/4.0.2/scilab/scirun.swg +#usr/share/swig/4.0.2/scilab/sciruntime.swg +#usr/share/swig/4.0.2/scilab/scisequence.swg +#usr/share/swig/4.0.2/scilab/scisequencebool.swg +#usr/share/swig/4.0.2/scilab/scisequencedouble.swg +#usr/share/swig/4.0.2/scilab/scisequencefloat.swg +#usr/share/swig/4.0.2/scilab/scisequenceint.swg +#usr/share/swig/4.0.2/scilab/scisequencepointer.swg +#usr/share/swig/4.0.2/scilab/scisequencestring.swg +#usr/share/swig/4.0.2/scilab/scishort.swg +#usr/share/swig/4.0.2/scilab/scisignedchar.swg +#usr/share/swig/4.0.2/scilab/scistdcommon.swg +#usr/share/swig/4.0.2/scilab/scitypemaps.swg +#usr/share/swig/4.0.2/scilab/sciunsignedchar.swg +#usr/share/swig/4.0.2/scilab/sciunsignedint.swg +#usr/share/swig/4.0.2/scilab/sciunsignedlong.swg +#usr/share/swig/4.0.2/scilab/sciunsignedshort.swg +#usr/share/swig/4.0.2/scilab/std_alloc.i +#usr/share/swig/4.0.2/scilab/std_basic_string.i +#usr/share/swig/4.0.2/scilab/std_char_traits.i +#usr/share/swig/4.0.2/scilab/std_common.i +#usr/share/swig/4.0.2/scilab/std_container.i +#usr/share/swig/4.0.2/scilab/std_deque.i +#usr/share/swig/4.0.2/scilab/std_except.i +#usr/share/swig/4.0.2/scilab/std_list.i +#usr/share/swig/4.0.2/scilab/std_map.i +#usr/share/swig/4.0.2/scilab/std_multiset.i +#usr/share/swig/4.0.2/scilab/std_pair.i +#usr/share/swig/4.0.2/scilab/std_set.i +#usr/share/swig/4.0.2/scilab/std_shared_ptr.i +#usr/share/swig/4.0.2/scilab/std_string.i +#usr/share/swig/4.0.2/scilab/std_vector.i +#usr/share/swig/4.0.2/scilab/stl.i +#usr/share/swig/4.0.2/scilab/typemaps.i +#usr/share/swig/4.0.2/shared_ptr.i +#usr/share/swig/4.0.2/std +#usr/share/swig/4.0.2/std/_std_deque.i +#usr/share/swig/4.0.2/std/std_alloc.i +#usr/share/swig/4.0.2/std/std_array.i +#usr/share/swig/4.0.2/std/std_basic_string.i +#usr/share/swig/4.0.2/std/std_carray.swg +#usr/share/swig/4.0.2/std/std_char_traits.i +#usr/share/swig/4.0.2/std/std_common.i +#usr/share/swig/4.0.2/std/std_container.i +#usr/share/swig/4.0.2/std/std_deque.i +#usr/share/swig/4.0.2/std/std_except.i +#usr/share/swig/4.0.2/std/std_ios.i +#usr/share/swig/4.0.2/std/std_iostream.i +#usr/share/swig/4.0.2/std/std_list.i +#usr/share/swig/4.0.2/std/std_map.i +#usr/share/swig/4.0.2/std/std_multimap.i +#usr/share/swig/4.0.2/std/std_multiset.i +#usr/share/swig/4.0.2/std/std_pair.i +#usr/share/swig/4.0.2/std/std_queue.i +#usr/share/swig/4.0.2/std/std_set.i +#usr/share/swig/4.0.2/std/std_sstream.i +#usr/share/swig/4.0.2/std/std_stack.i +#usr/share/swig/4.0.2/std/std_streambuf.i +#usr/share/swig/4.0.2/std/std_string.i +#usr/share/swig/4.0.2/std/std_unordered_map.i +#usr/share/swig/4.0.2/std/std_unordered_multimap.i +#usr/share/swig/4.0.2/std/std_unordered_multiset.i +#usr/share/swig/4.0.2/std/std_unordered_set.i +#usr/share/swig/4.0.2/std/std_vector.i +#usr/share/swig/4.0.2/std/std_vectora.i +#usr/share/swig/4.0.2/std/std_wios.i +#usr/share/swig/4.0.2/std/std_wiostream.i +#usr/share/swig/4.0.2/std/std_wsstream.i +#usr/share/swig/4.0.2/std/std_wstreambuf.i +#usr/share/swig/4.0.2/std/std_wstring.i +#usr/share/swig/4.0.2/std_except.i +#usr/share/swig/4.0.2/stdint.i +#usr/share/swig/4.0.2/stl.i +#usr/share/swig/4.0.2/swig.swg +#usr/share/swig/4.0.2/swigarch.i +#usr/share/swig/4.0.2/swigerrors.swg +#usr/share/swig/4.0.2/swigfragments.swg +#usr/share/swig/4.0.2/swiginit.swg +#usr/share/swig/4.0.2/swiglabels.swg +#usr/share/swig/4.0.2/swigrun.i +#usr/share/swig/4.0.2/swigrun.swg +#usr/share/swig/4.0.2/swigwarn.swg +#usr/share/swig/4.0.2/swigwarnings.swg +#usr/share/swig/4.0.2/tcl +#usr/share/swig/4.0.2/tcl/attribute.i +#usr/share/swig/4.0.2/tcl/carrays.i +#usr/share/swig/4.0.2/tcl/cdata.i +#usr/share/swig/4.0.2/tcl/cmalloc.i +#usr/share/swig/4.0.2/tcl/cpointer.i +#usr/share/swig/4.0.2/tcl/cstring.i +#usr/share/swig/4.0.2/tcl/cwstring.i +#usr/share/swig/4.0.2/tcl/exception.i +#usr/share/swig/4.0.2/tcl/factory.i +#usr/share/swig/4.0.2/tcl/std_common.i +#usr/share/swig/4.0.2/tcl/std_deque.i +#usr/share/swig/4.0.2/tcl/std_except.i +#usr/share/swig/4.0.2/tcl/std_map.i +#usr/share/swig/4.0.2/tcl/std_pair.i +#usr/share/swig/4.0.2/tcl/std_string.i +#usr/share/swig/4.0.2/tcl/std_vector.i +#usr/share/swig/4.0.2/tcl/std_wstring.i +#usr/share/swig/4.0.2/tcl/stl.i +#usr/share/swig/4.0.2/tcl/tcl8.swg +#usr/share/swig/4.0.2/tcl/tclapi.swg +#usr/share/swig/4.0.2/tcl/tclerrors.swg +#usr/share/swig/4.0.2/tcl/tclfragments.swg +#usr/share/swig/4.0.2/tcl/tclinit.swg +#usr/share/swig/4.0.2/tcl/tclinterp.i +#usr/share/swig/4.0.2/tcl/tclkw.swg +#usr/share/swig/4.0.2/tcl/tclmacros.swg +#usr/share/swig/4.0.2/tcl/tclopers.swg +#usr/share/swig/4.0.2/tcl/tclprimtypes.swg +#usr/share/swig/4.0.2/tcl/tclresult.i +#usr/share/swig/4.0.2/tcl/tclrun.swg +#usr/share/swig/4.0.2/tcl/tclruntime.swg +#usr/share/swig/4.0.2/tcl/tclsh.i +#usr/share/swig/4.0.2/tcl/tclstrings.swg +#usr/share/swig/4.0.2/tcl/tcltypemaps.swg +#usr/share/swig/4.0.2/tcl/tcluserdir.swg +#usr/share/swig/4.0.2/tcl/tclwstrings.swg +#usr/share/swig/4.0.2/tcl/typemaps.i +#usr/share/swig/4.0.2/tcl/wish.i +#usr/share/swig/4.0.2/typemaps +#usr/share/swig/4.0.2/typemaps/attribute.swg +#usr/share/swig/4.0.2/typemaps/carrays.swg +#usr/share/swig/4.0.2/typemaps/cdata.swg +#usr/share/swig/4.0.2/typemaps/cmalloc.swg +#usr/share/swig/4.0.2/typemaps/cpointer.swg +#usr/share/swig/4.0.2/typemaps/cstring.swg +#usr/share/swig/4.0.2/typemaps/cstrings.swg +#usr/share/swig/4.0.2/typemaps/cwstring.swg +#usr/share/swig/4.0.2/typemaps/enumint.swg +#usr/share/swig/4.0.2/typemaps/exception.swg +#usr/share/swig/4.0.2/typemaps/factory.swg +#usr/share/swig/4.0.2/typemaps/fragments.swg +#usr/share/swig/4.0.2/typemaps/implicit.swg +#usr/share/swig/4.0.2/typemaps/inoutlist.swg +#usr/share/swig/4.0.2/typemaps/misctypes.swg +#usr/share/swig/4.0.2/typemaps/primtypes.swg +#usr/share/swig/4.0.2/typemaps/ptrtypes.swg +#usr/share/swig/4.0.2/typemaps/std_except.swg +#usr/share/swig/4.0.2/typemaps/std_string.swg +#usr/share/swig/4.0.2/typemaps/std_strings.swg +#usr/share/swig/4.0.2/typemaps/std_wstring.swg +#usr/share/swig/4.0.2/typemaps/string.swg +#usr/share/swig/4.0.2/typemaps/strings.swg +#usr/share/swig/4.0.2/typemaps/swigmacros.swg +#usr/share/swig/4.0.2/typemaps/swigobject.swg +#usr/share/swig/4.0.2/typemaps/swigtype.swg +#usr/share/swig/4.0.2/typemaps/swigtypemaps.swg +#usr/share/swig/4.0.2/typemaps/typemaps.swg +#usr/share/swig/4.0.2/typemaps/valtypes.swg +#usr/share/swig/4.0.2/typemaps/void.swg +#usr/share/swig/4.0.2/typemaps/wstring.swg +#usr/share/swig/4.0.2/wchar.i +#usr/share/swig/4.0.2/windows.i +#usr/share/swig/4.0.2/xml +#usr/share/swig/4.0.2/xml/typemaps.i +#usr/share/swig/4.0.2/xml/xml.swg diff --git a/lfs/swig b/lfs/swig index 93ac4d7ab..355308ec9 100644 --- a/lfs/swig +++ b/lfs/swig @@ -24,7 +24,7 @@ include Config -VER = 3.0.12 +VER = 4.0.2 THISAPP = swig-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 82133dfa7bba75ff9ad98a7046be687c +$(DL_FILE)_MD5 = 7c3e46cb5af2b469722cafa0d91e127b install : $(TARGET) -- 2.31.0

2 1

Fireperf: first tests an results
by daniel.weismueller＠ipfire.org 18 Apr '22

18 Apr '22

Hi guys, today I installed fireperf on my testing IPFire and my Ubuntu PC. server: IPFire Core 154; Intel i7 4790; Intel 82571EB/GB 1GBit Nic Client: Ubuntu 20.4; Intel i7 9700; Intel i219-V 1GBit Nic Michael and I agreed that one more port should be opened per 5000 expected connection per second (cps) So here my results: Server: fireperf -s -P 10000 -p 63000:630010 Client: fireperf -c <IP address> -P 1 -x -p 63000:63010 -> ~5000 cps fireperf -c <IP address> -P 10 -x -p 63000:63010 -> ~30000-35000 cps fireperf -c <IP address> -P 100 -x -p 63000:63010 -> ~35000-40000 cps fireperf -c <IP address> -P 1000 -x -p 63000:63010 -> ~40000-45000 cps fireperf -c <IP address> -P 10000 -x -p 63000:63010 -> ~46000-48000 cps The cpu utilization was limited to one core and increased in sync with the cps on both sides. In my last test, the utilization was about 85-100% on the server and 75-95% on the client. In the next days I will test our mini and post the results here. - Daniel

4 10

Porting IPFire 2 to RISC-V
by Michael Tremer 15 Feb '22

15 Feb '22

Hello, Apologies that this email comes a bit late and my changes have caused some confusion on the list, but better late than never. I have spent some time to port IPFire 2 to RISC-V. This is nothing that had a very high priority, but I wanted to get my hands on it to see whether it was “just another architecture” that could bring us 1% of users, or if it was different from ARM which we already support as an alternative architecture to x86. To keep it short, RISC-V seems to be very different. In a good way. But it is too soon. The bootstrap for ARM took many months whereas this port compiled almost on the first go. There were some issues with autotools, but no bigger linker issues in the toolchain, assembly errors or simply where a build process broken because it didn’t recognise the architecture. The only exception was that PCRE/PCRE2 do not have support for RISC-V for their JIT, yet. Therefore I decided to merge the branch with all required changes into the main repository because there are no changes that will break anything else. This was a very nice experience. As a package maintainer, you probably just switch on RISC-V and you are done. There are, however, a couple of downsides. The biggest one is that I didn’t have hardware and that there isn’t much available at this point in time. The development boards are too expensive and I didn’t even consider to buy one because even if I could compile IPFire for RISC-V in reasonable time, literally nobody will be able to use it. With ARM, we were quite early and we can only conclude that that wasn’t a good thing. We ran into loads of problems with the architecture and we still have *very* limited choice of hardware available. At least RISC-V does not seem to cause these issues on the software development side, which might make support for it a lot less painful for us. Yay. I have used QEMU to emulate the whole architecture and it can be built on any machine that has qemu-system-riscv64 installed. Please do not forget to download the toolchain first. Although QEMU is fast, compiling it took about three days on a 12-core Xeon processor that was a little bit dated actually. One of the biggest pain points is Rust which isn’t available at all for RISC-V and therefore I could not build suricata. Due to the lack of real-world application for this and our limited usage of Rust this won’t be a problem for now, but probably further down the line. So, what we are going to do with it? I will probably compile it every once in a while just to check if it is still compiling. There is no point in uploading it to a server yet because nobody will be able to use it. I unfortunately have no connection to the (RISC-V) hardware industry. If someone does have such connection, please let me know. It would be great to have some development hardware to use and make IPFire boot on it. We would also require some strong build power to not delay development because of adding another architecture. Those are my thoughts on this :) -Michael

1 1

[PATCH] BUG11695: Adding/editing rules with preset broken
by Alexander Marx 15 Jul '21

15 Jul '21

added another check to fill same ports in source and destination when a custom service is selected. Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Reported-by: erik(a)vanlinsteeict.nl --- html/cgi-bin/firewall.cgi | 1 + 1 file changed, 1 insertion(+) diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index 499f279..d17afab 100644 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -757,6 +757,7 @@ sub checkrule } } if($fwdfwsettings{'nat'} eq 'dnat' && $fwdfwsettings{'dnatport'} eq ''){$fwdfwsettings{'dnatport'}=$custsrvport;} + if($fwdfwsettings{'nat'} eq 'dnat' && $fwdfwsettings{'grp3'} eq 'cust_srv'){$fwdfwsettings{'dnatport'}=$custsrvport;} } #check if DNAT port is multiple if($fwdfwsettings{'nat'} eq 'dnat' && $fwdfwsettings{'dnatport'} ne ''){ -- 2.7.4

3 2

[PATCH] python3-msgpack: update to 1.0.0
by Peter Müller 04 Jun '21

04 Jun '21

Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- config/rootfiles/packages/python3-msgpack | 14 +++++++------- lfs/python3-msgpack | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/config/rootfiles/packages/python3-msgpack b/config/rootfiles/packages/python3-msgpack index a25f071b8..b82cd4faf 100644 --- a/config/rootfiles/packages/python3-msgpack +++ b/config/rootfiles/packages/python3-msgpack @@ -1,12 +1,12 @@ #usr/lib/python3.8/site-packages/msgpack +#usr/lib/python3.8/site-packages/msgpack-1.0.0-py3.8.egg-info +#usr/lib/python3.8/site-packages/msgpack-1.0.0-py3.8.egg-info/PKG-INFO +#usr/lib/python3.8/site-packages/msgpack-1.0.0-py3.8.egg-info/SOURCES.txt +#usr/lib/python3.8/site-packages/msgpack-1.0.0-py3.8.egg-info/dependency_links.txt +#usr/lib/python3.8/site-packages/msgpack-1.0.0-py3.8.egg-info/top_level.txt usr/lib/python3.8/site-packages/msgpack/__init__.py -usr/lib/python3.8/site-packages/msgpack/_packer.cpython-38-MACHINE-linux-gnu.so -usr/lib/python3.8/site-packages/msgpack/_unpacker.cpython-38-MACHINE-linux-gnu.so +usr/lib/python3.8/site-packages/msgpack/_cmsgpack.cpython-38-MACHINE-linux-gnu.so usr/lib/python3.8/site-packages/msgpack/_version.py usr/lib/python3.8/site-packages/msgpack/exceptions.py +usr/lib/python3.8/site-packages/msgpack/ext.py usr/lib/python3.8/site-packages/msgpack/fallback.py -#usr/lib/python3.8/site-packages/msgpack_python-0.5.6-py3.8.egg-info -#usr/lib/python3.8/site-packages/msgpack_python-0.5.6-py3.8.egg-info/PKG-INFO -#usr/lib/python3.8/site-packages/msgpack_python-0.5.6-py3.8.egg-info/SOURCES.txt -#usr/lib/python3.8/site-packages/msgpack_python-0.5.6-py3.8.egg-info/dependency_links.txt -#usr/lib/python3.8/site-packages/msgpack_python-0.5.6-py3.8.egg-info/top_level.txt diff --git a/lfs/python3-msgpack b/lfs/python3-msgpack index dc764f5b3..5f539eda3 100644 --- a/lfs/python3-msgpack +++ b/lfs/python3-msgpack @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2020 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,15 +24,15 @@ include Config -VER = 0.5.6 +VER = 1.0.0 -THISAPP = msgpack-python-$(VER) +THISAPP = msgpack-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = python3-msgpack -PAK_VER = 2 +PAK_VER = 3 DEPS = @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 6d644c06a87a5a111bbbf5b34b4be440 +$(DL_FILE)_MD5 = c35ee8f991dad3969884e9585e56ebba install : $(TARGET) -- 2.26.1

2 2

[PATCH] (V3) Forcing DNS/NTP
by Matthias Fischer 31 May '21

31 May '21

Originally triggered by: https://community.ipfire.org/t/forcing-all-dns-traffic-from-the-lan-to-the-… Current discussion: https://community.ipfire.org/t/testing-dns-redirect-code-snippet/3888 Summary and functionality: These patches are controlled through "Firewall Options". They add new firewall-[DNS/NTP]_FORCED_ON_[INTERFACE]-options to '/var/ipfire/optionsfw/settings'. They activate/deactivate appropriate REDIRECT rules through a new ctrl file ('/usr/local/bin/dnsntpctrl') and a new init file ('/etc/rc.d/init.d/dnsntp'). Default of all new rules is OFF (set in 'lfs/configroot'). If set to ON, they REDIRECT all DNS and NTP requests (TCP/UDP) to the DNS and NTP servers specified in IPFire. GUI links to DNS and NTP options were added to make this more transparent. Flaw/ToDo: To make things work as I wanted I had to add a 'dnsntpctrl' file which calls the actual init file, 'dnsntp'. This is actually an unnecessary detour. In fact I wanted to merge these two files in *one* C file, but this was beyond my capabilities, perhaps "someone" else knows how to program this. Changed visibility (GUI, 'optionsfw.cgi') and some cosmetics: The corresponding interface options - including 'Masquerade ...' - are only visible if the respective interface actually exists. If BLUE interface doesn't exist, there are no ON/OFF switches for 'DNS/NTP on BLUE' or logging options for BLUE available (e.g.). Added text colors for better readability and links to DNS and NTP GUI. Separated logging options per interface. No reboot required: Rules can be switched ON/OFF without rebooting IPFire. Changes immedediatly take effect after clicking 'Save'. Changes to '/etc/rc.d/init.d/firewall': To avoid collisions with possibly existing CUSTOM rules, I added a new PREROUTING chain: DNS_NTP_REDIRECT. This chain is flushed by the init file before before the desired settings are applied. Corrected a 'trafic' typo. Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/common/aarch64/initscripts | 1 + config/rootfiles/common/armv5tel/initscripts | 1 + config/rootfiles/common/i586/initscripts | 1 + config/rootfiles/common/misc-progs | 1 + config/rootfiles/common/x86_64/initscripts | 1 + html/cgi-bin/optionsfw.cgi | 92 ++++++++++++++++---- langs/de/cgi-bin/de.pl | 15 +++- langs/en/cgi-bin/en.pl | 15 +++- lfs/configroot | 4 + src/initscripts/system/dnsntp | 36 ++++++++ src/initscripts/system/firewall | 9 +- src/misc-progs/Makefile | 2 +- src/misc-progs/dnsntpctrl.c | 19 ++++ 13 files changed, 168 insertions(+), 29 deletions(-) create mode 100644 src/initscripts/system/dnsntp create mode 100644 src/misc-progs/dnsntpctrl.c diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/common/aarch64/initscripts index 800005966..f38a3a294 100644 --- a/config/rootfiles/common/aarch64/initscripts +++ b/config/rootfiles/common/aarch64/initscripts @@ -20,6 +20,7 @@ etc/rc.d/init.d/conntrackd etc/rc.d/init.d/console etc/rc.d/init.d/dhcp etc/rc.d/init.d/dhcrelay +etc/rc.d/init.d/dnsntp etc/rc.d/init.d/fcron etc/rc.d/init.d/fireinfo etc/rc.d/init.d/firewall diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index 800005966..f38a3a294 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -20,6 +20,7 @@ etc/rc.d/init.d/conntrackd etc/rc.d/init.d/console etc/rc.d/init.d/dhcp etc/rc.d/init.d/dhcrelay +etc/rc.d/init.d/dnsntp etc/rc.d/init.d/fcron etc/rc.d/init.d/fireinfo etc/rc.d/init.d/firewall diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index 18c5a897a..a3a2b47f7 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -20,6 +20,7 @@ etc/rc.d/init.d/conntrackd etc/rc.d/init.d/console etc/rc.d/init.d/dhcp etc/rc.d/init.d/dhcrelay +etc/rc.d/init.d/dnsntp etc/rc.d/init.d/fcron etc/rc.d/init.d/fireinfo etc/rc.d/init.d/firewall diff --git a/config/rootfiles/common/misc-progs b/config/rootfiles/common/misc-progs index d6594b3f8..4bcb94812 100644 --- a/config/rootfiles/common/misc-progs +++ b/config/rootfiles/common/misc-progs @@ -5,6 +5,7 @@ usr/local/bin/captivectrl usr/local/bin/collectdctrl usr/local/bin/ddnsctrl usr/local/bin/dhcpctrl +usr/local/bin/dnsntpctrl usr/local/bin/extrahdctrl usr/local/bin/fireinfoctrl usr/local/bin/firewallctrl diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts index 18c5a897a..a3a2b47f7 100644 --- a/config/rootfiles/common/x86_64/initscripts +++ b/config/rootfiles/common/x86_64/initscripts @@ -20,6 +20,7 @@ etc/rc.d/init.d/conntrackd etc/rc.d/init.d/console etc/rc.d/init.d/dhcp etc/rc.d/init.d/dhcrelay +etc/rc.d/init.d/dnsntp etc/rc.d/init.d/fcron etc/rc.d/init.d/fireinfo etc/rc.d/init.d/firewall diff --git a/html/cgi-bin/optionsfw.cgi b/html/cgi-bin/optionsfw.cgi index 321642e82..3fc707e8b 100644 --- a/html/cgi-bin/optionsfw.cgi +++ b/html/cgi-bin/optionsfw.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2014-2020 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2014-2021 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 # @@ -50,6 +50,7 @@ if ($settings{'ACTION'} eq $Lang::tr{'save'}) { $errormessage .= $Lang::tr{'new optionsfw later'}; &General::writehash($filename, \%settings); # Save good settings system("/usr/local/bin/firewallctrl"); + system("/usr/local/bin/dnsntpctrl >/dev/null 2>&1"); }else{ if ($settings{'POLICY'} ne ''){ $fwdfwsettings{'POLICY'} = $settings{'POLICY'}; @@ -65,6 +66,7 @@ if ($settings{'ACTION'} eq $Lang::tr{'save'}) { &General::writehash("${General::swroot}/firewall/settings", \%fwdfwsettings); &General::readhash("${General::swroot}/firewall/settings", \%fwdfwsettings); system("/usr/local/bin/firewallctrl"); + system("/usr/local/bin/dnsntpctrl >/dev/null 2>&1"); } &General::readhash($filename, \%settings); # Load good settings } @@ -140,6 +142,18 @@ $selected{'MASQUERADE_ORANGE'}{$settings{'MASQUERADE_ORANGE'}} = 'selected="sele $selected{'MASQUERADE_BLUE'}{'off'} = ''; $selected{'MASQUERADE_BLUE'}{'on'} = ''; $selected{'MASQUERADE_BLUE'}{$settings{'MASQUERADE_BLUE'}} = 'selected="selected"'; +$checked{'DNS_FORCE_ON_GREEN'}{'off'} = ''; +$checked{'DNS_FORCE_ON_GREEN'}{'on'} = ''; +$checked{'DNS_FORCE_ON_GREEN'}{$settings{'DNS_FORCE_ON_GREEN'}} = "checked='checked'"; +$checked{'DNS_FORCE_ON_BLUE'}{'off'} = ''; +$checked{'DNS_FORCE_ON_BLUE'}{'on'} = ''; +$checked{'DNS_FORCE_ON_BLUE'}{$settings{'DNS_FORCE_ON_BLUE'}} = "checked='checked'"; +$checked{'NTP_FORCE_ON_GREEN'}{'off'} = ''; +$checked{'NTP_FORCE_ON_GREEN'}{'on'} = ''; +$checked{'NTP_FORCE_ON_GREEN'}{$settings{'NTP_FORCE_ON_GREEN'}} = "checked='checked'"; +$checked{'NTP_FORCE_ON_BLUE'}{'off'} = ''; +$checked{'NTP_FORCE_ON_BLUE'}{'on'} = ''; +$checked{'NTP_FORCE_ON_BLUE'}{$settings{'NTP_FORCE_ON_BLUE'}} = "checked='checked'"; &Header::openbox('100%', 'center',); print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>"; @@ -189,13 +203,44 @@ END END } - print <<END +print <<END; + <table width='95%' cellspacing='0'> + <tr bgcolor='$color{'color20'}'></tr> + <tr> </tr> + <td colspan='2' align='left'><b>$Lang::tr{'fw green'}</b></td> + </tr> + <tr><td align='left' width='60%'>$Lang::tr{'dns force on green'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DNS_FORCE_ON_GREEN' value='on' $checked{'DNS_FORCE_ON_GREEN'}{'on'} />/ + <input type='radio' name='DNS_FORCE_ON_GREEN' value='off' $checked{'DNS_FORCE_ON_GREEN'}{'off'} /> $Lang::tr{'off'}</td></tr> + <tr><td align='left' width='60%'>$Lang::tr{'ntp force on green'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='NTP_FORCE_ON_GREEN' value='on' $checked{'NTP_FORCE_ON_GREEN'}{'on'} />/ + <input type='radio' name='NTP_FORCE_ON_GREEN' value='off' $checked{'NTP_FORCE_ON_GREEN'}{'off'} /> $Lang::tr{'off'}</td></tr> +END + + if (&Header::blue_used()) { + print <<END; + <table width='95%' cellspacing='0'> + <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'fw blue'}</b></td></tr> + <tr> </tr> + <tr> + <tr><td align='left' width='60%'>$Lang::tr{'dns force on blue'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DNS_FORCE_ON_BLUE' value='on' $checked{'DNS_FORCE_ON_BLUE'}{'on'} />/ + <input type='radio' name='DNS_FORCE_ON_BLUE' value='off' $checked{'DNS_FORCE_ON_BLUE'}{'off'} /> $Lang::tr{'off'}</td></tr> + <tr><td align='left' width='60%'>$Lang::tr{'ntp force on blue'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='NTP_FORCE_ON_BLUE' value='on' $checked{'NTP_FORCE_ON_BLUE'}{'on'} />/ + <input type='radio' name='NTP_FORCE_ON_BLUE' value='off' $checked{'NTP_FORCE_ON_BLUE'}{'off'} /> $Lang::tr{'off'}</td></tr> + <tr><td align='left' width='60%'>$Lang::tr{'drop proxy'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DROPPROXY' value='on' $checked{'DROPPROXY'}{'on'} />/ + <input type='radio' name='DROPPROXY' value='off' $checked{'DROPPROXY'}{'off'} /> $Lang::tr{'off'}</td></tr> + <tr><td align='left' width='60%'>$Lang::tr{'drop samba'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DROPSAMBA' value='on' $checked{'DROPSAMBA'}{'on'} />/ + <input type='radio' name='DROPSAMBA' value='off' $checked{'DROPSAMBA'}{'off'} /> $Lang::tr{'off'}</td></tr> + </td> + </tr> +END + } + + print <<END; </table> - <br> + <br /> -<table width='95%' cellspacing='0'> -<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'fw logging'}</b></td></tr> + <table width='95%' cellspacing='0'> +<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'fw logging red'}</b></td></tr> <tr><td align='left' width='60%'>$Lang::tr{'drop newnotsyn'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DROPNEWNOTSYN' value='on' $checked{'DROPNEWNOTSYN'}{'on'} />/ <input type='radio' name='DROPNEWNOTSYN' value='off' $checked{'DROPNEWNOTSYN'}{'off'} /> $Lang::tr{'off'}</td></tr> <tr><td align='left' width='60%'>$Lang::tr{'drop input'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DROPINPUT' value='on' $checked{'DROPINPUT'}{'on'} />/ @@ -206,21 +251,30 @@ END <input type='radio' name='DROPOUTGOING' value='off' $checked{'DROPOUTGOING'}{'off'} /> $Lang::tr{'off'}</td></tr> <tr><td align='left' width='60%'>$Lang::tr{'drop portscan'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DROPPORTSCAN' value='on' $checked{'DROPPORTSCAN'}{'on'} />/ <input type='radio' name='DROPPORTSCAN' value='off' $checked{'DROPPORTSCAN'}{'off'} /> $Lang::tr{'off'}</td></tr> -<tr><td align='left' width='60%'>$Lang::tr{'drop wirelessinput'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DROPWIRELESSINPUT' value='on' $checked{'DROPWIRELESSINPUT'}{'on'} />/ +END + + if (&Header::blue_used()) { + print <<END; + </table> + + <br /> + + <table width='95%' cellspacing='0'> +<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'fw logging blue'}</b></td></tr> + <tr> + <tr><td align='left' width='60%'>$Lang::tr{'drop wirelessinput'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DROPWIRELESSINPUT' value='on' $checked{'DROPWIRELESSINPUT'}{'on'} />/ <input type='radio' name='DROPWIRELESSINPUT' value='off' $checked{'DROPWIRELESSINPUT'}{'off'} /> $Lang::tr{'off'}</td></tr> -<tr><td align='left' width='60%'>$Lang::tr{'drop wirelessforward'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DROPWIRELESSFORWARD' value='on' $checked{'DROPWIRELESSFORWARD'}{'on'} />/ + <tr><td align='left' width='60%'>$Lang::tr{'drop wirelessforward'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DROPWIRELESSFORWARD' value='on' $checked{'DROPWIRELESSFORWARD'}{'on'} />/ <input type='radio' name='DROPWIRELESSFORWARD' value='off' $checked{'DROPWIRELESSFORWARD'}{'off'} /> $Lang::tr{'off'}</td></tr> -</table> -<br/> + </tr> +END + } + + print <<END; + </table> + + <br /> -<table width='95%' cellspacing='0'> -<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'fw blue'}</b></td></tr> -<tr><td align='left' width='60%'>$Lang::tr{'drop proxy'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DROPPROXY' value='on' $checked{'DROPPROXY'}{'on'} />/ - <input type='radio' name='DROPPROXY' value='off' $checked{'DROPPROXY'}{'off'} /> $Lang::tr{'off'}</td></tr> -<tr><td align='left' width='60%'>$Lang::tr{'drop samba'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DROPSAMBA' value='on' $checked{'DROPSAMBA'}{'on'} />/ - <input type='radio' name='DROPSAMBA' value='off' $checked{'DROPSAMBA'}{'off'} /> $Lang::tr{'off'}</td></tr> -</table> -<br> <table width='95%' cellspacing='0'> <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'fw settings'}</b></td></tr> <tr><td align='left' width='60%'>$Lang::tr{'fw settings color'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='SHOWCOLORS' value='on' $checked{'SHOWCOLORS'}{'on'} />/ @@ -252,7 +306,7 @@ END <br /> <table width='100%' cellspacing='0'> -<tr><td align='right'><form method='post' action='$ENV{'SCRIPT_NAME'}'> +<tr><td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'> <input type='submit' name='ACTION' value='$Lang::tr{'save'}' /> </form></td></tr> </table> @@ -278,7 +332,7 @@ print <<END; <input type='submit' name='ACTION' value='$Lang::tr{'save'}' /><input type='hidden' name='defpol' value='1'></td> END print "</tr></table></form>"; - print"<br><br>"; + print"<br /><br />"; print <<END; <form method='post' action='$ENV{'SCRIPT_NAME'}'> <table width='100%' border='0'> diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 6a8133807..d6bb234fa 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -836,6 +836,8 @@ 'dns error 0' => 'Die IP Adresse vom <strong>primären</strong> DNS Server ist nicht gültig, bitte überprüfen Sie Ihre Eingabe!<br />Die eingegebene <strong>sekundären</strong> DNS Server Adresse ist jedoch gültig.<br />', 'dns error 01' => 'Die eingegebene IP Adresse des <strong>primären</strong> wie auch des <strong>sekundären</strong> DNS-Servers sind nicht gültig, bitte überprüfen Sie Ihre Eingaben!', 'dns error 1' => 'Die IP Adresse vom <strong>sekundären</strong> DNS Server ist nicht gültig, bitte überprüfen Sie Ihre Eingabe!<br />Die eingegebene <strong>primäre</strong> DNS Server Adresse ist jedoch gültig.', +'dns force on blue' => 'Erzwinge <a href=\'/cgi-bin/dns.cgi\'>lokale DNS-Server</a> auf BLAU', +'dns force on green' => 'Erzwinge <a href=\'/cgi-bin/dns.cgi\'>lokale DNS-Server</a> auf GRÜN', 'dns forward disable dnssec' => 'DNSSEC deaktivieren (nicht empfohlen)', 'dns forwarding dnssec disabled notice' => '(DNSSEC deaktiviert)', 'dns header' => 'DNS Server Adressen zuweisen nur mit DHCP an red0', @@ -1102,9 +1104,12 @@ 'from email server' => 'Von E-Mail-Server', 'from email user' => 'Von E-Mail-Benutzer', 'from warn email bad' => 'Von E-Mail-Adresse ist nicht gültig', -'fw blue' => 'Firewalloptionen für das Blaue Interface', +'fw blue' => 'Firewalloptionen für das <font color=\'#0000FF\'>BLAUE</font> Interface', 'fw default drop' => 'Firewallrichtlinie', +'fw green' => 'Firewalloptionen für das <font color=\'#339933\'>GRÜNE</font> Interface', 'fw logging' => 'Firewallprotokollierung', +'fw logging blue' => 'Firewallprotokollierung (<font color=\'#0000FF\'>BLAU</font>)', +'fw logging red' => 'Firewallprotokollierung (<font color=\'#993333\'>ROT</font>)', 'fw settings' => 'Firewalleinstellungen', 'fw settings color' => 'Farben in Regeltabelle anzeigen', 'fw settings dropdown' => 'Alle Netzwerke auf Regelerstellungsseite anzeigen', @@ -1644,9 +1649,9 @@ 'map to guest' => 'Map to Guest', 'march' => 'März', 'marked' => 'Markiert', -'masquerade blue' => 'NAT auf BLAU', -'masquerade green' => 'NAT auf GRÜN', -'masquerade orange' => 'NAT auf ORANGE', +'masquerade blue' => 'NAT auf <b><font color=\'#0000FF\'>BLAU</font></b>', +'masquerade green' => 'NAT auf <b><font color=\'#339933\'>GRÜN</font></b>', +'masquerade orange' => 'NAT auf <b><font color =\'#FF9933\'>ORANGE</font></b>', 'masquerading' => 'Masquerading/NAT', 'masquerading disabled' => 'NAT ausgeschaltet', 'masquerading enabled' => 'NAT eingeschaltet', @@ -1814,6 +1819,8 @@ 'november' => 'November', 'ntp common settings' => 'Allgemeine Einstellungen', 'ntp configuration' => 'Zeitserverkonfiguration', +'ntp force on blue' => 'Erzwinge <a href=\'/cgi-bin/time.cgi\'>lokale NTP-Server</a> auf BLAU', +'ntp force on green' => 'Erzwinge <a href=\'/cgi-bin/time.cgi\'>lokale NTP-Server</a> auf GRÜN', 'ntp must be enabled to have clients' => 'Um Clients annehmen zu können, muss NTP vorher aktiviert sein.', 'ntp server' => 'NTP-Server', 'ntp sync' => 'Synchronisation', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 8f7e0c2cf..474612025 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -859,6 +859,8 @@ 'dns error 0' => 'The IP address of the <strong>primary</strong> DNS server is not valid, please check your entries!<br />The entered <strong>secondary</strong> DNS server address is valid.', 'dns error 01' => 'The entered IP address of the <strong>primary</strong> and <strong>secondary</strong> DNS server are not valid, please check your entries!', 'dns error 1' => 'The IP address of the <strong>secondary</strong> DNS server is not valid, please check your entries!<br />The entered <strong>primary</strong> DNS server address is valid.', +'dns force on blue' => 'Force DNS to use <a href=\'/cgi-bin/dns.cgi\'>local DNS servers</a> on BLUE', +'dns force on green' => 'Force DNS to use <a href=\'/cgi-bin/dns.cgi\'>local DNS servers</a> on GREEN', 'dns forward disable dnssec' => 'Disable DNSSEC (dangerous)', 'dns forwarding dnssec disabled notice' => '(DNSSEC disabled)', 'dns header' => 'Assign DNS server addresses only for DHCP on red0', @@ -1128,9 +1130,12 @@ 'from email server' => 'From Email server', 'from email user' => 'From e-mail user', 'from warn email bad' => 'From e-mail address is not valid', -'fw blue' => 'Firewall options for BLUE interface', +'fw blue' => 'Firewall options for <font color=\'#0000FF\'>BLUE</font> Interface', 'fw default drop' => 'Firewall policy', +'fw green' => 'Firewall options for <font color=\'#339933\'>GREEN</font> Interface', 'fw logging' => 'Firewall logging', +'fw logging blue' => 'Firewall logging (<font color=\'#0000FF\'>BLUE</font>)', +'fw logging red' => 'Firewall logging (<font color=\'#993333\'>RED</font>)', 'fw settings' => 'Firewall settings', 'fw settings color' => 'Show colors in ruletable', 'fw settings dropdown' => 'Show all networks on rulecreation site', @@ -1672,9 +1677,9 @@ 'map to guest' => 'Map to Guest', 'march' => 'March', 'marked' => 'Marked', -'masquerade blue' => 'Masquerade BLUE', -'masquerade green' => 'Masquerade GREEN', -'masquerade orange' => 'Masquerade ORANGE', +'masquerade blue' => 'Masquerade <b><font color=\'#0000FF\'>BLUE</font></b>', +'masquerade green' => 'Masquerade <b><font color=\'#339933\'>GREEN</font></b>', +'masquerade orange' => 'Masquerade <b><font color=\'#FF9933\'>ORANGE</font></b>', 'masquerading' => 'Masquerading', 'masquerading disabled' => 'Masquerading disabled', 'masquerading enabled' => 'Masquerading enabled', @@ -1844,6 +1849,8 @@ 'november' => 'November', 'ntp common settings' => 'Common settings', 'ntp configuration' => 'NTP Configuration', +'ntp force on blue' => 'Force NTP to use <a href=\'/cgi-bin/time.cgi\'>local NTP servers</a> on BLUE', +'ntp force on green' => 'Force NTP to use <a href=\'/cgi-bin/time.cgi\'>local NTP servers</a> on GREEN', 'ntp must be enabled to have clients' => 'NTP must be enabled to have clients.', 'ntp server' => 'NTP Server', 'ntp sync' => 'Synchronization', diff --git a/lfs/configroot b/lfs/configroot index a3e474d70..622793b35 100644 --- a/lfs/configroot +++ b/lfs/configroot @@ -129,6 +129,10 @@ $(TARGET) : echo "SHOWDROPDOWN=off" >> $(CONFIG_ROOT)/optionsfw/settings echo "DROPWIRELESSINPUT=on" >> $(CONFIG_ROOT)/optionsfw/settings echo "DROPWIRELESSFORWARD=on" >> $(CONFIG_ROOT)/optionsfw/settings + echo "DNS_FORCE_ON_GREEN=off" >> $(CONFIG_ROOT)/optionsfw/settings + echo "DNS_FORCE_ON_BLUE=off" >> $(CONFIG_ROOT)/optionsfw/settings + echo "NTP_FORCE_ON_GREEN=off" >> $(CONFIG_ROOT)/optionsfw/settings + echo "NTP_FORCE_ON_BLUE=off" >> $(CONFIG_ROOT)/optionsfw/settings echo "POLICY=MODE2" >> $(CONFIG_ROOT)/firewall/settings echo "POLICY1=MODE2" >> $(CONFIG_ROOT)/firewall/settings echo "USE_ISP_NAMESERVERS=on" >> $(CONFIG_ROOT)/dns/settings diff --git a/src/initscripts/system/dnsntp b/src/initscripts/system/dnsntp new file mode 100644 index 000000000..2eafa9d20 --- /dev/null +++ b/src/initscripts/system/dnsntp @@ -0,0 +1,36 @@ +#!/bin/sh +######################################################################## +# Begin $rc_base/init.d/dnsntp +# +# Description : dnsntp init script for DNS/NTP rules only +# +######################################################################## + +# flush chain +iptables -t nat -F DNS_NTP_REDIRECT + +eval $(/usr/local/bin/readhash /var/ipfire/optionsfw/settings) + +# Force DNS REDIRECTs on GREEN (udp, tcp, 53) +if [ "$DNS_FORCE_ON_GREEN" == "on" ]; then + iptables -t nat -A DNS_NTP_REDIRECT -i green0 -p udp -m udp --dport 53 -j REDIRECT + iptables -t nat -A DNS_NTP_REDIRECT -i green0 -p tcp -m tcp --dport 53 -j REDIRECT +fi + +# Force DNS REDIRECTs on BLUE (udp, tcp, 53) +if [ "$DNS_FORCE_ON_BLUE" == "on" ]; then + iptables -t nat -A DNS_NTP_REDIRECT -i blue0 -p udp -m udp --dport 53 -j REDIRECT + iptables -t nat -A DNS_NTP_REDIRECT -i blue0 -p tcp -m tcp --dport 53 -j REDIRECT +fi + +# Force NTP REDIRECTs on GREEN (udp, 123) +if [ "$NTP_FORCE_ON_GREEN" == "on" ]; then + iptables -t nat -A DNS_NTP_REDIRECT -i green0 -p udp -m udp --dport 123 -j REDIRECT +fi + +# Force DNS REDIRECTs on BLUE (udp, 123) +if [ "$NTP_FORCE_ON_BLUE" == "on" ]; then + iptables -t nat -A DNS_NTP_REDIRECT -i blue0 -p udp -m udp --dport 123 -j REDIRECT +fi + +# End $rc_base/init.d/dnsntp diff --git a/src/initscripts/system/firewall b/src/initscripts/system/firewall index 65f1c979b..43ae74113 100644 --- a/src/initscripts/system/firewall +++ b/src/initscripts/system/firewall @@ -169,6 +169,10 @@ iptables_init() { # Fix for braindead ISPs iptables -A FORWARD -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu + # DNS / NTP REDIRECT + iptables -t nat -N DNS_NTP_REDIRECT + iptables -t nat -A PREROUTING -j DNS_NTP_REDIRECT + # CUSTOM chains, can be used by the users themselves iptables -N CUSTOMINPUT iptables -A INPUT -j CUSTOMINPUT @@ -281,7 +285,7 @@ iptables_init() { iptables -A INPUT -j LOCATIONBLOCK iptables -A FORWARD -j LOCATIONBLOCK - # trafic from ipsecX/TUN/TAP interfaces, before "-i GREEN_DEV" accept everything + # traffic from ipsecX/TUN/TAP interfaces, before "-i GREEN_DEV" accept everything iptables -N IPSECINPUT iptables -N IPSECFORWARD iptables -N IPSECOUTPUT @@ -389,6 +393,9 @@ iptables_init() { # run captivectrl /usr/local/bin/captivectrl + # run dnsntpctrl + /usr/local/bin/dnsntpctrl + # POLICY CHAIN iptables -N POLICYIN iptables -A INPUT -j POLICYIN diff --git a/src/misc-progs/Makefile b/src/misc-progs/Makefile index 7c3ef7529..6f2733ef0 100644 --- a/src/misc-progs/Makefile +++ b/src/misc-progs/Makefile @@ -26,7 +26,7 @@ PROGS = iowrap SUID_PROGS = squidctrl sshctrl ipfirereboot \ ipsecctrl timectrl dhcpctrl suricatactrl \ rebuildhosts backupctrl collectdctrl \ - logwatch wioscan wiohelper openvpnctrl firewallctrl \ + logwatch wioscan wiohelper openvpnctrl firewallctrl dnsntpctrl \ wirelessctrl getipstat qosctrl \ redctrl syslogdctrl extrahdctrl sambactrl \ smartctrl clamavctrl addonctrl pakfire mpfirectrl wlanapctrl \ diff --git a/src/misc-progs/dnsntpctrl.c b/src/misc-progs/dnsntpctrl.c new file mode 100644 index 000000000..f2a3b89e3 --- /dev/null +++ b/src/misc-progs/dnsntpctrl.c @@ -0,0 +1,19 @@ +/* This file is part of the IPFire Firewall. + * + * This program is distributed under the terms of the GNU General Public + * Licence. See the file COPYING for details. + * + */ + +#include <stdlib.h> +#include "setuid.h" + +int main(void) +{ + if (!(initsetuid())) + exit(1); + + safe_system("/etc/rc.d/init.d/dnsntp >/dev/null 2>&1"); + + return 0; +} -- 2.18.0

5 10

Aw: Re: [PATCH] (V3) Forcing DNS/NTP
by Bernhard Bitsch 30 May '21

30 May '21

For forcing DNS we generate ( for example ) iptables -t nat -A DNS_NTP_REDIRECT -i green0 -p udp -m udp --dport 53 -j REDIRECT To filter allowed DNS requests there is a rule iptables -t nat -A DNS_NTP_REDIRECT -i green0 -d ${GREEN_ADDRESS} -p udp -m udp --dport 53 -j RETURN To get ${GREEN_ADDRESS} dnsntp needs an additional eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) Concerning performance, we want to minimize the rule set to the amount really necessary. On the other hand, it may be quicker to do just a RETURN than a REDIRECT. The cases for the RETURN ( DNS requests direct to IPFire ) should be nearly 100%. DNS and NTP servrs are published by DHCP or should be configured in the static case. Hope this makes it clear enough. Best, Bernhard > Gesendet: Samstag, 06. März 2021 um 21:51 Uhr > Von: "Jon Murphy" <jcmurphy26(a)gmail.com> > An: "Bernhard Bitsch" <Bernhard.Bitsch(a)gmx.de> > Betreff: Re: [PATCH] (V3) Forcing DNS/NTP > > > I mean the extra rules for requests client-->IPFire:53. > > These are 'well-behaving' and must/should not be redirected. Didn't measure if the performance is equal with or without these extra rules. > > How do we determine if a 'well-behaving' client is being redirected? Or how do we measure performance? > > When I tried to measure DNS "speed" in the past, the cache gets in there and makes every look like 38 to 44 ms. > > > On Mar 6, 2021, at 1:47 PM, Bernhard Bitsch <Bernhard.Bitsch(a)gmx.de> wrote: > > > > Hi, > > > >> Gesendet: Freitag, 05. März 2021 um 23:49 Uhr > >> Von: "Matthias Fischer" <matthias.fischer(a)ipfire.org> > >> An: "Bernhard Bitsch" <Bernhard.Bitsch(a)gmx.de> > >> Cc: development(a)lists.ipfire.org > >> Betreff: Re: Aw: [PATCH] (V3) Forcing DNS/NTP > >> > >> Hi, > >> > >> On 05.03.2021 21:45, Bernhard Bitsch wrote: > >>> Hi, > >>> > >>> at a first glance I think, the code implements the ideas of the community discussions. > >> > >> Thanks - but unfortunately I'm not quite satisfied with my results yet > >> because I didn't manage to merge the init and the ctrl-file in *one* C > >> program. The whole is running as I want but... ;-) > >> > >>> Just one annotation. As mentioned in a post, it could help to honor 'well-behaving' requests ( to IPFire ) by a RETURN. > >> > >> -v please. I don't know if I get this (the translation english => > >> german) right. > >> If you mean that I asked for some tips and got some, than of course: > >> many thanks to everybody! > >> > > Sorry if I wasn't specific enough. > > I mean the extra rules for requests client-->IPFire:53. > > These are 'well-behaving' and must/should not be redirected. Didn't measure if the performance is equal with or without these extra rules. > > > > Best, > > Bernhard > >> Best, > >> Matthias > >> > >>> Regards, > >>> Bernhard > >>> > >>>> Gesendet: Freitag, 05. März 2021 um 20:40 Uhr > >>>> Von: "Matthias Fischer" <matthias.fischer(a)ipfire.org> > >>>> An: development(a)lists.ipfire.org > >>>> Betreff: [PATCH] (V3) Forcing DNS/NTP > >>>> > >>>> Originally triggered by: > >>>> https://community.ipfire.org/t/forcing-all-dns-traffic-from-the-lan-to-the-… > >>>> > >>>> Current discussion: > >>>> https://community.ipfire.org/t/testing-dns-redirect-code-snippet/3888 > >>>> > >>>> Summary and functionality: > >>>> These patches are controlled through "Firewall Options". They add new > >>>> firewall-[DNS/NTP]_FORCED_ON_[INTERFACE]-options to '/var/ipfire/optionsfw/settings'. > >>>> They activate/deactivate appropriate REDIRECT rules through a new ctrl file > >>>> ('/usr/local/bin/dnsntpctrl') and a new init file ('/etc/rc.d/init.d/dnsntp'). > >>>> > >>>> Default of all new rules is OFF (set in 'lfs/configroot'). > >>>> If set to ON, they REDIRECT all DNS and NTP requests (TCP/UDP) to the DNS and NTP > >>>> servers specified in IPFire. GUI links to DNS and NTP options were added to make > >>>> this more transparent. > >>>> > >>>> Flaw/ToDo: > >>>> To make things work as I wanted I had to add a 'dnsntpctrl' file which calls the actual > >>>> init file, 'dnsntp'. This is actually an unnecessary detour. > >>>> In fact I wanted to merge these two files in *one* C file, but this was beyond my > >>>> capabilities, perhaps "someone" else knows how to program this. > >>>> > >>>> Changed visibility (GUI, 'optionsfw.cgi') and some cosmetics: > >>>> The corresponding interface options - including 'Masquerade ...' - are only visible if > >>>> the respective interface actually exists. > >>>> If BLUE interface doesn't exist, there are no ON/OFF switches for 'DNS/NTP on BLUE' > >>>> or logging options for BLUE available (e.g.). > >>>> Added text colors for better readability and links to DNS and NTP GUI. > >>>> Separated logging options per interface. > >>>> > >>>> No reboot required: > >>>> Rules can be switched ON/OFF without rebooting IPFire. > >>>> Changes immedediatly take effect after clicking 'Save'. > >>>> > >>>> Changes to '/etc/rc.d/init.d/firewall': > >>>> To avoid collisions with possibly existing CUSTOM rules, I added a new PREROUTING > >>>> chain: DNS_NTP_REDIRECT. > >>>> This chain is flushed by the init file before before the desired settings are applied. > >>>> Corrected a 'trafic' typo. > >>>> > >>>> Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> > >>>> --- > >>>> config/rootfiles/common/aarch64/initscripts | 1 + > >>>> config/rootfiles/common/armv5tel/initscripts | 1 + > >>>> config/rootfiles/common/i586/initscripts | 1 + > >>>> config/rootfiles/common/misc-progs | 1 + > >>>> config/rootfiles/common/x86_64/initscripts | 1 + > >>>> html/cgi-bin/optionsfw.cgi | 92 ++++++++++++++++---- > >>>> langs/de/cgi-bin/de.pl | 15 +++- > >>>> langs/en/cgi-bin/en.pl | 15 +++- > >>>> lfs/configroot | 4 + > >>>> src/initscripts/system/dnsntp | 36 ++++++++ > >>>> src/initscripts/system/firewall | 9 +- > >>>> src/misc-progs/Makefile | 2 +- > >>>> src/misc-progs/dnsntpctrl.c | 19 ++++ > >>>> 13 files changed, 168 insertions(+), 29 deletions(-) > >>>> create mode 100644 src/initscripts/system/dnsntp > >>>> create mode 100644 src/misc-progs/dnsntpctrl.c > >>>> > >>>> diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/common/aarch64/initscripts > >>>> index 800005966..f38a3a294 100644 > >>>> --- a/config/rootfiles/common/aarch64/initscripts > >>>> +++ b/config/rootfiles/common/aarch64/initscripts > >>>> @@ -20,6 +20,7 @@ etc/rc.d/init.d/conntrackd > >>>> etc/rc.d/init.d/console > >>>> etc/rc.d/init.d/dhcp > >>>> etc/rc.d/init.d/dhcrelay > >>>> +etc/rc.d/init.d/dnsntp > >>>> etc/rc.d/init.d/fcron > >>>> etc/rc.d/init.d/fireinfo > >>>> etc/rc.d/init.d/firewall > >>>> diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts > >>>> index 800005966..f38a3a294 100644 > >>>> --- a/config/rootfiles/common/armv5tel/initscripts > >>>> +++ b/config/rootfiles/common/armv5tel/initscripts > >>>> @@ -20,6 +20,7 @@ etc/rc.d/init.d/conntrackd > >>>> etc/rc.d/init.d/console > >>>> etc/rc.d/init.d/dhcp > >>>> etc/rc.d/init.d/dhcrelay > >>>> +etc/rc.d/init.d/dnsntp > >>>> etc/rc.d/init.d/fcron > >>>> etc/rc.d/init.d/fireinfo > >>>> etc/rc.d/init.d/firewall > >>>> diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts > >>>> index 18c5a897a..a3a2b47f7 100644 > >>>> --- a/config/rootfiles/common/i586/initscripts > >>>> +++ b/config/rootfiles/common/i586/initscripts > >>>> @@ -20,6 +20,7 @@ etc/rc.d/init.d/conntrackd > >>>> etc/rc.d/init.d/console > >>>> etc/rc.d/init.d/dhcp > >>>> etc/rc.d/init.d/dhcrelay > >>>> +etc/rc.d/init.d/dnsntp > >>>> etc/rc.d/init.d/fcron > >>>> etc/rc.d/init.d/fireinfo > >>>> etc/rc.d/init.d/firewall > >>>> diff --git a/config/rootfiles/common/misc-progs b/config/rootfiles/common/misc-progs > >>>> index d6594b3f8..4bcb94812 100644 > >>>> --- a/config/rootfiles/common/misc-progs > >>>> +++ b/config/rootfiles/common/misc-progs > >>>> @@ -5,6 +5,7 @@ usr/local/bin/captivectrl > >>>> usr/local/bin/collectdctrl > >>>> usr/local/bin/ddnsctrl > >>>> usr/local/bin/dhcpctrl > >>>> +usr/local/bin/dnsntpctrl > >>>> usr/local/bin/extrahdctrl > >>>> usr/local/bin/fireinfoctrl > >>>> usr/local/bin/firewallctrl > >>>> diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts > >>>> index 18c5a897a..a3a2b47f7 100644 > >>>> --- a/config/rootfiles/common/x86_64/initscripts > >>>> +++ b/config/rootfiles/common/x86_64/initscripts > >>>> @@ -20,6 +20,7 @@ etc/rc.d/init.d/conntrackd > >>>> etc/rc.d/init.d/console > >>>> etc/rc.d/init.d/dhcp > >>>> etc/rc.d/init.d/dhcrelay > >>>> +etc/rc.d/init.d/dnsntp > >>>> etc/rc.d/init.d/fcron > >>>> etc/rc.d/init.d/fireinfo > >>>> etc/rc.d/init.d/firewall > >>>> diff --git a/html/cgi-bin/optionsfw.cgi b/html/cgi-bin/optionsfw.cgi > >>>> index 321642e82..3fc707e8b 100644 > >>>> --- a/html/cgi-bin/optionsfw.cgi > >>>> +++ b/html/cgi-bin/optionsfw.cgi > >>>> @@ -2,7 +2,7 @@ > >>>> ############################################################################### > >>>> # # > >>>> # IPFire.org - A linux based firewall # > >>>> -# Copyright (C) 2014-2020 IPFire Team <info(a)ipfire.org> # > >>>> +# Copyright (C) 2014-2021 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 # > >>>> @@ -50,6 +50,7 @@ if ($settings{'ACTION'} eq $Lang::tr{'save'}) { > >>>> $errormessage .= $Lang::tr{'new optionsfw later'}; > >>>> &General::writehash($filename, \%settings); # Save good settings > >>>> system("/usr/local/bin/firewallctrl"); > >>>> + system("/usr/local/bin/dnsntpctrl >/dev/null 2>&1"); > >>>> }else{ > >>>> if ($settings{'POLICY'} ne ''){ > >>>> $fwdfwsettings{'POLICY'} = $settings{'POLICY'}; > >>>> @@ -65,6 +66,7 @@ if ($settings{'ACTION'} eq $Lang::tr{'save'}) { > >>>> &General::writehash("${General::swroot}/firewall/settings", \%fwdfwsettings); > >>>> &General::readhash("${General::swroot}/firewall/settings", \%fwdfwsettings); > >>>> system("/usr/local/bin/firewallctrl"); > >>>> + system("/usr/local/bin/dnsntpctrl >/dev/null 2>&1"); > >>>> } > >>>> &General::readhash($filename, \%settings); # Load good settings > >>>> } > >>>> @@ -140,6 +142,18 @@ $selected{'MASQUERADE_ORANGE'}{$settings{'MASQUERADE_ORANGE'}} = 'selected="sele > >>>> $selected{'MASQUERADE_BLUE'}{'off'} = ''; > >>>> $selected{'MASQUERADE_BLUE'}{'on'} = ''; > >>>> $selected{'MASQUERADE_BLUE'}{$settings{'MASQUERADE_BLUE'}} = 'selected="selected"'; > >>>> +$checked{'DNS_FORCE_ON_GREEN'}{'off'} = ''; > >>>> +$checked{'DNS_FORCE_ON_GREEN'}{'on'} = ''; > >>>> +$checked{'DNS_FORCE_ON_GREEN'}{$settings{'DNS_FORCE_ON_GREEN'}} = "checked='checked'"; > >>>> +$checked{'DNS_FORCE_ON_BLUE'}{'off'} = ''; > >>>> +$checked{'DNS_FORCE_ON_BLUE'}{'on'} = ''; > >>>> +$checked{'DNS_FORCE_ON_BLUE'}{$settings{'DNS_FORCE_ON_BLUE'}} = "checked='checked'"; > >>>> +$checked{'NTP_FORCE_ON_GREEN'}{'off'} = ''; > >>>> +$checked{'NTP_FORCE_ON_GREEN'}{'on'} = ''; > >>>> +$checked{'NTP_FORCE_ON_GREEN'}{$settings{'NTP_FORCE_ON_GREEN'}} = "checked='checked'"; > >>>> +$checked{'NTP_FORCE_ON_BLUE'}{'off'} = ''; > >>>> +$checked{'NTP_FORCE_ON_BLUE'}{'on'} = ''; > >>>> +$checked{'NTP_FORCE_ON_BLUE'}{$settings{'NTP_FORCE_ON_BLUE'}} = "checked='checked'"; > >>>> > >>>> &Header::openbox('100%', 'center',); > >>>> print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>"; > >>>> @@ -189,13 +203,44 @@ END > >>>> END > >>>> } > >>>> > >>>> - print <<END > >>>> +print <<END; > >>>> + <table width='95%' cellspacing='0'> > >>>> + <tr bgcolor='$color{'color20'}'></tr> > >>>> + <tr> </tr> > >>>> + <td colspan='2' align='left'><b>$Lang::tr{'fw green'}</b></td> > >>>> + </tr> > >>>> + <tr><td align='left' width='60%'>$Lang::tr{'dns force on green'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DNS_FORCE_ON_GREEN' value='on' $checked{'DNS_FORCE_ON_GREEN'}{'on'} />/ > >>>> + <input type='radio' name='DNS_FORCE_ON_GREEN' value='off' $checked{'DNS_FORCE_ON_GREEN'}{'off'} /> $Lang::tr{'off'}</td></tr> > >>>> + <tr><td align='left' width='60%'>$Lang::tr{'ntp force on green'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='NTP_FORCE_ON_GREEN' value='on' $checked{'NTP_FORCE_ON_GREEN'}{'on'} />/ > >>>> + <input type='radio' name='NTP_FORCE_ON_GREEN' value='off' $checked{'NTP_FORCE_ON_GREEN'}{'off'} /> $Lang::tr{'off'}</td></tr> > >>>> +END > >>>> + > >>>> + if (&Header::blue_used()) { > >>>> + print <<END; > >>>> + <table width='95%' cellspacing='0'> > >>>> + <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'fw blue'}</b></td></tr> > >>>> + <tr> </tr> > >>>> + <tr> > >>>> + <tr><td align='left' width='60%'>$Lang::tr{'dns force on blue'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DNS_FORCE_ON_BLUE' value='on' $checked{'DNS_FORCE_ON_BLUE'}{'on'} />/ > >>>> + <input type='radio' name='DNS_FORCE_ON_BLUE' value='off' $checked{'DNS_FORCE_ON_BLUE'}{'off'} /> $Lang::tr{'off'}</td></tr> > >>>> + <tr><td align='left' width='60%'>$Lang::tr{'ntp force on blue'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='NTP_FORCE_ON_BLUE' value='on' $checked{'NTP_FORCE_ON_BLUE'}{'on'} />/ > >>>> + <input type='radio' name='NTP_FORCE_ON_BLUE' value='off' $checked{'NTP_FORCE_ON_BLUE'}{'off'} /> $Lang::tr{'off'}</td></tr> > >>>> + <tr><td align='left' width='60%'>$Lang::tr{'drop proxy'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DROPPROXY' value='on' $checked{'DROPPROXY'}{'on'} />/ > >>>> + <input type='radio' name='DROPPROXY' value='off' $checked{'DROPPROXY'}{'off'} /> $Lang::tr{'off'}</td></tr> > >>>> + <tr><td align='left' width='60%'>$Lang::tr{'drop samba'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DROPSAMBA' value='on' $checked{'DROPSAMBA'}{'on'} />/ > >>>> + <input type='radio' name='DROPSAMBA' value='off' $checked{'DROPSAMBA'}{'off'} /> $Lang::tr{'off'}</td></tr> > >>>> + </td> > >>>> + </tr> > >>>> +END > >>>> + } > >>>> + > >>>> + print <<END; > >>>> </table> > >>>> > >>>> - <br> > >>>> + <br /> > >>>> > >>>> -<table width='95%' cellspacing='0'> > >>>> -<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'fw logging'}</b></td></tr> > >>>> + <table width='95%' cellspacing='0'> > >>>> +<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'fw logging red'}</b></td></tr> > >>>> <tr><td align='left' width='60%'>$Lang::tr{'drop newnotsyn'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DROPNEWNOTSYN' value='on' $checked{'DROPNEWNOTSYN'}{'on'} />/ > >>>> <input type='radio' name='DROPNEWNOTSYN' value='off' $checked{'DROPNEWNOTSYN'}{'off'} /> $Lang::tr{'off'}</td></tr> > >>>> <tr><td align='left' width='60%'>$Lang::tr{'drop input'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DROPINPUT' value='on' $checked{'DROPINPUT'}{'on'} />/ > >>>> @@ -206,21 +251,30 @@ END > >>>> <input type='radio' name='DROPOUTGOING' value='off' $checked{'DROPOUTGOING'}{'off'} /> $Lang::tr{'off'}</td></tr> > >>>> <tr><td align='left' width='60%'>$Lang::tr{'drop portscan'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DROPPORTSCAN' value='on' $checked{'DROPPORTSCAN'}{'on'} />/ > >>>> <input type='radio' name='DROPPORTSCAN' value='off' $checked{'DROPPORTSCAN'}{'off'} /> $Lang::tr{'off'}</td></tr> > >>>> -<tr><td align='left' width='60%'>$Lang::tr{'drop wirelessinput'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DROPWIRELESSINPUT' value='on' $checked{'DROPWIRELESSINPUT'}{'on'} />/ > >>>> +END > >>>> + > >>>> + if (&Header::blue_used()) { > >>>> + print <<END; > >>>> + </table> > >>>> + > >>>> + <br /> > >>>> + > >>>> + <table width='95%' cellspacing='0'> > >>>> +<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'fw logging blue'}</b></td></tr> > >>>> + <tr> > >>>> + <tr><td align='left' width='60%'>$Lang::tr{'drop wirelessinput'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DROPWIRELESSINPUT' value='on' $checked{'DROPWIRELESSINPUT'}{'on'} />/ > >>>> <input type='radio' name='DROPWIRELESSINPUT' value='off' $checked{'DROPWIRELESSINPUT'}{'off'} /> $Lang::tr{'off'}</td></tr> > >>>> -<tr><td align='left' width='60%'>$Lang::tr{'drop wirelessforward'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DROPWIRELESSFORWARD' value='on' $checked{'DROPWIRELESSFORWARD'}{'on'} />/ > >>>> + <tr><td align='left' width='60%'>$Lang::tr{'drop wirelessforward'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DROPWIRELESSFORWARD' value='on' $checked{'DROPWIRELESSFORWARD'}{'on'} />/ > >>>> <input type='radio' name='DROPWIRELESSFORWARD' value='off' $checked{'DROPWIRELESSFORWARD'}{'off'} /> $Lang::tr{'off'}</td></tr> > >>>> -</table> > >>>> -<br/> > >>>> + </tr> > >>>> +END > >>>> + } > >>>> + > >>>> + print <<END; > >>>> + </table> > >>>> + > >>>> + <br /> > >>>> > >>>> -<table width='95%' cellspacing='0'> > >>>> -<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'fw blue'}</b></td></tr> > >>>> -<tr><td align='left' width='60%'>$Lang::tr{'drop proxy'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DROPPROXY' value='on' $checked{'DROPPROXY'}{'on'} />/ > >>>> - <input type='radio' name='DROPPROXY' value='off' $checked{'DROPPROXY'}{'off'} /> $Lang::tr{'off'}</td></tr> > >>>> -<tr><td align='left' width='60%'>$Lang::tr{'drop samba'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DROPSAMBA' value='on' $checked{'DROPSAMBA'}{'on'} />/ > >>>> - <input type='radio' name='DROPSAMBA' value='off' $checked{'DROPSAMBA'}{'off'} /> $Lang::tr{'off'}</td></tr> > >>>> -</table> > >>>> -<br> > >>>> <table width='95%' cellspacing='0'> > >>>> <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'fw settings'}</b></td></tr> > >>>> <tr><td align='left' width='60%'>$Lang::tr{'fw settings color'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='SHOWCOLORS' value='on' $checked{'SHOWCOLORS'}{'on'} />/ > >>>> @@ -252,7 +306,7 @@ END > >>>> > >>>> <br /> > >>>> <table width='100%' cellspacing='0'> > >>>> -<tr><td align='right'><form method='post' action='$ENV{'SCRIPT_NAME'}'> > >>>> +<tr><td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'> > >>>> <input type='submit' name='ACTION' value='$Lang::tr{'save'}' /> > >>>> </form></td></tr> > >>>> </table> > >>>> @@ -278,7 +332,7 @@ print <<END; > >>>> <input type='submit' name='ACTION' value='$Lang::tr{'save'}' /><input type='hidden' name='defpol' value='1'></td> > >>>> END > >>>> print "</tr></table></form>"; > >>>> - print"<br><br>"; > >>>> + print"<br /><br />"; > >>>> print <<END; > >>>> <form method='post' action='$ENV{'SCRIPT_NAME'}'> > >>>> <table width='100%' border='0'> > >>>> diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl > >>>> index 6a8133807..d6bb234fa 100644 > >>>> --- a/langs/de/cgi-bin/de.pl > >>>> +++ b/langs/de/cgi-bin/de.pl > >>>> @@ -836,6 +836,8 @@ > >>>> 'dns error 0' => 'Die IP Adresse vom <strong>primären</strong> DNS Server ist nicht gültig, bitte überprüfen Sie Ihre Eingabe!<br />Die eingegebene <strong>sekundären</strong> DNS Server Adresse ist jedoch gültig.<br />', > >>>> 'dns error 01' => 'Die eingegebene IP Adresse des <strong>primären</strong> wie auch des <strong>sekundären</strong> DNS-Servers sind nicht gültig, bitte überprüfen Sie Ihre Eingaben!', > >>>> 'dns error 1' => 'Die IP Adresse vom <strong>sekundären</strong> DNS Server ist nicht gültig, bitte überprüfen Sie Ihre Eingabe!<br />Die eingegebene <strong>primäre</strong> DNS Server Adresse ist jedoch gültig.', > >>>> +'dns force on blue' => 'Erzwinge <a href=\'/cgi-bin/dns.cgi\'>lokale DNS-Server</a> auf BLAU', > >>>> +'dns force on green' => 'Erzwinge <a href=\'/cgi-bin/dns.cgi\'>lokale DNS-Server</a> auf GRÜN', > >>>> 'dns forward disable dnssec' => 'DNSSEC deaktivieren (nicht empfohlen)', > >>>> 'dns forwarding dnssec disabled notice' => '(DNSSEC deaktiviert)', > >>>> 'dns header' => 'DNS Server Adressen zuweisen nur mit DHCP an red0', > >>>> @@ -1102,9 +1104,12 @@ > >>>> 'from email server' => 'Von E-Mail-Server', > >>>> 'from email user' => 'Von E-Mail-Benutzer', > >>>> 'from warn email bad' => 'Von E-Mail-Adresse ist nicht gültig', > >>>> -'fw blue' => 'Firewalloptionen für das Blaue Interface', > >>>> +'fw blue' => 'Firewalloptionen für das <font color=\'#0000FF\'>BLAUE</font> Interface', > >>>> 'fw default drop' => 'Firewallrichtlinie', > >>>> +'fw green' => 'Firewalloptionen für das <font color=\'#339933\'>GRÜNE</font> Interface', > >>>> 'fw logging' => 'Firewallprotokollierung', > >>>> +'fw logging blue' => 'Firewallprotokollierung (<font color=\'#0000FF\'>BLAU</font>)', > >>>> +'fw logging red' => 'Firewallprotokollierung (<font color=\'#993333\'>ROT</font>)', > >>>> 'fw settings' => 'Firewalleinstellungen', > >>>> 'fw settings color' => 'Farben in Regeltabelle anzeigen', > >>>> 'fw settings dropdown' => 'Alle Netzwerke auf Regelerstellungsseite anzeigen', > >>>> @@ -1644,9 +1649,9 @@ > >>>> 'map to guest' => 'Map to Guest', > >>>> 'march' => 'März', > >>>> 'marked' => 'Markiert', > >>>> -'masquerade blue' => 'NAT auf BLAU', > >>>> -'masquerade green' => 'NAT auf GRÜN', > >>>> -'masquerade orange' => 'NAT auf ORANGE', > >>>> +'masquerade blue' => 'NAT auf <b><font color=\'#0000FF\'>BLAU</font></b>', > >>>> +'masquerade green' => 'NAT auf <b><font color=\'#339933\'>GRÜN</font></b>', > >>>> +'masquerade orange' => 'NAT auf <b><font color =\'#FF9933\'>ORANGE</font></b>', > >>>> 'masquerading' => 'Masquerading/NAT', > >>>> 'masquerading disabled' => 'NAT ausgeschaltet', > >>>> 'masquerading enabled' => 'NAT eingeschaltet', > >>>> @@ -1814,6 +1819,8 @@ > >>>> 'november' => 'November', > >>>> 'ntp common settings' => 'Allgemeine Einstellungen', > >>>> 'ntp configuration' => 'Zeitserverkonfiguration', > >>>> +'ntp force on blue' => 'Erzwinge <a href=\'/cgi-bin/time.cgi\'>lokale NTP-Server</a> auf BLAU', > >>>> +'ntp force on green' => 'Erzwinge <a href=\'/cgi-bin/time.cgi\'>lokale NTP-Server</a> auf GRÜN', > >>>> 'ntp must be enabled to have clients' => 'Um Clients annehmen zu können, muss NTP vorher aktiviert sein.', > >>>> 'ntp server' => 'NTP-Server', > >>>> 'ntp sync' => 'Synchronisation', > >>>> diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl > >>>> index 8f7e0c2cf..474612025 100644 > >>>> --- a/langs/en/cgi-bin/en.pl > >>>> +++ b/langs/en/cgi-bin/en.pl > >>>> @@ -859,6 +859,8 @@ > >>>> 'dns error 0' => 'The IP address of the <strong>primary</strong> DNS server is not valid, please check your entries!<br />The entered <strong>secondary</strong> DNS server address is valid.', > >>>> 'dns error 01' => 'The entered IP address of the <strong>primary</strong> and <strong>secondary</strong> DNS server are not valid, please check your entries!', > >>>> 'dns error 1' => 'The IP address of the <strong>secondary</strong> DNS server is not valid, please check your entries!<br />The entered <strong>primary</strong> DNS server address is valid.', > >>>> +'dns force on blue' => 'Force DNS to use <a href=\'/cgi-bin/dns.cgi\'>local DNS servers</a> on BLUE', > >>>> +'dns force on green' => 'Force DNS to use <a href=\'/cgi-bin/dns.cgi\'>local DNS servers</a> on GREEN', > >>>> 'dns forward disable dnssec' => 'Disable DNSSEC (dangerous)', > >>>> 'dns forwarding dnssec disabled notice' => '(DNSSEC disabled)', > >>>> 'dns header' => 'Assign DNS server addresses only for DHCP on red0', > >>>> @@ -1128,9 +1130,12 @@ > >>>> 'from email server' => 'From Email server', > >>>> 'from email user' => 'From e-mail user', > >>>> 'from warn email bad' => 'From e-mail address is not valid', > >>>> -'fw blue' => 'Firewall options for BLUE interface', > >>>> +'fw blue' => 'Firewall options for <font color=\'#0000FF\'>BLUE</font> Interface', > >>>> 'fw default drop' => 'Firewall policy', > >>>> +'fw green' => 'Firewall options for <font color=\'#339933\'>GREEN</font> Interface', > >>>> 'fw logging' => 'Firewall logging', > >>>> +'fw logging blue' => 'Firewall logging (<font color=\'#0000FF\'>BLUE</font>)', > >>>> +'fw logging red' => 'Firewall logging (<font color=\'#993333\'>RED</font>)', > >>>> 'fw settings' => 'Firewall settings', > >>>> 'fw settings color' => 'Show colors in ruletable', > >>>> 'fw settings dropdown' => 'Show all networks on rulecreation site', > >>>> @@ -1672,9 +1677,9 @@ > >>>> 'map to guest' => 'Map to Guest', > >>>> 'march' => 'March', > >>>> 'marked' => 'Marked', > >>>> -'masquerade blue' => 'Masquerade BLUE', > >>>> -'masquerade green' => 'Masquerade GREEN', > >>>> -'masquerade orange' => 'Masquerade ORANGE', > >>>> +'masquerade blue' => 'Masquerade <b><font color=\'#0000FF\'>BLUE</font></b>', > >>>> +'masquerade green' => 'Masquerade <b><font color=\'#339933\'>GREEN</font></b>', > >>>> +'masquerade orange' => 'Masquerade <b><font color=\'#FF9933\'>ORANGE</font></b>', > >>>> 'masquerading' => 'Masquerading', > >>>> 'masquerading disabled' => 'Masquerading disabled', > >>>> 'masquerading enabled' => 'Masquerading enabled', > >>>> @@ -1844,6 +1849,8 @@ > >>>> 'november' => 'November', > >>>> 'ntp common settings' => 'Common settings', > >>>> 'ntp configuration' => 'NTP Configuration', > >>>> +'ntp force on blue' => 'Force NTP to use <a href=\'/cgi-bin/time.cgi\'>local NTP servers</a> on BLUE', > >>>> +'ntp force on green' => 'Force NTP to use <a href=\'/cgi-bin/time.cgi\'>local NTP servers</a> on GREEN', > >>>> 'ntp must be enabled to have clients' => 'NTP must be enabled to have clients.', > >>>> 'ntp server' => 'NTP Server', > >>>> 'ntp sync' => 'Synchronization', > >>>> diff --git a/lfs/configroot b/lfs/configroot > >>>> index a3e474d70..622793b35 100644 > >>>> --- a/lfs/configroot > >>>> +++ b/lfs/configroot > >>>> @@ -129,6 +129,10 @@ $(TARGET) : > >>>> echo "SHOWDROPDOWN=off" >> $(CONFIG_ROOT)/optionsfw/settings > >>>> echo "DROPWIRELESSINPUT=on" >> $(CONFIG_ROOT)/optionsfw/settings > >>>> echo "DROPWIRELESSFORWARD=on" >> $(CONFIG_ROOT)/optionsfw/settings > >>>> + echo "DNS_FORCE_ON_GREEN=off" >> $(CONFIG_ROOT)/optionsfw/settings > >>>> + echo "DNS_FORCE_ON_BLUE=off" >> $(CONFIG_ROOT)/optionsfw/settings > >>>> + echo "NTP_FORCE_ON_GREEN=off" >> $(CONFIG_ROOT)/optionsfw/settings > >>>> + echo "NTP_FORCE_ON_BLUE=off" >> $(CONFIG_ROOT)/optionsfw/settings > >>>> echo "POLICY=MODE2" >> $(CONFIG_ROOT)/firewall/settings > >>>> echo "POLICY1=MODE2" >> $(CONFIG_ROOT)/firewall/settings > >>>> echo "USE_ISP_NAMESERVERS=on" >> $(CONFIG_ROOT)/dns/settings > >>>> diff --git a/src/initscripts/system/dnsntp b/src/initscripts/system/dnsntp > >>>> new file mode 100644 > >>>> index 000000000..2eafa9d20 > >>>> --- /dev/null > >>>> +++ b/src/initscripts/system/dnsntp > >>>> @@ -0,0 +1,36 @@ > >>>> +#!/bin/sh > >>>> +######################################################################## > >>>> +# Begin $rc_base/init.d/dnsntp > >>>> +# > >>>> +# Description : dnsntp init script for DNS/NTP rules only > >>>> +# > >>>> +######################################################################## > >>>> + > >>>> +# flush chain > >>>> +iptables -t nat -F DNS_NTP_REDIRECT > >>>> + > >>>> +eval $(/usr/local/bin/readhash /var/ipfire/optionsfw/settings) > >>>> + > >>>> +# Force DNS REDIRECTs on GREEN (udp, tcp, 53) > >>>> +if [ "$DNS_FORCE_ON_GREEN" == "on" ]; then > >>>> + iptables -t nat -A DNS_NTP_REDIRECT -i green0 -p udp -m udp --dport 53 -j REDIRECT > >>>> + iptables -t nat -A DNS_NTP_REDIRECT -i green0 -p tcp -m tcp --dport 53 -j REDIRECT > >>>> +fi > >>>> + > >>>> +# Force DNS REDIRECTs on BLUE (udp, tcp, 53) > >>>> +if [ "$DNS_FORCE_ON_BLUE" == "on" ]; then > >>>> + iptables -t nat -A DNS_NTP_REDIRECT -i blue0 -p udp -m udp --dport 53 -j REDIRECT > >>>> + iptables -t nat -A DNS_NTP_REDIRECT -i blue0 -p tcp -m tcp --dport 53 -j REDIRECT > >>>> +fi > >>>> + > >>>> +# Force NTP REDIRECTs on GREEN (udp, 123) > >>>> +if [ "$NTP_FORCE_ON_GREEN" == "on" ]; then > >>>> + iptables -t nat -A DNS_NTP_REDIRECT -i green0 -p udp -m udp --dport 123 -j REDIRECT > >>>> +fi > >>>> + > >>>> +# Force DNS REDIRECTs on BLUE (udp, 123) > >>>> +if [ "$NTP_FORCE_ON_BLUE" == "on" ]; then > >>>> + iptables -t nat -A DNS_NTP_REDIRECT -i blue0 -p udp -m udp --dport 123 -j REDIRECT > >>>> +fi > >>>> + > >>>> +# End $rc_base/init.d/dnsntp > >>>> diff --git a/src/initscripts/system/firewall b/src/initscripts/system/firewall > >>>> index 65f1c979b..43ae74113 100644 > >>>> --- a/src/initscripts/system/firewall > >>>> +++ b/src/initscripts/system/firewall > >>>> @@ -169,6 +169,10 @@ iptables_init() { > >>>> # Fix for braindead ISPs > >>>> iptables -A FORWARD -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu > >>>> > >>>> + # DNS / NTP REDIRECT > >>>> + iptables -t nat -N DNS_NTP_REDIRECT > >>>> + iptables -t nat -A PREROUTING -j DNS_NTP_REDIRECT > >>>> + > >>>> # CUSTOM chains, can be used by the users themselves > >>>> iptables -N CUSTOMINPUT > >>>> iptables -A INPUT -j CUSTOMINPUT > >>>> @@ -281,7 +285,7 @@ iptables_init() { > >>>> iptables -A INPUT -j LOCATIONBLOCK > >>>> iptables -A FORWARD -j LOCATIONBLOCK > >>>> > >>>> - # trafic from ipsecX/TUN/TAP interfaces, before "-i GREEN_DEV" accept everything > >>>> + # traffic from ipsecX/TUN/TAP interfaces, before "-i GREEN_DEV" accept everything > >>>> iptables -N IPSECINPUT > >>>> iptables -N IPSECFORWARD > >>>> iptables -N IPSECOUTPUT > >>>> @@ -389,6 +393,9 @@ iptables_init() { > >>>> # run captivectrl > >>>> /usr/local/bin/captivectrl > >>>> > >>>> + # run dnsntpctrl > >>>> + /usr/local/bin/dnsntpctrl > >>>> + > >>>> # POLICY CHAIN > >>>> iptables -N POLICYIN > >>>> iptables -A INPUT -j POLICYIN > >>>> diff --git a/src/misc-progs/Makefile b/src/misc-progs/Makefile > >>>> index 7c3ef7529..6f2733ef0 100644 > >>>> --- a/src/misc-progs/Makefile > >>>> +++ b/src/misc-progs/Makefile > >>>> @@ -26,7 +26,7 @@ PROGS = iowrap > >>>> SUID_PROGS = squidctrl sshctrl ipfirereboot \ > >>>> ipsecctrl timectrl dhcpctrl suricatactrl \ > >>>> rebuildhosts backupctrl collectdctrl \ > >>>> - logwatch wioscan wiohelper openvpnctrl firewallctrl \ > >>>> + logwatch wioscan wiohelper openvpnctrl firewallctrl dnsntpctrl \ > >>>> wirelessctrl getipstat qosctrl \ > >>>> redctrl syslogdctrl extrahdctrl sambactrl \ > >>>> smartctrl clamavctrl addonctrl pakfire mpfirectrl wlanapctrl \ > >>>> diff --git a/src/misc-progs/dnsntpctrl.c b/src/misc-progs/dnsntpctrl.c > >>>> new file mode 100644 > >>>> index 000000000..f2a3b89e3 > >>>> --- /dev/null > >>>> +++ b/src/misc-progs/dnsntpctrl.c > >>>> @@ -0,0 +1,19 @@ > >>>> +/* This file is part of the IPFire Firewall. > >>>> + * > >>>> + * This program is distributed under the terms of the GNU General Public > >>>> + * Licence. See the file COPYING for details. > >>>> + * > >>>> + */ > >>>> + > >>>> +#include <stdlib.h> > >>>> +#include "setuid.h" > >>>> + > >>>> +int main(void) > >>>> +{ > >>>> + if (!(initsetuid())) > >>>> + exit(1); > >>>> + > >>>> + safe_system("/etc/rc.d/init.d/dnsntp >/dev/null 2>&1"); > >>>> + > >>>> + return 0; > >>>> +} > >>>> -- > >>>> 2.18.0 > >>>> > >>>> > >>> > >> > >> > >

3 6

[PATCH] BUG12265: firewall: iptables rules are being created in the wrong chain
by Alexander Marx 22 Apr '21

22 Apr '21

Fixes: #12265 When creating a rule with a local network as source and a firewallinterface as target, the rule was created in the FORWARD instead of INPUT chain. This one fixes that and additionally checks if a manual target ip address is one of IPFire's interfaces and changes the rule accordingly. --- config/firewall/firewall-lib.pl | 4 ++-- html/cgi-bin/firewall.cgi | 42 ++++++++++++++++++++++----------- 2 files changed, 30 insertions(+), 16 deletions(-) diff --git a/config/firewall/firewall-lib.pl b/config/firewall/firewall-lib.pl index bc0b30ca5..26d357ea2 100644 --- a/config/firewall/firewall-lib.pl +++ b/config/firewall/firewall-lib.pl @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2013 Alexander Marx <amarx(a)ipfire.org> # +# Copyright (C) 2021 Alexander Marx <amarx(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 # @@ -427,7 +427,7 @@ sub get_address } # The firewall's own IP addresses. - } elsif ($key ~~ ["ipfire", "ipfire_src"]) { + } elsif ($key ~~ ["ipfire_tgt", "ipfire_src"]) { # ALL if ($value eq "ALL") { push(@ret, ["0/0", ""]); diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index 532f99f91..6c9b7e9a7 100644 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2013 Alexander Marx <amarx(a)ipfire.org> # +# Copyright (C) 2021 Alexander Marx <amarx(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 # @@ -213,6 +213,7 @@ if ($fwdfwsettings{'ACTION'} eq 'saverule') &General::readhasharray("$configfwdfw", \%configfwdfw); &General::readhasharray("$configinput", \%configinputfw); &General::readhasharray("$configoutgoing", \%configoutgoingfw); + &General::readhash("/var/ipfire/ethernet/settings", \%netsettings); my $maxkey; #Set Variables according to the JQuery code in protocol section if ($fwdfwsettings{'PROT'} eq 'TCP' || $fwdfwsettings{'PROT'} eq 'UDP') @@ -231,6 +232,19 @@ if ($fwdfwsettings{'ACTION'} eq 'saverule') { $fwdfwsettings{'USESRV'} = 'ON'; } + #Check if manual targetip is one of IPFire addresses + if ($fwdfwsettings{'grp2'} eq 'tgt_addr' && $fwdfwsettings{$fwdfwsettings{'grp2'}} eq $netsettings{'GREEN_ADDRESS'}){ + $fwdfwsettings{'grp2'} = 'ipfire_tgt'; + $fwdfwsettings{$fwdfwsettings{'grp2'}} = 'GREEN'; + } + if ($fwdfwsettings{'grp2'} eq 'tgt_addr' && $fwdfwsettings{$fwdfwsettings{'grp2'}} eq $netsettings{'ORANGE_ADDRESS'}){ + $fwdfwsettings{'grp2'} = 'ipfire_tgt'; + $fwdfwsettings{$fwdfwsettings{'grp2'}} = 'ORANGE'; + } + if ($fwdfwsettings{'grp2'} eq 'tgt_addr' && $fwdfwsettings{$fwdfwsettings{'grp2'}} eq $netsettings{'BLUE_ADDRESS'}){ + $fwdfwsettings{'grp2'} = 'ipfire_tgt'; + $fwdfwsettings{$fwdfwsettings{'grp2'}} = 'BLUE'; + } $errormessage=&checksource; if(!$errormessage){&checktarget;} if(!$errormessage){&checkrule;} @@ -243,11 +257,11 @@ if ($fwdfwsettings{'ACTION'} eq 'saverule') } } #check if we try to break rules - if( $fwdfwsettings{'grp1'} eq 'ipfire_src' && $fwdfwsettings{'grp2'} eq 'ipfire'){ + if( $fwdfwsettings{'grp1'} eq 'ipfire_src' && $fwdfwsettings{'grp2'} eq 'ipfire_tgt'){ $errormessage=$Lang::tr{'fwdfw err same'}; } # INPUT part - if ($fwdfwsettings{'grp2'} eq 'ipfire' && $fwdfwsettings{$fwdfwsettings{'grp1'}} ne 'ORANGE'){ + if ($fwdfwsettings{'grp2'} eq 'ipfire_tgt'){ $fwdfwsettings{'config'}=$configinput; $fwdfwsettings{'chain'} = 'INPUTFW'; $maxkey=&General::findhasharraykey(\%configinputfw); @@ -600,7 +614,7 @@ sub checktarget } } #check empty fields - if ($fwdfwsettings{$fwdfwsettings{'grp2'}} eq ''){ $errormessage.=$Lang::tr{'fwdfw err notgt'}."<br>";} + if ($fwdfwsettings{$fwdfwsettings{'grp2'}} eq '' && !$fwdfwsettings{'grp2'}){ $errormessage.=$Lang::tr{'fwdfw err notgt'}."<br>";} #check tgt services if ($fwdfwsettings{'USESRV'} eq 'ON'){ if ($fwdfwsettings{'grp3'} eq 'cust_srv'){ @@ -1512,7 +1526,7 @@ sub newrule $checked{'USE_NAT'}{$fwdfwsettings{'USE_NAT'}} = 'CHECKED'; $selected{'TIME_FROM'}{$fwdfwsettings{'TIME_FROM'}} = 'selected'; $selected{'TIME_TO'}{$fwdfwsettings{'TIME_TO'}} = 'selected'; - $selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp2'}}} ='selected'; + $selected{'ipfire_tgt'}{$fwdfwsettings{$fwdfwsettings{'grp2'}}} ='selected'; $selected{'ipfire_src'}{$fwdfwsettings{$fwdfwsettings{'grp1'}}} ='selected'; #check if update and get values if($fwdfwsettings{'updatefwrule'} eq 'on' || $fwdfwsettings{'copyfwrule'} eq 'on' && !$errormessage){ @@ -1584,7 +1598,7 @@ sub newrule $checked{'RATE_LIMIT'}{$fwdfwsettings{'RATE_LIMIT'}} = 'CHECKED'; $selected{'TIME_FROM'}{$fwdfwsettings{'TIME_FROM'}} = 'selected'; $selected{'TIME_TO'}{$fwdfwsettings{'TIME_TO'}} = 'selected'; - $selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp2'}}} ='selected'; + $selected{'ipfire_tgt'}{$fwdfwsettings{$fwdfwsettings{'grp2'}}} ='selected'; $selected{'ipfire_src'}{$fwdfwsettings{$fwdfwsettings{'grp1'}}} ='selected'; $selected{'dnat'}{$fwdfwsettings{'dnat'}} ='selected'; $selected{'snat'}{$fwdfwsettings{'snat'}} ='selected'; @@ -1751,18 +1765,18 @@ END &Header::openbox('100%', 'left', $Lang::tr{'fwdfw target'}); print<<END; <table width='100%' border='0'> - <tr><td width='1%'><input type='radio' name='grp2' value='tgt_addr' checked></td><td width='60%' nowrap='nowrap'>$Lang::tr{'fwdfw targetip'}<input type='TEXT' name='tgt_addr' value='$fwdfwsettings{'tgt_addr'}' size='16' maxlength='18'><td width='1%'><input type='radio' name='grp2' id='ipfire' value='ipfire' $checked{'grp2'}{'ipfire'}></td><td><b>Firewall</b></td> + <tr><td width='1%'><input type='radio' name='grp2' value='tgt_addr' checked></td><td width='60%' nowrap='nowrap'>$Lang::tr{'fwdfw targetip'}<input type='TEXT' name='tgt_addr' value='$fwdfwsettings{'tgt_addr'}' size='16' maxlength='18'><td width='1%'><input type='radio' name='grp2' id='ipfire_tgt' value='ipfire_tgt' $checked{'grp2'}{'ipfire_tgt'}></td><td><b>Firewall</b></td> END - print"<td align='right'><select name='ipfire' style='width:200px;'>"; - print "<option value='ALL' $selected{'ipfire'}{'ALL'}>$Lang::tr{'all'}</option>"; - print "<option value='GREEN' $selected{'ipfire'}{'GREEN'}>$Lang::tr{'green'} ($ifaces{'GREEN_ADDRESS'})</option>" if $ifaces{'GREEN_ADDRESS'}; - print "<option value='ORANGE' $selected{'ipfire'}{'ORANGE'}>$Lang::tr{'orange'} ($ifaces{'ORANGE_ADDRESS'})</option>" if (&Header::orange_used()); - print "<option value='BLUE' $selected{'ipfire'}{'BLUE'}>$Lang::tr{'blue'} ($ifaces{'BLUE_ADDRESS'})</option>"if (&Header::blue_used()); - print "<option value='RED1' $selected{'ipfire'}{'RED1'}>$Lang::tr{'red1'} ($redip)" if ($redip); + print"<td align='right'><select name='ipfire_tgt' style='width:200px;'>"; + print "<option value='ALL' $selected{'ipfire_tgt'}{'ALL'}>$Lang::tr{'all'}</option>"; + print "<option value='GREEN' $selected{'ipfire_tgt'}{'GREEN'}>$Lang::tr{'green'} ($ifaces{'GREEN_ADDRESS'})</option>" if $ifaces{'GREEN_ADDRESS'}; + print "<option value='ORANGE' $selected{'ipfire_tgt'}{'ORANGE'}>$Lang::tr{'orange'} ($ifaces{'ORANGE_ADDRESS'})</option>" if (&Header::orange_used()); + print "<option value='BLUE' $selected{'ipfire_tgt'}{'BLUE'}>$Lang::tr{'blue'} ($ifaces{'BLUE_ADDRESS'})</option>"if (&Header::blue_used()); + print "<option value='RED1' $selected{'ipfire_tgt'}{'RED1'}>$Lang::tr{'red1'} ($redip)" if ($redip); if (! -z "${General::swroot}/ethernet/aliases"){ foreach my $alias (sort keys %aliases) { - print "<option value='$alias' $selected{'ipfire'}{$alias}>$alias ($aliases{$alias}{'IPT'})</option>"; + print "<option value='$alias' $selected{'ipfire_tgt'}{$alias}>$alias ($aliases{$alias}{'IPT'})</option>"; } } print<<END; -- 2.25.1

4 3

Backup: Rework and altering of functionalities and GUI for better usability
by Matthias Fischer 18 Apr '21

18 Apr '21

Based on https://bugzilla.ipfire.org/show_bug.cgi?id=12588 Hi, in the meantime I worked on this - a bit. I've made several changes and adjustments which could be implemented one by one - if they are wanted/accepted: - Changed icons to buttons => better readability. - For buttons to work, I added two lang strings for button labeling. - Cleaned up the code a bit, some if-queries were unnessecary (if ($cgiparams{'ACTION'} eq...). - Changed the order of the (Addon-)buttons to "Download - Save - Delete" (old: Download was in the middle). - Marked IPF-files bold => better readability (I already sent this in one day: => https://patchwork.ipfire.org/patch/3124/). - Added query for deleting a backup file (onclick=\"return confirm...). Details in the attached screenshot. Proposed ToDo - as a start: Alter the info text for restoring to make clear that only the addon *configs* are restored, not the addons themselves. Thoughts? Opinions? Best, Matthias

5 14

[PATCH] SSH: do not send spoofable TCP keep alive messages
by Peter Müller 10 Apr '21

10 Apr '21

By default, both SSH server and client rely on TCP-based keep alive messages to detect broken sessions, which can be spoofed rather easily in order to keep a broken session opened (and vice versa). Since we rely on SSH-based keep alive messages, which are not vulnerable to this kind of tampering, there is no need to double-check connections via TCP keep alive as well. This patch thereof disables using TCP keep alive for both SSH client and server scenario. Further, {Client,Server}AliveCountMax default to 3, which is sufficient (3 * 10 sec. = broken SSH connections die after 30 seconds), so we can omit that option. 60 seconds won't have any advantage here. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- config/ssh/ssh_config | 11 +++++++---- config/ssh/sshd_config | 7 ++++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/config/ssh/ssh_config b/config/ssh/ssh_config index 2e2ee60c3..ab0967086 100644 --- a/config/ssh/ssh_config +++ b/config/ssh/ssh_config @@ -5,7 +5,7 @@ # Set some basic hardening options for all connections Host * - # Disable Roaming as it is known to be vulnerable + # Disable undocumented roaming feature as it is known to be vulnerable UseRoaming no # Only use secure crypto algorithms @@ -13,15 +13,18 @@ Host * Ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes192-ctr,aes128-ctr MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com,umac-128-etm@openssh.com,hmac-sha2-512,hmac-sha2-256,umac-128@openssh.com - # Always visualise server host keys (but helps to identify key based MITM attacks) + # Always visualise server host keys (helps to identify key based MITM attacks) VisualHostKey yes # Use SSHFP (might work on some up-to-date networks) to look up host keys VerifyHostKeyDNS yes - # send keep-alive messages to connected server to avoid broken connections + # Send SSH-based keep alive messages to connected server to avoid broken connections ServerAliveInterval 10 - ServerAliveCountMax 6 + + # Disable TCP keep alive messages since they can be spoofed and we have SSH-based + # keep alive messages enabled; there is no need to do things twice here + TCPKeepAlive no # Ensure only allowed authentication methods are used PreferredAuthentications publickey,keyboard-interactive,password diff --git a/config/ssh/sshd_config b/config/ssh/sshd_config index bea5cee53..a9eb5ff14 100644 --- a/config/ssh/sshd_config +++ b/config/ssh/sshd_config @@ -47,11 +47,12 @@ AllowTcpForwarding no AllowAgentForwarding no PermitOpen none -# Detect broken sessions by sending keep-alive messages to clients via SSH connection +# Send SSH-based keep alive messages every 10 seconds ClientAliveInterval 10 -# Close unresponsive SSH sessions which fail to answer keep-alive -ClientAliveCountMax 6 +# Since TCP keep alive messages can be spoofed and we have the SSH-based already, +# there is no need for this to be enabled as well +TCPKeepAlive no # Add support for SFTP Subsystem sftp /usr/lib/openssh/sftp-server -- 2.26.2

2 6

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development March 2021