Development February 2021

development@lists.ipfire.org

15 participants
89 discussions

[PATCH] rust: Update to 1.50
by Matthias Fischer 25 Feb '21

25 Feb '21

For details see: https://github.com/rust-lang/rust/blob/master/RELEASES.md Unfortunately I can only build with 32bit and 64bit, this is why I couldn't upload the rootfiles for 'aarch64' and 'armv5tel'. Tested here with 'suricata 5.0.5' - running without seen problems. Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/common/i586/rust | 180 +++++++------------------- config/rootfiles/common/x86_64/rust | 188 +++++++--------------------- lfs/rust | 12 +- 3 files changed, 97 insertions(+), 283 deletions(-) diff --git a/config/rootfiles/common/i586/rust b/config/rootfiles/common/i586/rust index e39869db9..5b3b498b5 100644 --- a/config/rootfiles/common/i586/rust +++ b/config/rootfiles/common/i586/rust @@ -4,159 +4,64 @@ #usr/bin/rust-lldb #usr/bin/rustc #usr/bin/rustdoc -#usr/etc #usr/etc/bash_completion.d #usr/etc/bash_completion.d/cargo -#usr/lib/libLLVM-9-rust-1.39.0-stable.so -#usr/lib/librustc_driver-1a532374fe5c1dbf.so -#usr/lib/librustc_macros-699fa5645cea11bd.so -#usr/lib/libstd-4701daff866faeba.so -#usr/lib/libtest-0bf1add36d3b3bfc.so +#usr/lib/libchalk_derive-dfa7d4aa3c4122b5.so +#usr/lib/librustc_driver-6f74b8765a504030.so +#usr/lib/librustc_macros-5af2465d06f3e5ef.so +#usr/lib/libserde_derive-cc14479bf5403ff4.so +#usr/lib/libstd-432c60b323be1e4f.so +#usr/lib/libtest-c924162c32bc9689.so +#usr/lib/libtracing_attributes-9e3e92feee9eb8a7.so #usr/lib/rustlib #usr/lib/rustlib/components #usr/lib/rustlib/etc -#usr/lib/rustlib/etc/debugger_pretty_printers_common.py #usr/lib/rustlib/etc/gdb_load_rust_pretty_printers.py -#usr/lib/rustlib/etc/gdb_rust_pretty_printing.py -#usr/lib/rustlib/etc/lldb_rust_formatters.py +#usr/lib/rustlib/etc/gdb_lookup.py +#usr/lib/rustlib/etc/gdb_providers.py +#usr/lib/rustlib/etc/lldb_commands +#usr/lib/rustlib/etc/lldb_lookup.py +#usr/lib/rustlib/etc/lldb_providers.py +#usr/lib/rustlib/etc/rust_types.py #usr/lib/rustlib/i686-unknown-linux-gnu #usr/lib/rustlib/i686-unknown-linux-gnu/bin #usr/lib/rustlib/i686-unknown-linux-gnu/bin/rust-lld -#usr/lib/rustlib/i686-unknown-linux-gnu/codegen-backends -#usr/lib/rustlib/i686-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-emscripten.so -#usr/lib/rustlib/i686-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so +#usr/lib/rustlib/i686-unknown-linux-gnu/bin/rust-llvm-dwp #usr/lib/rustlib/i686-unknown-linux-gnu/lib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libLLVM-9-rust-1.39.0-stable.so -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/liballoc-cb92d1b88f6842ba.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libannotate_snippets-16c698d431daeaf1.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libarena-b0068b8919b4f93a.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libarrayvec-6dfd5c969b5a9973.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libatty-f7984397b40e0ca7.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libbacktrace-9a16dee9d7a535e7.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libbacktrace-d13e6eeb669bebd1.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libbacktrace_sys-694f3b8490cc5785.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libbacktrace_sys-bbdf3b24f8c367f5.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libbitflags-7584bbfc2382acc0.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libbyteorder-c5275fb0aa62f11d.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libc2_chacha-9a4547196deecf06.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libcc-438ffa67d55db910.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libcfg_if-863b24e2b063e3f6.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libcfg_if-ce492e342337db11.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libchalk_engine-c1520a76e6a2ed4c.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libchalk_macros-d69e3af08ee47f3d.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libcompiler_builtins-a28c54217c639cc1.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libcore-a272021782494efa.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libcrc32fast-a10edc50837d9dae.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libcrossbeam_deque-c46d2155cd682ff9.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libcrossbeam_epoch-6a4045dfef9a0f76.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libcrossbeam_utils-09c422c67565a5ef.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libcrossbeam_utils-a875207305cdbf60.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libdatafrog-ac7e913b029c6b19.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libeither-1a1f6c4656291c5b.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libena-b6736b066094919b.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libenv_logger-50c4f7c84e580379.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libflate2-ddc891dda6c7c706.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libfmt_macros-9894d2bb44506c8d.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libgetopts-ca1bbf53e83311df.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libgetrandom-583bde357e14514f.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libgraphviz-90b03ef2b89bc475.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libhashbrown-b64c735e6a20c3b1.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libindexmap-7460450c7ac7ee91.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libitoa-d99bc02fc9c9e1a7.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libjemalloc_sys-1cdee07a8820c14f.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libjobserver-21ba0192fac0f6ff.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/liblazy_static-57c00bb53f4ceb78.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/liblazy_static-af76e4bcbb3fe747.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/liblibc-0c2443dea4ab5158.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/liblibc-19e1b48c574b93b4.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/liblock_api-76d17ad48e538394.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/liblog-69e1f010ac9b6c51.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/liblog_settings-b8ed2329f494eb67.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libmeasureme-d2a70efca5d89140.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libmemmap-d0d1d630d844f7ea.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libmemoffset-9d75c0e40d93ebfd.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libminiz_sys-965e2d5c480c6f3e.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libnodrop-d796cf10c14f2cfc.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libnum_cpus-164aa43c9b525b6d.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libonce_cell-58f19a526e5b7d1a.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libpanic_abort-2c121805aefaf241.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libpanic_unwind-c5ffa1c0daa1aab9.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libparking_lot-dd6335a8fd6541d0.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libparking_lot_core-3626287d22c5fe4d.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libpolonius_engine-74c410d3b5bdadac.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libppv_lite86-b0b7d11537b86905.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libproc_macro-1f8881a06425149a.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libprofiler_builtins-3ed3cdd89d8ca962.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libpunycode-7b5520cf2af5b506.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librand-0e590927a15c9964.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librand_chacha-889d492b886989fd.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librand_core-9e9cecafd0f008ff.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libremove_dir_all-a7010c0f2ff50cc7.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librls_data-11ac17c3ffa41d1e.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librls_span-743ebf9f04d9983e.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc-50444c6d3b3f07e8.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_apfloat-543561f502a3d1dc.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_ast_borrowck-8fbea494e93fd4e6.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_codegen_ssa-d7722eab1a33a23b.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_codegen_utils-4cbbf822082caa91.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_data_structures-04f1ffb1e017fcf8.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_demangle-3bddd7a24de24c89.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_demangle-e6b1e10cfa2b7fc1.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_driver-1a532374fe5c1dbf.so -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_errors-083792eb550a2a81.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_fs_util-28195639fac94acb.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_hash-a9518c09c0596c5d.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_incremental-272915ec901fe341.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_interface-d1e3822ce734444d.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_lexer-557053023537a74f.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_lint-896c8300191b5fab.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_macros-699fa5645cea11bd.so -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_metadata-5d683b9645e8d584.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_mir-83478ec300eb9f76.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_passes-0170f456c1fa5bd8.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_plugin-cb458c4d6e1ec6ae.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_plugin_impl-c7075628bf8fc3ed.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_privacy-bf9614eee760a3f5.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_rayon-937e44b8697aef0a.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_rayon_core-d6904a09535f545d.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_resolve-cf13697bb0bbeb9a.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_save_analysis-79f36d4aaa77c07f.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_std_workspace_alloc-0e2bc102e615cdaf.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_std_workspace_core-832207d1557e47c1.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_std_workspace_std-a4bf23dca7b3725c.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_target-665f7f27feccf6e1.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_traits-74dac3e89f8da200.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_typeck-e4d56a651b49d56f.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libryu-4bf8fde2ddba7975.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libscoped_tls-66d70161f3a7ed07.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libscopeguard-7a75e7d10acd3fa1.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libscopeguard-abe0fa30b713cc5f.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libserde-cb526aeb5306d683.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libserde_json-00cff9bfa7edcb5c.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libserialize-a562e23ab367115f.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libsmallvec-79ebdb144a3ffa38.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libstable_deref_trait-fc93318522fd6a61.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libstd-4701daff866faeba.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libstd-4701daff866faeba.so -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libsyntax-72a319da71cc4370.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libsyntax_ext-9d1a9d759476e85c.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libsyntax_pos-b6b67600cc699e1b.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libtempfile-443bc476b19beb0f.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libterm-f70b06be4df3c561.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libterm_size-1f9fc4a815afba2b.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libtermcolor-d4b27c9ff699feb1.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libtest-0bf1add36d3b3bfc.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libtest-0bf1add36d3b3bfc.so -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libunicode_width-2a78fac252dc1a98.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libunicode_width-f41f5a9bea5d114d.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libunicode_xid-b1824cef511223a1.rlib -#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libunwind-b0d3dda3e441ec42.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libaddr2line-1110d28274a5a558.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libadler-4b1049af3d913803.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/liballoc-5e2a7d41358b8c39.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libcfg_if-a9603e8333d12216.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libcompiler_builtins-57f1b8bc97a86ad5.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libcore-041b4871def5ffdd.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libgetopts-0c11f8eb378407f6.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libgimli-f94ca12d741aa829.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libhashbrown-05b3bb325f871ab6.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/liblibc-71dc1a7fd36fc1f8.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libminiz_oxide-647a40100ab2bea5.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libobject-6f43ac9680623372.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libpanic_abort-55b8dce24446be0e.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libpanic_unwind-5792752fa50f924f.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libproc_macro-65269cd9094d14e6.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libprofiler_builtins-22fe3e13ecb9d52f.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_demangle-97839ff2b38debae.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_std_workspace_alloc-970c252fdb322ff9.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_std_workspace_core-e2ebdd0dee50567f.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_std_workspace_std-cd6fe2855767d095.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libstd-432c60b323be1e4f.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libstd-432c60b323be1e4f.so +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libterm-111efd21a26ba2c8.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libtest-c924162c32bc9689.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libtest-c924162c32bc9689.so +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libunicode_width-6d6c428d48531c31.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libunwind-cb989ad6c1d6d8e4.rlib #usr/lib/rustlib/install.log #usr/lib/rustlib/manifest-cargo #usr/lib/rustlib/manifest-rust-std-i686-unknown-linux-gnu #usr/lib/rustlib/manifest-rustc #usr/lib/rustlib/rust-installer-version #usr/lib/rustlib/uninstall.sh +#usr/libexec/cargo-credential-1password #usr/share/doc/cargo #usr/share/doc/cargo/LICENSE-APACHE #usr/share/doc/cargo/LICENSE-MIT @@ -191,6 +96,7 @@ #usr/share/man/man1/cargo-rustdoc.1 #usr/share/man/man1/cargo-search.1 #usr/share/man/man1/cargo-test.1 +#usr/share/man/man1/cargo-tree.1 #usr/share/man/man1/cargo-uninstall.1 #usr/share/man/man1/cargo-update.1 #usr/share/man/man1/cargo-vendor.1 diff --git a/config/rootfiles/common/x86_64/rust b/config/rootfiles/common/x86_64/rust index 96624e9f2..421a7516c 100644 --- a/config/rootfiles/common/x86_64/rust +++ b/config/rootfiles/common/x86_64/rust @@ -7,18 +7,24 @@ #usr/etc #usr/etc/bash_completion.d #usr/etc/bash_completion.d/cargo -#usr/lib/libLLVM-9-rust-1.39.0-stable.so -#usr/lib/librustc_driver-5ba79660ac95dbfa.so -#usr/lib/librustc_macros-29f012204edfe0f3.so -#usr/lib/libstd-fae576517123aa4e.so -#usr/lib/libtest-1127f4b003793c46.so +#usr/lib/libLLVM-11-rust-1.50.0-stable.so +#usr/lib/libchalk_derive-61359e51e4358720.so +#usr/lib/librustc_driver-02bb148e88292f22.so +#usr/lib/librustc_macros-4fdb095435d7e9cb.so +#usr/lib/libserde_derive-ebf4f007defb9256.so +#usr/lib/libstd-6f77337c1826707d.so +#usr/lib/libtest-e47ef95451387c6a.so +#usr/lib/libtracing_attributes-36f34216659db5d4.so #usr/lib/rustlib #usr/lib/rustlib/components #usr/lib/rustlib/etc -#usr/lib/rustlib/etc/debugger_pretty_printers_common.py #usr/lib/rustlib/etc/gdb_load_rust_pretty_printers.py -#usr/lib/rustlib/etc/gdb_rust_pretty_printing.py -#usr/lib/rustlib/etc/lldb_rust_formatters.py +#usr/lib/rustlib/etc/gdb_lookup.py +#usr/lib/rustlib/etc/gdb_providers.py +#usr/lib/rustlib/etc/lldb_commands +#usr/lib/rustlib/etc/lldb_lookup.py +#usr/lib/rustlib/etc/lldb_providers.py +#usr/lib/rustlib/etc/rust_types.py #usr/lib/rustlib/install.log #usr/lib/rustlib/manifest-cargo #usr/lib/rustlib/manifest-rust-std-x86_64-unknown-linux-gnu @@ -28,139 +34,40 @@ #usr/lib/rustlib/x86_64-unknown-linux-gnu #usr/lib/rustlib/x86_64-unknown-linux-gnu/bin #usr/lib/rustlib/x86_64-unknown-linux-gnu/bin/rust-lld -#usr/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends -#usr/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-emscripten.so -#usr/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so +#usr/lib/rustlib/x86_64-unknown-linux-gnu/bin/rust-llvm-dwp #usr/lib/rustlib/x86_64-unknown-linux-gnu/lib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libLLVM-9-rust-1.39.0-stable.so -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liballoc-ad10152c26711a1e.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libannotate_snippets-528c0dd29454e807.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libarena-0e8b5d9953930cfd.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libarrayvec-ce8c8f1a629f81e8.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libatty-b5832919c4f33178.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libbacktrace-36d70d9746402ce9.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libbacktrace-d21bd2203b9cf386.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libbacktrace_sys-7acfc843240167a8.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libbacktrace_sys-d3f856996f4ba595.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libbitflags-b2fdda02c8c118f8.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libbyteorder-edeaf80867374bdd.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libc2_chacha-979b42583706bdc2.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcc-ae2e13c2b3cae642.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcfg_if-af51e7c6fd7d1248.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcfg_if-c3c2ba386094535a.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libchalk_engine-d798c481153b4b62.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libchalk_macros-4441a1541fbb37f4.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcompiler_builtins-ebe4001ded7f33e7.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcore-fc6e9071307a3016.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcrc32fast-fd28b3d47842f7fa.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcrossbeam_deque-2d2a63d3302e3ccc.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcrossbeam_epoch-110841597bbd2475.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcrossbeam_utils-76a8e2a5c519d0fe.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcrossbeam_utils-94a718b69a333e48.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libdatafrog-64ba326cfd6c4a87.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libeither-61581951dd32fbbe.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libena-c6f3f6330ff14200.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libenv_logger-64cfd51879efc7c5.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libflate2-c25d43037cfbbf04.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libfmt_macros-f9ea9416d074c751.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgetopts-9707b9d1fcc99cc5.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgetrandom-b568dfc804ffe462.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgraphviz-848d4fac6ff56975.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libhashbrown-093434daf7d99801.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libindexmap-9a138334b3413609.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libitoa-ad281fceba482c15.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libjemalloc_sys-8f846836d085cef1.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libjobserver-59e38c6182988eb4.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblazy_static-423003bbc2a97bc2.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblazy_static-af0bc60ea7941c5e.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-27f2a77b2995d98c.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-bdc36e54cba276b2.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblock_api-cf9fb9332945a132.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblog-bd5783e5ae9cc3a0.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblog_settings-51403d78577217aa.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libmeasureme-3318ac13c3c3608b.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libmemmap-7c395609a517e793.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libmemoffset-4400b162f1188553.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libminiz_sys-33f0934d15df5b33.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libnodrop-f6572ba0f322f51d.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libnum_cpus-1cd22c346da02324.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libonce_cell-6e1ce1030c729d53.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_abort-aa14c19d32fa6063.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_unwind-a72070139220275e.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libparking_lot-e82ff3efcbe66cea.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libparking_lot_core-0ba7415946e47555.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpolonius_engine-5538e65e1a349552.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libppv_lite86-1704f552b38d10bb.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libproc_macro-4cee5e7a25d52465.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libprofiler_builtins-001b987f93ee1de4.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpunycode-2d4253fa0a46973a.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librand-bf3aa265afda3f91.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librand_chacha-56bd2bb59a1c862f.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librand_core-a043b66a76410fc2.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libremove_dir_all-bcabfa0962d10672.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librls_data-a5618348271b8bfc.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librls_span-8e44c7827b3ee583.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-18f7ef92dec7bacb.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_apfloat-19a841b377aadd6d.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_asan-eac9215007b0fcc1.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_ast_borrowck-4462f5df22b78d39.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_codegen_ssa-4a2eda2b02a7b8ed.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_codegen_utils-0f02c9812373721f.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_data_structures-68bd26b6c6ef87a1.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_demangle-cc125734707bc906.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_demangle-eb2e0f5fe057b8b3.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_driver-5ba79660ac95dbfa.so -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_errors-b5a9571ad8e070f5.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_fs_util-e6ab52ba127c937e.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_hash-eca25276dd29034d.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_incremental-32f4987b17bc8a48.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_interface-d8c8ff078e74a506.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_lexer-ea9a441991a12858.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_lint-ecea02ac63d22579.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_lsan-6088bce415f6f750.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_macros-29f012204edfe0f3.so -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_metadata-eb65a4664267a312.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_mir-73e8b1204765dcf2.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_msan-d7847a89d2a9d4da.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_passes-80ed2cef25b23d66.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_plugin-3e7415301cab5c61.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_plugin_impl-0f211f9b695669df.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_privacy-45891a800961b63d.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_rayon-88959fb846ff25ae.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_rayon_core-d31798f186086edb.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_resolve-50843020ed609925.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_save_analysis-b32c56865bca0753.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_alloc-24daf38551b7a03b.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_core-291bd2456cb6c9fe.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_std-728a724b2323da3c.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_target-ae022bf76153d390.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_traits-b57aaef407df05a7.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_tsan-b2d1c9ec5dd4daf5.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_typeck-13cfd72719535271.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libryu-5042d4ffa1f5861d.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libscoped_tls-f69ff8d611e3ec9e.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libscopeguard-e8489771008fd545.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libscopeguard-e84f01285ed238e8.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libserde-0a34fd665b7782d8.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libserde_json-5d9374350fb495cd.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libserialize-672f3751d2ed5c2f.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libsmallvec-bb4baa7cb6fbdbdf.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstable_deref_trait-a21d9f330e0d2731.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-fae576517123aa4e.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-fae576517123aa4e.so -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libsyntax-1ad655037a2ae7cc.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libsyntax_ext-157683f36046de25.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libsyntax_pos-8d1ee0661c372238.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtempfile-4b4815141cb858d0.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libterm-efe5a62b9dfb310d.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libterm_size-635dace701d3959b.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtermcolor-871fe491ac262cd1.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-1127f4b003793c46.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-1127f4b003793c46.so -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunicode_width-3ffd827d25d4b025.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunicode_width-87460b2374e82362.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunicode_xid-dffb1f467a3b5171.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunwind-75e9ddd83715a368.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libaddr2line-65e4f8df4b8bbd73.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libadler-c0e64497deb085aa.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liballoc-edc29aa8c04b480f.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcfg_if-2e8740599b11634b.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcompiler_builtins-d36087076e1dd756.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcore-2408224b4af46d83.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgetopts-b3c2130783b6e355.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgimli-fec1b74170245419.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libhashbrown-72a374d36f3d0a31.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-241cf59851357bea.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libminiz_oxide-78f8506dd5004913.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libobject-217a514dc8d845c6.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_abort-d669fd4a86f7cf8c.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_unwind-e238540f8faf9927.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libproc_macro-bba0624c33176ddd.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libprofiler_builtins-123e57c2755f4d4f.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-stable_rt.asan.a +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-stable_rt.lsan.a +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-stable_rt.msan.a +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-stable_rt.tsan.a +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_demangle-e74f867eb2f15322.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_alloc-cb9206ed96de54c3.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_core-6a141406945fda5a.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_std-e773e1a4ab176789.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-6f77337c1826707d.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-6f77337c1826707d.so +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libterm-17f420b89a471dd5.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-e47ef95451387c6a.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-e47ef95451387c6a.so +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunicode_width-fc4fe3c8698a6dd4.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunwind-33ee81149d314805.rlib +#usr/libexec/cargo-credential-1password #usr/share/doc/cargo #usr/share/doc/cargo/LICENSE-APACHE #usr/share/doc/cargo/LICENSE-MIT @@ -195,6 +102,7 @@ #usr/share/man/man1/cargo-rustdoc.1 #usr/share/man/man1/cargo-search.1 #usr/share/man/man1/cargo-test.1 +#usr/share/man/man1/cargo-tree.1 #usr/share/man/man1/cargo-uninstall.1 #usr/share/man/man1/cargo-update.1 #usr/share/man/man1/cargo-vendor.1 diff --git a/lfs/rust b/lfs/rust index 340117683..32b917ebb 100644 --- a/lfs/rust +++ b/lfs/rust @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-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 # @@ -24,7 +24,7 @@ include Config -VER = 1.39.0 +VER = 1.50.0 THISAPP = rust-$(VER) DL_FILE = $(THISAPP)-$(RUST_BOOTSTRAP).tar.gz @@ -52,10 +52,10 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(THISAPP)-x86_64-unknown-linux-gnu.tar.gz_MD5 = 33926ca331369ab20181ba1c91a5ee4a -$(THISAPP)-i686-unknown-linux-gnu.tar.gz_MD5 = 4932dd0b7631072a314ba5c1ef750318 -$(THISAPP)-aarch64-unknown-linux-gnu.tar.gz_MD5 = 18b29539aa705dd2404e5839fc7507c1 -$(THISAPP)-arm-unknown-linux-gnueabi.tar.gz_MD5 = d5f82cc615da78076d9fc15cc8f9aac0 +$(THISAPP)-x86_64-unknown-linux-gnu.tar.gz_MD5 = df740a74cd0887feaf36edc8b36f9b77 +$(THISAPP)-i686-unknown-linux-gnu.tar.gz_MD5 = 62a242568c0a4479c5f0050522fd44f8 +$(THISAPP)-aarch64-unknown-linux-gnu.tar.gz_MD5 = acda9f6336efd24d1d8949a2c470fb91 +$(THISAPP)-arm-unknown-linux-gnueabi.tar.gz_MD5 = fc073998405ea150f699cbf910ba9296 install : $(TARGET) -- 2.18.0

2 2

Wiki not working
by Adolf Belka (ipfire) 25 Feb '21

25 Feb '21

Hi All, For information the wiki is coming back with Error 500 oops, something went wrong Regards, Adolf. -- Sent from my laptop

1 0

Re: Suppress Feature
by Michael Tremer 24 Feb '21

24 Feb '21

Ah okay. IPFire currently does not provide that functionality over the UI. > On 24 Feb 2021, at 11:49, Reza Fathi <rezafathi20032003(a)yahoo.com> wrote: > > Hello, Michael, > > Yes i know the whitelist but if you see the link i provided you can suppress based on a single rule for any source or destination ip. But in whitelist if I add a host I won’t get any alert anymore. > > Regards, > Reza. > > On Feb 24, 2021, at 14:39, Michael Tremer <michael.tremer(a)ipfire.org> wrote: > > Hello Reza, > > IPFire has a whitelist feature where you can add hosts so that they won’t be blocked at all. > > Is it this what you are looking for? > > -Michael > >> On 23 Feb 2021, at 21:59, Reza Fathi <rezafathi20032003(a)yahoo.com> wrote: >> >> >> Dear madam/sir, >> >> As you might know there is a feature in pfsense called suppress list where you can add source or destination ip addresses along with a rule causing the alert to bypass it. But that is not available in ipfire. So is there any way so I can add suppress list on suricata by hand? Would you please add this feature in ipfire?. Thanks. >> >> https://pfsense-docs.readthedocs.io/en/latest/ids-ips/snort-suppress-list.h… >> >> >> Regards, >> Reza. > >

1 0

Suppress Feature
by Reza Fathi 24 Feb '21

24 Feb '21

Dear madam/sir, As you might know there is a feature in pfsense called suppress list where you can add source or destination ip addresses along with a rule causing the alert to bypass it. But that is not available in ipfire. So is there any way so I can add suppress list on suricata by hand? Would you please add this feature in ipfire?. Thanks. https://pfsense-docs.readthedocs.io/en/latest/ids-ips/snort-suppress-list.h… Regards, Reza.

2 1

[PATCH] Makefile.am: Do not specify CC and LD when building perl module.
by Stefan Schantl 23 Feb '21

23 Feb '21

Specifing the CC and LD flags is not required because perl MakeMaker takes care of this. Fixes #12574. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 52a4722..8da1f1b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -230,7 +230,7 @@ build-perl: cd $(builddir)/src/perl && $(PERL) Makefile.PL INSTALLDIRS=vendor \ INC="-I$(abs_srcdir)/src" LIBS="-L$(abs_builddir)/src/.libs -lloc" - cd $(builddir)/src/perl && $(MAKE) CC="$(CC)" LD="$(LD)" LD_RUN_PATH= + cd $(builddir)/src/perl && $(MAKE) LD_RUN_PATH="" .PHONY: check-perl check-perl: testdata.db -- 2.20.1

1 0

[PATCH v2 1/6] zoneconf.cgi: Change NIC display order, improve code
by Leo-Andres Hofmann 22 Feb '21

22 Feb '21

Refactor duplicate perl code and add comments Signed-off-by: Leo-Andres Hofmann <hofmann(a)leo-andres.de> --- html/cgi-bin/zoneconf.cgi | 53 +++++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 19 deletions(-) diff --git a/html/cgi-bin/zoneconf.cgi b/html/cgi-bin/zoneconf.cgi index 0914ceb78..bf46ab0c7 100644 --- a/html/cgi-bin/zoneconf.cgi +++ b/html/cgi-bin/zoneconf.cgi @@ -26,6 +26,7 @@ require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl"; +###--- HTML HEAD ---### my $extraHead = <<END <style> table#zoneconf { @@ -105,7 +106,9 @@ my $extraHead = <<END <script src="/include/zoneconf.js"></script> END ; +###--- END HTML HEAD ---### +### Read configuration ### my %ethsettings = (); my %vlansettings = (); my %cgiparams = (); @@ -119,7 +122,7 @@ my $restart_notice = ""; &Header::showhttpheaders(); # Define all zones we will check for NIC assignment -my @zones = ("green", "red", "orange", "blue"); +my @zones = ("red", "green", "orange", "blue"); # Get all physical NICs present opendir(my $dh, "/sys/class/net/"); @@ -153,6 +156,21 @@ foreach (@nics) { } } +### Functions ### + +# Check if a zone is in IP mode or in PPP, PPPoE, VDSL, ... mode +sub is_zonetype_ip { + my $zone_type = shift; + return ($zone_type eq "STATIC" || $zone_type eq "DHCP"); +} + +# Check if a zone is activated (device assigned) +sub is_zone_activated { + my $zone = uc shift; + return ($ethsettings{"${zone}_DEV"} ne ""); +} + +### START PAGE ### &Header::openpage($Lang::tr{"zoneconf title"}, 1, $extraHead); &Header::openbigbox('100%', 'center'); @@ -195,6 +213,7 @@ if ($cgiparams{"ACTION"} eq $Lang::tr{"save"}) { } } + # skip NIC/VLAN assignment and additional zone options for RED in PPP mode next; } @@ -278,6 +297,7 @@ if ($cgiparams{"ACTION"} eq $Lang::tr{"save"}) { } } + # validation failed, show error message and exit if ($VALIDATE_error) { &Header::openbox('100%', 'left', $Lang::tr{"error"}); @@ -290,16 +310,17 @@ if ($cgiparams{"ACTION"} eq $Lang::tr{"save"}) { exit 0; } + # new settings are valid, write configuration files &General::writehash("${General::swroot}/ethernet/settings",\%ethsettings); &General::writehash("${General::swroot}/ethernet/vlans",\%vlansettings); $restart_notice = $Lang::tr{'zoneconf notice reboot'}; } -&Header::openbox('100%', 'left', $Lang::tr{"zoneconf nic assignment"}); - ### START OF TABLE ### +&Header::openbox('100%', 'left', $Lang::tr{"zoneconf nic assignment"}); + print <<END <form method='post' enctype='multipart/form-data'> <table id="zoneconf"> @@ -311,19 +332,16 @@ END # Fill the table header with all activated zones foreach (@zones) { my $uc = uc $_; - my $dev_name = $ethsettings{"${uc}_DEV"}; - if ($dev_name eq "") { # If the zone is not activated, don't show it - next; - } + # If the zone is not activated, don't show it + next unless is_zone_activated($_); - # If the zone is in PPP mode, don't show a mode dropdown + # If the red zone is in PPP mode, don't show a mode dropdown if ($uc eq "RED") { my $red_type = $ethsettings{"RED_TYPE"}; - my $red_restricted = ($uc eq "RED" && ! ($red_type eq "STATIC" || $red_type eq "DHCP")); - if ($red_restricted) { - print "\t\t<td class='heading $_'>$uc ($red_type)</td>\n"; + unless (is_zonetype_ip($red_type)) { + print "\t\t<td class='heading bold $_'>$uc ($red_type)</td>\n"; next; # We're done here } @@ -354,6 +372,7 @@ END print "\t</tr>\n"; +# NIC assignment matrix foreach (@nics) { my $mac = $_->[0]; my $nic = $_->[1]; @@ -365,19 +384,14 @@ foreach (@nics) { # Iterate through all zones and check if the current NIC is assigned to it foreach (@zones) { my $uc = uc $_; - my $dev_name = $ethsettings{"${uc}_DEV"}; my $highlight = ""; - if ($dev_name eq "") { # Again, skip the zone if it is not activated - next; - } + # If the zone is not activated, don't show it + next unless is_zone_activated($_); if ($uc eq "RED") { - my $red_type = $ethsettings{"RED_TYPE"}; - my $red_restricted = ($uc eq "RED" && ! ($red_type eq "STATIC" || $red_type eq "DHCP")); - # VLANs/Bridging is not possible if the RED interface is set to PPP, PPPoE, VDSL, ... - if ($red_restricted) { + unless (is_zonetype_ip($ethsettings{"RED_TYPE"})) { my $checked = ""; if ($mac eq $ethsettings{"${uc}_MACADDR"}) { @@ -449,6 +463,7 @@ END print "\t</tr>\n"; } +# footer and submit button print <<END </table> -- 2.27.0.windows.1

6 19

[PATCH] Makefile.am: Do not provide PREFIX value for perl build.
by Stefan Schantl 22 Feb '21

22 Feb '21

This caused to gain the following error when building: Only one of PREFIX or INSTALL_BASE can be given. Not both. Using INSTALLDIRS=vendor is the common way to get the modules installed into the right directories. Fixes #12573. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index dc594f8..52a4722 100644 --- a/Makefile.am +++ b/Makefile.am @@ -228,7 +228,7 @@ build-perl: @test -e $(builddir)/src/perl/t/Location.t || ln -s --relative $(srcdir)/src/perl/t/Location.t $(builddir)/src/perl/t/ @test -e $(builddir)/src/perl/typemap || ln -s --relative $(srcdir)/src/perl/typemap $(builddir)/src/perl/ - cd $(builddir)/src/perl && $(PERL) Makefile.PL PREFIX="$(prefix)" \ + cd $(builddir)/src/perl && $(PERL) Makefile.PL INSTALLDIRS=vendor \ INC="-I$(abs_srcdir)/src" LIBS="-L$(abs_builddir)/src/.libs -lloc" cd $(builddir)/src/perl && $(MAKE) CC="$(CC)" LD="$(LD)" LD_RUN_PATH= -- 2.20.1

1 0

[PATCH] Add Spanish translations for Captive Portal
by Adolf Belka 22 Feb '21

22 Feb '21

- Spanish translations for Captive Portal provided by Roberto Peña - Ran ./make lang before adding translations and git status was clear - Ran ./make lang after adding translations and git status included also doc/language_issues.pl although I did not change anything for Polish and it was clear before making any changes Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- doc/language_issues.es | 54 +++++++++++++++++------------------------- doc/language_issues.pl | 54 +++++++++++++++++------------------------- doc/language_missings | 54 ------------------------------------------ langs/es/cgi-bin/es.pl | 54 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 98 insertions(+), 118 deletions(-) diff --git a/doc/language_issues.es b/doc/language_issues.es index 82d65d99c..a54428362 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -1,3 +1,25 @@ +WARNING: translation string unused: Captive 1day +WARNING: translation string unused: Captive 1month +WARNING: translation string unused: Captive 1week +WARNING: translation string unused: Captive activate +WARNING: translation string unused: Captive auth_lic +WARNING: translation string unused: Captive auth_vou +WARNING: translation string unused: Captive err doublevoucher +WARNING: translation string unused: Captive expire +WARNING: translation string unused: Captive heading terms +WARNING: translation string unused: Captive heading voucher +WARNING: translation string unused: Captive invalid coupon +WARNING: translation string unused: Captive invalid logosize +WARNING: translation string unused: Captive invalid_voucher +WARNING: translation string unused: Captive ip +WARNING: translation string unused: Captive logo_set +WARNING: translation string unused: Captive noexpiretime +WARNING: translation string unused: Captive nr +WARNING: translation string unused: Captive please enter a coupon code +WARNING: translation string unused: Captive time +WARNING: translation string unused: Captive voactive +WARNING: translation string unused: Captive voucher +WARNING: translation string unused: Captive vout WARNING: translation string unused: Client status and controlc WARNING: translation string unused: ConnSched scheduler WARNING: translation string unused: ConnSched select profile @@ -752,40 +774,8 @@ WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: 24 hours = 24 Hours -WARNING: untranslated string: Captive = Captive Portal WARNING: untranslated string: Captive ACTIVATE = unknown string -WARNING: untranslated string: Captive GAIN ACCESS = GAIN ACCESS -WARNING: untranslated string: Captive WiFi coupon = WiFi Coupon -WARNING: untranslated string: Captive activated = Activated -WARNING: untranslated string: Captive active on = Activated on -WARNING: untranslated string: Captive agree tac = I agree with the terms & conditions below. -WARNING: untranslated string: Captive authentication = Type of Access -WARNING: untranslated string: Captive brand color = Brand Color -WARNING: untranslated string: Captive branding = Branding -WARNING: untranslated string: Captive client session expiry time = Session Expiry Time WARNING: untranslated string: Captive clients = unknown string -WARNING: untranslated string: Captive config = Settings -WARNING: untranslated string: Captive coupon = Coupon -WARNING: untranslated string: Captive delete logo = Delete Logo -WARNING: untranslated string: Captive expiry time = Expiry Time -WARNING: untranslated string: Captive export coupons = Export Coupons -WARNING: untranslated string: Captive generate coupons = Generate Coupons -WARNING: untranslated string: Captive generated coupon no = Number of coupons -WARNING: untranslated string: Captive issued coupons = Issued Coupons -WARNING: untranslated string: Captive logo uploaded = Logo uploaded -WARNING: untranslated string: Captive mac = MAC Address -WARNING: untranslated string: Captive nolimit = unlimited -WARNING: untranslated string: Captive please accept the terms and conditions = Please accept the terms & conditions -WARNING: untranslated string: Captive portal = IPFire Captive Portal -WARNING: untranslated string: Captive portal coupons = Captive Portal Coupons -WARNING: untranslated string: Captive terms = Terms & Conditions -WARNING: untranslated string: Captive terms short = T&Cs -WARNING: untranslated string: Captive title = Title of Login Page -WARNING: untranslated string: Captive upload logo = Upload Logo -WARNING: untranslated string: Captive upload logo recommendations = (PNG or JPEG, recommended 1280x720 pixels) -WARNING: untranslated string: Captive valid for = Valid for -WARNING: untranslated string: Captive vouchervalid = Allowed time for this coupon -WARNING: untranslated string: Captive wrong ext = Uploaded file has wrong filetype WARNING: untranslated string: ConnSched dial = Connect WARNING: untranslated string: ConnSched hangup = Disconnect WARNING: untranslated string: ConnSched reboot = Reboot diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 82d65d99c..a54428362 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -1,3 +1,25 @@ +WARNING: translation string unused: Captive 1day +WARNING: translation string unused: Captive 1month +WARNING: translation string unused: Captive 1week +WARNING: translation string unused: Captive activate +WARNING: translation string unused: Captive auth_lic +WARNING: translation string unused: Captive auth_vou +WARNING: translation string unused: Captive err doublevoucher +WARNING: translation string unused: Captive expire +WARNING: translation string unused: Captive heading terms +WARNING: translation string unused: Captive heading voucher +WARNING: translation string unused: Captive invalid coupon +WARNING: translation string unused: Captive invalid logosize +WARNING: translation string unused: Captive invalid_voucher +WARNING: translation string unused: Captive ip +WARNING: translation string unused: Captive logo_set +WARNING: translation string unused: Captive noexpiretime +WARNING: translation string unused: Captive nr +WARNING: translation string unused: Captive please enter a coupon code +WARNING: translation string unused: Captive time +WARNING: translation string unused: Captive voactive +WARNING: translation string unused: Captive voucher +WARNING: translation string unused: Captive vout WARNING: translation string unused: Client status and controlc WARNING: translation string unused: ConnSched scheduler WARNING: translation string unused: ConnSched select profile @@ -752,40 +774,8 @@ WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: 24 hours = 24 Hours -WARNING: untranslated string: Captive = Captive Portal WARNING: untranslated string: Captive ACTIVATE = unknown string -WARNING: untranslated string: Captive GAIN ACCESS = GAIN ACCESS -WARNING: untranslated string: Captive WiFi coupon = WiFi Coupon -WARNING: untranslated string: Captive activated = Activated -WARNING: untranslated string: Captive active on = Activated on -WARNING: untranslated string: Captive agree tac = I agree with the terms & conditions below. -WARNING: untranslated string: Captive authentication = Type of Access -WARNING: untranslated string: Captive brand color = Brand Color -WARNING: untranslated string: Captive branding = Branding -WARNING: untranslated string: Captive client session expiry time = Session Expiry Time WARNING: untranslated string: Captive clients = unknown string -WARNING: untranslated string: Captive config = Settings -WARNING: untranslated string: Captive coupon = Coupon -WARNING: untranslated string: Captive delete logo = Delete Logo -WARNING: untranslated string: Captive expiry time = Expiry Time -WARNING: untranslated string: Captive export coupons = Export Coupons -WARNING: untranslated string: Captive generate coupons = Generate Coupons -WARNING: untranslated string: Captive generated coupon no = Number of coupons -WARNING: untranslated string: Captive issued coupons = Issued Coupons -WARNING: untranslated string: Captive logo uploaded = Logo uploaded -WARNING: untranslated string: Captive mac = MAC Address -WARNING: untranslated string: Captive nolimit = unlimited -WARNING: untranslated string: Captive please accept the terms and conditions = Please accept the terms & conditions -WARNING: untranslated string: Captive portal = IPFire Captive Portal -WARNING: untranslated string: Captive portal coupons = Captive Portal Coupons -WARNING: untranslated string: Captive terms = Terms & Conditions -WARNING: untranslated string: Captive terms short = T&Cs -WARNING: untranslated string: Captive title = Title of Login Page -WARNING: untranslated string: Captive upload logo = Upload Logo -WARNING: untranslated string: Captive upload logo recommendations = (PNG or JPEG, recommended 1280x720 pixels) -WARNING: untranslated string: Captive valid for = Valid for -WARNING: untranslated string: Captive vouchervalid = Allowed time for this coupon -WARNING: untranslated string: Captive wrong ext = Uploaded file has wrong filetype WARNING: untranslated string: ConnSched dial = Connect WARNING: untranslated string: ConnSched hangup = Disconnect WARNING: untranslated string: ConnSched reboot = Reboot diff --git a/doc/language_missings b/doc/language_missings index 0d89426ca..f42be2e77 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -108,60 +108,6 @@ < block < broken < capabilities -< Captive -< Captive 1day -< Captive 1month -< Captive 1week -< Captive activate -< Captive activated -< Captive active on -< Captive agree tac -< Captive authentication -< Captive auth_lic -< Captive auth_vou -< Captive brand color -< Captive branding -< Captive client session expiry time -< Captive config -< Captive coupon -< Captive delete logo -< Captive err doublevoucher -< Captive expire -< Captive expiry time -< Captive export coupons -< Captive GAIN ACCESS -< Captive generate coupons -< Captive generated coupon no -< Captive heading terms -< Captive heading voucher -< Captive invalid coupon -< Captive invalid logosize -< Captive invalid_voucher -< Captive ip -< Captive issued coupons -< Captive logo_set -< Captive logo uploaded -< Captive mac -< Captive noexpiretime -< Captive nolimit -< Captive nr -< Captive please accept the terms and conditions -< Captive please enter a coupon code -< Captive portal -< Captive portal coupons -< Captive terms -< Captive terms short -< Captive time -< Captive title -< Captive upload logo -< Captive upload logo recommendations -< Captive valid for -< Captive voactive -< Captive voucher -< Captive vouchervalid -< Captive vout -< Captive WiFi coupon -< Captive wrong ext < ccd add < ccd choose net < ccd clientip diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index 9a39ffd16..ad6a228d8 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -6,6 +6,60 @@ 'Add Port Rule' => 'Añadir Regla de Puerto', 'Add Rule' => 'Añadir Regla', 'Add a route' => 'Añadir una route', +'Captive' => 'Portal Cautivo', +'Captive 1day' => '1 día', +'Captive 1month' => '1 mes', +'Captive 1week' => '1 semana', +'Captive GAIN ACCESS' => 'ACCEDER', +'Captive WiFi coupon' => 'WiFi Cupón', +'Captive activate' => 'Activar', +'Captive activated' => 'Activado', +'Captive active on' => 'Activado en', +'Captive agree tac' => 'Estoy de acuerdo con los términos y condiciones de a continuación.', +'Captive auth_lic' => 'Licencia', +'Captive auth_vou' => 'Cupón', +'Captive authentication' => 'Tipo de Acceso', +'Captive brand color' => 'Color de Marca', +'Captive branding' => 'Marca', +'Captive client session expiry time' => 'Caducidad de la Sesión', +'Captive config' => 'Ajustes', +'Captive coupon' => 'Cupón', +'Captive delete logo' => 'Borrar Logo', +'Captive err doublevoucher' => 'Ya existe un cupón con este código', +'Captive expire' => 'Caducar', +'Captive expiry time' => 'Tiempo de caducidad', +'Captive export coupons' => 'Exportar Cupones', +'Captive generate coupons' => 'Generar Cupones', +'Captive generated coupon no' => 'Numero de cupones', +'Captive heading terms' => 'Términos & Condiciones', +'Captive heading voucher' => 'Cupón or Código de Acceso', +'Captive invalid coupon' => 'Ingresó un código de cupón no válido. Inténtalo de nuevo.', +'Captive invalid logosize' => 'El archivo de imagen cargado no cumple con la resolución requerida de al menos 1280x400 pero no mayor de 1920x800 píxeles', +'Captive invalid_voucher' => 'Código inválido. Por favor, inténtalo de nuevo', +'Captive ip' => 'Dirección IP', +'Captive issued coupons' => 'Cupones emitidos', +'Captive logo uploaded' => 'Logo subido', +'Captive logo_set' => 'Logo actual', +'Captive mac' => 'Dirección MAC', +'Captive noexpiretime' => 'No se ha proporcionado un intervalo de tiempo de conexión válido', +'Captive nolimit' => 'ilimitado', +'Captive nr' => 'Número', +'Captive please accept the terms and conditions' => 'Por favor, acepte los términos & condiciones', +'Captive please enter a coupon code' => 'Por favor, introduzca el código de cupón', +'Captive portal' => 'Portal Cautivo Business Secure', +'Captive portal coupons' => 'Cupones del Portal Cautivo', +'Captive terms' => 'Términos & Condiciones', +'Captive terms short' => 'T&Cs', +'Captive time' => 'Tiempo de acceso posterior a la activación (horas)', +'Captive title' => 'Título de la página de inicio de sesión', +'Captive upload logo' => 'Logo subido', +'Captive upload logo recommendations' => '(PNG o JPEG, 1280x720 pixels recomendados)', +'Captive valid for' => 'Válido para', +'Captive voactive' => 'Cupones activos', +'Captive voucher' => 'Cupón', +'Captive vouchervalid' => 'Tiempo permitido para este cupón', +'Captive vout' => 'Cupones emitidos', +'Captive wrong ext' => 'El archivo subido tiene un tipo de archivo incorrecto', 'Choose Rule' => 'Seleccione <u>una</u> de las siguientes reglas.', 'Class' => 'Clase', 'Class was deleted' => 'con subclases potenciales fué eliminado', -- 2.30.1

3 2

[PATCH] bug#10629: Prevent dynamic and fixed leases overlapping
by Adolf Belka 21 Feb '21

21 Feb '21

- This is a fix for bug #10629 - I have tested this out on my vm testbed system. Everything worked fine with this. It would be good to get other test feedback in case I have missed something. - This fix flags up if a fixed lease is created within the existing dynamic range - This fix also works if a dynamic lease is converted to a fixed lease. A new IP outside the dynamic range has to be selected. - A check has also been added if the dynamic range is modified to overlap any existing fixed leases. The error message will also inform how many fixed leases are now overlapped by the modified dynamic range. - If an interface is disabled and fixed leases within the dynamic range created or the dynamic range expanded to overlap with existing fixed leases, then when the interface is enabled again the check is carried out and catches these and prevents them being set. - New error messages added to en.pl file Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/cfgroot/general-functions.pl | 18 ++++++++++++ doc/language_issues.de | 2 ++ doc/language_issues.en | 2 ++ doc/language_issues.es | 2 ++ doc/language_issues.fr | 2 ++ doc/language_issues.it | 2 ++ doc/language_issues.nl | 2 ++ doc/language_issues.pl | 2 ++ doc/language_issues.ru | 2 ++ doc/language_issues.tr | 2 ++ doc/language_missings | 24 ++++++++++++++++ html/cgi-bin/dhcp.cgi | 43 +++++++++++++++++++++++++++++ langs/en/cgi-bin/en.pl | 3 ++ 13 files changed, 106 insertions(+) diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index a6656ccf5..a8c8d171c 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -591,6 +591,24 @@ sub check_net_internal_exact{ if (($ownnet{'RED_NETADDRESS'} ne '' && $ownnet{'RED_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'RED_NETADDRESS'}/$ownnet{'RED_NETMASK'}", $network)){ $errormessage=$Lang::tr{'ccd err red'};return $errormessage;} } +sub ip_address_in_ip_range($$) { +# Returns True if $ipaddress is within $ipstart and $ipend range. + my $ipaddress = shift; + my $ipstart = shift; + my $ipend = shift; + + my $ipaddress_bin = &Network::ip2bin($ipaddress); + return undef unless (defined $ipaddress_bin); + + my $ipstart_bin = &Network::ip2bin($ipstart); + return undef unless (defined $ipstart_bin); + + my $ipend_bin = &Network::ip2bin($ipend); + return undef unless (defined $ipend_bin); + + return (($ipaddress_bin >= $ipstart_bin) && ($ipaddress_bin <= $ipend_bin)); +} + sub validport { $_ = $_[0]; diff --git a/doc/language_issues.de b/doc/language_issues.de index 5d079036a..cb3e89b2e 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -840,6 +840,8 @@ WARNING: translation string unused: zoneconf val vlan amount assignment error WARNING: translation string unused: zoneconf val vlan tag assignment error WARNING: translation string unused: zoneconf val zoneslave amount error WARNING: untranslated string: desired = Desired +WARNING: untranslated string: dhcp dynamic range overlap = Dynamic range overlapped with +WARNING: untranslated string: dhcp fixed ip address = Fixed IP Address(es) WARNING: untranslated string: disable = Disable WARNING: untranslated string: enable = Enable WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date! diff --git a/doc/language_issues.en b/doc/language_issues.en index 6e30eb995..832ff8d92 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -582,6 +582,8 @@ WARNING: untranslated string: dhcp dns key name = Key Name WARNING: untranslated string: dhcp dns update = DNS Update WARNING: untranslated string: dhcp dns update algo = Algorithm WARNING: untranslated string: dhcp dns update secret = Secret +WARNING: untranslated string: dhcp dynamic range overlap = Dynamic range overlapped with +WARNING: untranslated string: dhcp fixed ip address = Fixed IP Address(es) WARNING: untranslated string: dhcp server = DHCP Server WARNING: untranslated string: dhcp server disabled = DHCP server disabled. Stopped. WARNING: untranslated string: dhcp server enabled = DHCP server enabled. Restarting. diff --git a/doc/language_issues.es b/doc/language_issues.es index 82d65d99c..b65ecd164 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -893,6 +893,8 @@ WARNING: untranslated string: dhcp dns key name = Key Name WARNING: untranslated string: dhcp dns update = DNS Update WARNING: untranslated string: dhcp dns update algo = Algorithm WARNING: untranslated string: dhcp dns update secret = Secret +WARNING: untranslated string: dhcp dynamic range overlap = Dynamic range overlapped with +WARNING: untranslated string: dhcp fixed ip address = Fixed IP Address(es) WARNING: untranslated string: dhcp valid range required when deny known clients checked = Valid range required when "Deny known clients:" is checked WARNING: untranslated string: disable = Disable WARNING: untranslated string: disconnected = Disconnected diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 942be73ec..71de90bd7 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -880,6 +880,8 @@ WARNING: translation string unused: zoneconf val vlan amount assignment error WARNING: translation string unused: zoneconf val vlan tag assignment error WARNING: translation string unused: zoneconf val zoneslave amount error WARNING: untranslated string: dhcp deny known clients: = Deny known clients: +WARNING: untranslated string: dhcp dynamic range overlap = Dynamic range overlapped with +WARNING: untranslated string: dhcp fixed ip address = Fixed IP Address(es) WARNING: untranslated string: dhcp valid range required when deny known clients checked = Valid range required when "Deny known clients:" is checked WARNING: untranslated string: fwhost cust locationgrp = unknown string WARNING: untranslated string: fwhost err hostip = unknown string diff --git a/doc/language_issues.it b/doc/language_issues.it index 98074e59f..a4cd8c5db 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -917,6 +917,8 @@ WARNING: untranslated string: dhcp dns key name = Key Name WARNING: untranslated string: dhcp dns update = DNS Update WARNING: untranslated string: dhcp dns update algo = Algorithm WARNING: untranslated string: dhcp dns update secret = Secret +WARNING: untranslated string: dhcp dynamic range overlap = Dynamic range overlapped with +WARNING: untranslated string: dhcp fixed ip address = Fixed IP Address(es) WARNING: untranslated string: dhcp valid range required when deny known clients checked = Valid range required when "Deny known clients:" is checked WARNING: untranslated string: disable = Disable WARNING: untranslated string: disconnected = Disconnected diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 8eebbd57f..9cef4790e 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -918,6 +918,8 @@ WARNING: untranslated string: dhcp dns key name = Key Name WARNING: untranslated string: dhcp dns update = DNS Update WARNING: untranslated string: dhcp dns update algo = Algorithm WARNING: untranslated string: dhcp dns update secret = Secret +WARNING: untranslated string: dhcp dynamic range overlap = Dynamic range overlapped with +WARNING: untranslated string: dhcp fixed ip address = Fixed IP Address(es) WARNING: untranslated string: disable = Disable WARNING: untranslated string: disconnected = Disconnected WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip) diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 82d65d99c..b65ecd164 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -893,6 +893,8 @@ WARNING: untranslated string: dhcp dns key name = Key Name WARNING: untranslated string: dhcp dns update = DNS Update WARNING: untranslated string: dhcp dns update algo = Algorithm WARNING: untranslated string: dhcp dns update secret = Secret +WARNING: untranslated string: dhcp dynamic range overlap = Dynamic range overlapped with +WARNING: untranslated string: dhcp fixed ip address = Fixed IP Address(es) WARNING: untranslated string: dhcp valid range required when deny known clients checked = Valid range required when "Deny known clients:" is checked WARNING: untranslated string: disable = Disable WARNING: untranslated string: disconnected = Disconnected diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 43c1f8c08..76fd6b350 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -895,6 +895,8 @@ WARNING: untranslated string: dhcp dns key name = Key Name WARNING: untranslated string: dhcp dns update = DNS Update WARNING: untranslated string: dhcp dns update algo = Algorithm WARNING: untranslated string: dhcp dns update secret = Secret +WARNING: untranslated string: dhcp dynamic range overlap = Dynamic range overlapped with +WARNING: untranslated string: dhcp fixed ip address = Fixed IP Address(es) WARNING: untranslated string: dhcp valid range required when deny known clients checked = Valid range required when "Deny known clients:" is checked WARNING: untranslated string: disable = Disable WARNING: untranslated string: disconnected = Disconnected diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 439a58890..bd78a5a4e 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -896,6 +896,8 @@ WARNING: untranslated string: dangerous = Dangerous WARNING: untranslated string: default IP address = Default IP Address WARNING: untranslated string: desired = Desired WARNING: untranslated string: dhcp deny known clients: = Deny known clients: +WARNING: untranslated string: dhcp dynamic range overlap = Dynamic range overlapped with +WARNING: untranslated string: dhcp fixed ip address = Fixed IP Address(es) WARNING: untranslated string: dhcp valid range required when deny known clients checked = Valid range required when "Deny known clients:" is checked WARNING: untranslated string: disable = Disable WARNING: untranslated string: disconnected = Disconnected diff --git a/doc/language_missings b/doc/language_missings index 0d89426ca..3d6c5103d 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -28,6 +28,9 @@ < could not connect to www ipfire org < cryptographic settings < desired +< dhcp dynamic range overlap +< dhcp fixed ip address +< dhcp fixed ip address in dynamic range < dhcp server disabled on blue interface < dhcp server enabled on blue interface < dh name is invalid @@ -230,6 +233,9 @@ < dhcp dns update < dhcp dns update algo < dhcp dns update secret +< dhcp dynamic range overlap +< dhcp fixed ip address +< dhcp fixed ip address in dynamic range < dhcp valid range required when deny known clients checked < dh key move failed < dh key warn @@ -969,6 +975,9 @@ < bewan adsl pci st < bewan adsl usb < dhcp deny known clients: +< dhcp dynamic range overlap +< dhcp fixed ip address +< dhcp fixed ip address in dynamic range < dhcp valid range required when deny known clients checked < g.dtm < g.lite @@ -1071,6 +1080,9 @@ < dhcp dns update < dhcp dns update algo < dhcp dns update secret +< dhcp dynamic range overlap +< dhcp fixed ip address +< dhcp fixed ip address in dynamic range < dhcp valid range required when deny known clients checked < disable < Disabled @@ -1460,6 +1472,9 @@ < dhcp dns update < dhcp dns update algo < dhcp dns update secret +< dhcp dynamic range overlap +< dhcp fixed ip address +< dhcp fixed ip address in dynamic range < dh key move failed < dh key warn < dh key warn1 @@ -1965,6 +1980,9 @@ < dhcp dns update < dhcp dns update algo < dhcp dns update secret +< dhcp dynamic range overlap +< dhcp fixed ip address +< dhcp fixed ip address in dynamic range < dhcp valid range required when deny known clients checked < dh key move failed < dh key warn @@ -2848,6 +2866,9 @@ < dhcp dns update < dhcp dns update algo < dhcp dns update secret +< dhcp dynamic range overlap +< dhcp fixed ip address +< dhcp fixed ip address in dynamic range < dhcp valid range required when deny known clients checked < dh key move failed < dh key warn @@ -3595,6 +3616,9 @@ < default IP address < desired < dhcp deny known clients: +< dhcp dynamic range overlap +< dhcp fixed ip address +< dhcp fixed ip address in dynamic range < dhcp valid range required when deny known clients checked < disable < Disabled diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi index 867614f2a..82ea754c7 100644 --- a/html/cgi-bin/dhcp.cgi +++ b/html/cgi-bin/dhcp.cgi @@ -130,6 +130,7 @@ open(FILE, "$filename2") or die 'Unable to open fixed leases file.'; our @current2 = <FILE>; close(FILE); + # Check Settings1 first because they are needed by &buildconf if ($dhcpsettings{'ACTION'} eq $Lang::tr{'save'}) { foreach my $itf (@ITFs) { @@ -183,6 +184,24 @@ if ($dhcpsettings{'ACTION'} eq $Lang::tr{'save'}) { } } + # Check if dynamic range and Fixed IP Addresses overlap + if ((!$dhcpsettings{"START_ADDR_${itf}"}) eq '' && (!$dhcpsettings{"END_ADDR_${itf}"}) eq '') { + my $count=0; + foreach my $line (@current2) { + chomp($line); + my @temp = split(/\,/,$line); + if (&General::ip_address_in_ip_range($temp[1], + $dhcpsettings{"START_ADDR_${itf}"}, + $dhcpsettings{"END_ADDR_${itf}"})) { + $count++; + } + } + if ($count > 0) { + $errormessage = "DHCP on ${itf}: " . $Lang::tr{'dhcp dynamic range overlap'} . $count . $Lang::tr{'dhcp fixed ip address'}; + goto ERROR; + } + } + if (!($dhcpsettings{"DEFAULT_LEASE_TIME_${itf}"} =~ /^\d+$/)) { $errormessage = "DHCP on ${itf}: " . $Lang::tr{'invalid default lease time'} . $dhcpsettings{'DEFAULT_LEASE_TIME_${itf}'}; goto ERROR; @@ -415,10 +434,34 @@ if ($dhcpsettings{'ACTION'} eq $Lang::tr{'toggle enable disable'}.'2') { if ($dhcpsettings{'ACTION'} eq $Lang::tr{'add'}.'2') { $dhcpsettings{'FIX_MAC'} =~ tr/-/:/; unless(&General::validip($dhcpsettings{'FIX_ADDR'})) { $errormessage = $Lang::tr{'invalid fixed ip address'}; } +# Check if fixed address is in the dynamic range, if defined + foreach my $itf (@ITFs) { + if ($dhcpsettings{"ENABLE_${itf}"} eq 'on' ) { + if ($dhcpsettings{"START_ADDR_${itf}"}) { + if (&General::ip_address_in_ip_range($dhcpsettings{'FIX_ADDR'}, + $dhcpsettings{"START_ADDR_${itf}"}, + $dhcpsettings{"END_ADDR_${itf}"})) { + $errormessage = $Lang::tr{"dhcp fixed ip address in dynamic range"}; + } + } + } + } unless(&General::validmac($dhcpsettings{'FIX_MAC'})) { $errormessage = $Lang::tr{'invalid fixed mac address'}; } if ($dhcpsettings{'FIX_NEXTADDR'}) { unless(&General::validip($dhcpsettings{'FIX_NEXTADDR'})) { $errormessage = $Lang::tr{'invalid fixed ip address'}; } } +# Check if fixed next address is in the dynamic range, if defined + foreach my $itf (@ITFs) { + if ($dhcpsettings{"ENABLE_${itf}"} eq 'on' ) { + if ($dhcpsettings{"START_ADDR_${itf}"}) { + if (&General::ip_address_in_ip_range($dhcpsettings{'FIX_NEXTADDR'}, + $dhcpsettings{"START_ADDR_${itf}"}, + $dhcpsettings{"END_ADDR_${itf}"})) { + $errormessage = $Lang::tr{"dhcp fixed ip address in dynamic range"}; + } + } + } + } my $key = 0; CHECK:foreach my $line (@current2) { diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 95a1cfda4..0dbdf7bd5 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -806,6 +806,9 @@ 'dhcp dns update' => 'DNS Update', 'dhcp dns update algo' => 'Algorithm', 'dhcp dns update secret' => 'Secret', +'dhcp dynamic range overlap' => 'Dynamic range overlapped with ', +'dhcp fixed ip address' => ' Fixed IP Address(es)', +'dhcp fixed ip address in dynamic range' => 'Fixed IP Address in dynamic range is not allowed', 'dhcp fixed lease err1' => 'For a fix lease you have to enter the MAC address or the hostname, or you enter both.', 'dhcp fixed lease help1' => 'IP Addresses might be entered as FQDN', 'dhcp mode' => 'DHCP', -- 2.30.1

6 17

[PATCH] libxcrypt 4.4.17: Fix for rootfile
by Matthias Fischer 20 Feb '21

20 Feb '21

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/common/libxcrypt | 1 + 1 file changed, 1 insertion(+) diff --git a/config/rootfiles/common/libxcrypt b/config/rootfiles/common/libxcrypt index c866c2ddb..1cbb05816 100644 --- a/config/rootfiles/common/libxcrypt +++ b/config/rootfiles/common/libxcrypt @@ -9,6 +9,7 @@ usr/lib/libcrypt.so.1.1.0 #usr/lib/libxcrypt.so #usr/lib/pkgconfig/libcrypt.pc #usr/lib/pkgconfig/libxcrypt.pc +#usr/share/man/man3/crypt.3 #usr/share/man/man3/crypt_checksalt.3 #usr/share/man/man3/crypt_gensalt.3 #usr/share/man/man3/crypt_gensalt_ra.3 -- 2.18.0

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development February 2021