IPFire-SCM March 2021

ipfire-scm@lists.ipfire.org

1 participants
32 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. ec77442f18154b589b0256d736e2dd1aa3f363b2
by Michael Tremer 31 Mar '21

31 Mar '21

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via ec77442f18154b589b0256d736e2dd1aa3f363b2 (commit) via e1176c3be6e2e6b5fb1fce0bda578620278827cc (commit) via ac41c814a8f046d875573fdb79b588f0121cb242 (commit) from 7f52b94f2db141e197d7e2113aa93bce6dfde72e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ec77442f18154b589b0256d736e2dd1aa3f363b2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Mar 31 16:00:00 2021 +0000 libloc: Update to 0.9.6 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e1176c3be6e2e6b5fb1fce0bda578620278827cc Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Mar 31 12:12:05 2021 +0000 core156: Ship strongswan Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ac41c814a8f046d875573fdb79b588f0121cb242 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Tue Mar 30 21:14:27 2021 +0200 strongSwan: update to 5.9.2 This versions' changelog can be retrieved from https://wiki.strongswan.org/versions/80. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: .../{oldcore/148 => core/156}/filelists/libloc | 0 .../{oldcore/106 => core/156}/filelists/strongswan | 0 config/rootfiles/core/156/update.sh | 3 +++ lfs/libloc | 11 ++++----- lfs/strongswan | 6 ++--- ...oc-0.9.5-location-Fix-list-networks-by-as.patch | 27 ---------------------- 6 files changed, 10 insertions(+), 37 deletions(-) copy config/rootfiles/{oldcore/148 => core/156}/filelists/libloc (100%) copy config/rootfiles/{oldcore/106 => core/156}/filelists/strongswan (100%) delete mode 100644 src/patches/libloc-0.9.5-location-Fix-list-networks-by-as.patch Difference in files: diff --git a/config/rootfiles/core/156/filelists/libloc b/config/rootfiles/core/156/filelists/libloc new file mode 120000 index 000000000..ff4a92429 --- /dev/null +++ b/config/rootfiles/core/156/filelists/libloc @@ -0,0 +1 @@ +../../../common/libloc \ No newline at end of file diff --git a/config/rootfiles/core/156/filelists/strongswan b/config/rootfiles/core/156/filelists/strongswan new file mode 120000 index 000000000..90c727e26 --- /dev/null +++ b/config/rootfiles/core/156/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/156/update.sh b/config/rootfiles/core/156/update.sh index fca7d4cb6..8485d84a0 100644 --- a/config/rootfiles/core/156/update.sh +++ b/config/rootfiles/core/156/update.sh @@ -54,6 +54,9 @@ ldconfig # Start services telinit u /etc/init.d/suricata restart +if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then + /etc/init.d/ipsec restart +fi # This update needs a reboot... #touch /var/run/need_reboot diff --git a/lfs/libloc b/lfs/libloc index ac0aecb3b..da684c771 100644 --- a/lfs/libloc +++ b/lfs/libloc @@ -24,8 +24,8 @@ include Config -VER = 0.9.5 -DB_DATE = 2021-01-28 +VER = 0.9.6 +DB_DATE = 2021-03-30 THISAPP = libloc-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -43,8 +43,8 @@ objects = $(DL_FILE) \ $(DL_FILE) = https://source.ipfire.org/releases/libloc/$(DL_FILE) location-$(DB_DATE).db.xz = https://location.ipfire.org/databases/1/archive/location-$(DB_DATE).db.xz -$(DL_FILE)_MD5 = 41d8dc3fb4e498db958b7696cadd61f5 -location-$(DB_DATE).db.xz_MD5 = f1814a144e22c9386aea00fa01992719 +$(DL_FILE)_MD5 = a05c44568bce04ab777caadb3e1d3c51 +location-$(DB_DATE).db.xz_MD5 = e5a05e01e999ba5c70d7e2960336d2a4 install : $(TARGET) @@ -78,9 +78,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xvf $(DIR_DL)/$(DL_FILE) - # Import recent patches from upstream - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libloc-0.9.5-location-Fix-list-networks-by-as.patch - # Add patch for i586 to disable strong stack protector. ifeq "$(BUILD_ARCH)" "i586" cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libloc-0.9.3-perl-i586-regular-stack-protector.patch diff --git a/lfs/strongswan b/lfs/strongswan index ace2c5814..0f00b071f 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 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 = 5.9.1 +VER = 5.9.2 THISAPP = strongswan-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 1f4db969d072e120dc12d1c116a0f658 +$(DL_FILE)_MD5 = 8918e6675e1be3784817641f07eadeb8 install : $(TARGET) diff --git a/src/patches/libloc-0.9.5-location-Fix-list-networks-by-as.patch b/src/patches/libloc-0.9.5-location-Fix-list-networks-by-as.patch deleted file mode 100644 index ea29885a8..000000000 --- a/src/patches/libloc-0.9.5-location-Fix-list-networks-by-as.patch +++ /dev/null @@ -1,27 +0,0 @@ -From b178117bac33b4b1e7ce341a6f2eec493cca13f8 Mon Sep 17 00:00:00 2001 -From: Michael Tremer <michael.tremer(a)ipfire.org> -Date: Mon, 21 Dec 2020 16:25:46 +0000 -Subject: [PATCH] location: Fix list-networks-by-as - -Fixes: #12554 -Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ---- - src/python/location.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/python/location.in b/src/python/location.in -index b30beae..ad2ccf5 100644 ---- a/src/python/location.in -+++ b/src/python/location.in -@@ -493,7 +493,7 @@ class CLI(object): - f = writer(sys.stdout, prefix="AS%s" % asn) - - # Print all matching networks -- for n in db.search_networks(asn=asn, family=ns.family): -+ for n in db.search_networks(asns=[asn], family=ns.family): - f.write(n) - - f.finish() --- -2.26.2 - hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7f52b94f2db141e197d7e2113aa93bce6dfde72e
by Michael Tremer 30 Mar '21

30 Mar '21

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 7f52b94f2db141e197d7e2113aa93bce6dfde72e (commit) via 2537d6754622d5ea984c0e495423cbf777421ab8 (commit) via 5e36a84b83a8b8ffbd12214b6e1253f5da7d37b5 (commit) from 39cfa7d72e9164eb95f770cedee6e37032dbfc48 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7f52b94f2db141e197d7e2113aa93bce6dfde72e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Mar 30 10:08:11 2021 +0000 core156: Ship Net::DNS Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 2537d6754622d5ea984c0e495423cbf777421ab8 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Tue Mar 30 06:50:44 2021 +0200 Net-DNS (V2): Update to 1.29_02 For details see: https://metacpan.org/changes/distribution/Net-DNS Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5e36a84b83a8b8ffbd12214b6e1253f5da7d37b5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Mar 29 14:05:00 2021 +0000 rust: Update rootfile for aarch64 + armv5tel Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/Net-DNS | 4 ++ config/rootfiles/common/aarch64/rust | 68 +++++++++++----------- config/rootfiles/common/armv5tel/rust | 66 ++++++++++----------- .../{oldcore/136 => core/156}/filelists/Net-DNS | 0 lfs/Net-DNS | 6 +- 5 files changed, 74 insertions(+), 70 deletions(-) copy config/rootfiles/{oldcore/136 => core/156}/filelists/Net-DNS (100%) Difference in files: diff --git a/config/rootfiles/common/Net-DNS b/config/rootfiles/common/Net-DNS index 5ccee9949..069105a7c 100644 --- a/config/rootfiles/common/Net-DNS +++ b/config/rootfiles/common/Net-DNS @@ -31,6 +31,7 @@ usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/EUI64.pm usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/GPOS.pm usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/HINFO.pm usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/HIP.pm +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/HTTPS.pm usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/IPSECKEY.pm usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/ISDN.pm usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/KEY.pm @@ -64,6 +65,7 @@ usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/SOA.pm usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/SPF.pm usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/SRV.pm usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/SSHFP.pm +usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/SVCB.pm usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/TKEY.pm usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/TLSA.pm usr/lib/perl5/site_perl/5.30.0/Net/DNS/RR/TSIG.pm @@ -118,6 +120,7 @@ usr/lib/perl5/site_perl/5.30.0/Net/DNS/ZoneFile.pm #usr/share/man/man3/Net::DNS::RR::GPOS.3 #usr/share/man/man3/Net::DNS::RR::HINFO.3 #usr/share/man/man3/Net::DNS::RR::HIP.3 +#usr/share/man/man3/Net::DNS::RR::HTTPS.3 #usr/share/man/man3/Net::DNS::RR::IPSECKEY.3 #usr/share/man/man3/Net::DNS::RR::ISDN.3 #usr/share/man/man3/Net::DNS::RR::KEY.3 @@ -151,6 +154,7 @@ usr/lib/perl5/site_perl/5.30.0/Net/DNS/ZoneFile.pm #usr/share/man/man3/Net::DNS::RR::SPF.3 #usr/share/man/man3/Net::DNS::RR::SRV.3 #usr/share/man/man3/Net::DNS::RR::SSHFP.3 +#usr/share/man/man3/Net::DNS::RR::SVCB.3 #usr/share/man/man3/Net::DNS::RR::TKEY.3 #usr/share/man/man3/Net::DNS::RR::TLSA.3 #usr/share/man/man3/Net::DNS::RR::TSIG.3 diff --git a/config/rootfiles/common/aarch64/rust b/config/rootfiles/common/aarch64/rust index f78900126..c26d4591b 100644 --- a/config/rootfiles/common/aarch64/rust +++ b/config/rootfiles/common/aarch64/rust @@ -6,48 +6,48 @@ #usr/bin/rustdoc #usr/etc/bash_completion.d #usr/etc/bash_completion.d/cargo -#usr/lib/libchalk_derive-ab8da7706852c7d1.so -#usr/lib/librustc_driver-127e9fc83f5fe8ed.so -#usr/lib/librustc_macros-a802875ebd51e14a.so -#usr/lib/libserde_derive-2afdd6ad3f546f4c.so -#usr/lib/libstd-29781dd1b9640f75.so -#usr/lib/libtest-b14ca498adaa2310.so -#usr/lib/libtracing_attributes-4a7bcaae800b5679.so +#usr/lib/libchalk_derive-60c7d9b67167a9f2.so +#usr/lib/librustc_driver-d05deb70c2a826c2.so +#usr/lib/librustc_macros-6959a92dde7c0104.so +#usr/lib/libserde_derive-f6c55381d3d185eb.so +#usr/lib/libstd-78700ac2ab56c3bb.so +#usr/lib/libtest-5140f7e2ec410eb4.so +#usr/lib/libtracing_attributes-f1588bb03dae1fd1.so #usr/lib/rustlib #usr/lib/rustlib/aarch64-unknown-linux-gnu #usr/lib/rustlib/aarch64-unknown-linux-gnu/bin #usr/lib/rustlib/aarch64-unknown-linux-gnu/lib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libaddr2line-a92724f046a57e30.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libadler-ea2a91695faa1e89.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/liballoc-d43e6e879187a608.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libcfg_if-925daaf2c5cf2e92.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libcompiler_builtins-8f808686cc3affc6.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libcore-6439d1c9dd80162d.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libgetopts-77116bc06b68c794.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libgimli-e455ee89e274c367.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libhashbrown-859c421200511ced.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/liblibc-068af3faa1ac144d.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libminiz_oxide-f65fb6567bf17f27.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libobject-ff7e65325e1e523d.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libpanic_abort-348df52f634c1c81.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libpanic_unwind-56aa6707cabe8000.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libproc_macro-26339a83b27f844d.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libprofiler_builtins-d032df49d914a49d.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libaddr2line-228db558b4700480.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libadler-f8e203c5b1ddf98b.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/liballoc-e22f07436e09e5de.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libcfg_if-10f6c1cf2d7e4beb.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libcompiler_builtins-81a70c8852741fae.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libcore-3c0fae3704d95225.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libgetopts-bf6c53d8d87e5474.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libgimli-ee0753eb4294dd52.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libhashbrown-b407e6a2057ae6e3.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/liblibc-05c1d7ca8cdec168.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libminiz_oxide-449db24deb93dd8d.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libobject-8e2621586e9e42ed.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libpanic_abort-35141bf59368e7af.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libpanic_unwind-808231bb932c6507.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libproc_macro-52033248ff2e703e.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libprofiler_builtins-f29e4894fa03fc09.rlib #usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc-stable_rt.asan.a #usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc-stable_rt.lsan.a #usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc-stable_rt.msan.a #usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc-stable_rt.tsan.a -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_demangle-8b7a51ed264de226.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_std_workspace_alloc-ce6bfcff7df99ce9.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_std_workspace_core-9308879ac90871bd.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_std_workspace_std-b9172e7308e6d327.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libstd-29781dd1b9640f75.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libstd-29781dd1b9640f75.so -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libterm-0211ae29ecd59761.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libtest-b14ca498adaa2310.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libtest-b14ca498adaa2310.so -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libunicode_width-4303c3a3b74b63c5.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libunwind-006b74d7aab2848d.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_demangle-76d8cd0fb823c519.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_std_workspace_alloc-4e6c971b08227805.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_std_workspace_core-5291610c2695652b.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_std_workspace_std-f823a3559cc11aa8.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libstd-78700ac2ab56c3bb.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libstd-78700ac2ab56c3bb.so +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libterm-ccf3fc5c25933c6d.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libtest-5140f7e2ec410eb4.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libtest-5140f7e2ec410eb4.so +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libunicode_width-fa2a3a9c86d3c072.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libunwind-94e50e919db6c56e.rlib #usr/lib/rustlib/components #usr/lib/rustlib/etc #usr/lib/rustlib/etc/gdb_load_rust_pretty_printers.py diff --git a/config/rootfiles/common/armv5tel/rust b/config/rootfiles/common/armv5tel/rust index 58de53c1c..ffe8318ab 100644 --- a/config/rootfiles/common/armv5tel/rust +++ b/config/rootfiles/common/armv5tel/rust @@ -6,43 +6,43 @@ #usr/bin/rustdoc #usr/etc/bash_completion.d #usr/etc/bash_completion.d/cargo -#usr/lib/libchalk_derive-6802dacd9eb319eb.so -#usr/lib/librustc_driver-31339ba3cbfbe07c.so -#usr/lib/librustc_macros-efe4024eb71bda81.so -#usr/lib/libserde_derive-4bb6eda35aa7c292.so -#usr/lib/libstd-aaa37882fc02daba.so -#usr/lib/libtest-203e0eef4f2e4c21.so -#usr/lib/libtracing_attributes-866cd8e3dbccf66e.so +#usr/lib/libchalk_derive-60e6609799a3665c.so +#usr/lib/librustc_driver-d9db5d9f5168f26a.so +#usr/lib/librustc_macros-5adaaf63fffb4acc.so +#usr/lib/libserde_derive-7dfe7ef76bb583c0.so +#usr/lib/libstd-08ee4762acc7bd6c.so +#usr/lib/libtest-ab3fca57c5ff3f13.so +#usr/lib/libtracing_attributes-119e673def241fe0.so #usr/lib/rustlib #usr/lib/rustlib/arm-unknown-linux-gnueabi #usr/lib/rustlib/arm-unknown-linux-gnueabi/bin #usr/lib/rustlib/arm-unknown-linux-gnueabi/lib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libaddr2line-bfe9f5d269928db7.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libadler-f6b48b65c9174419.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/liballoc-195b05f9d78e6b09.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libcfg_if-63b2ba5be1a54244.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libcompiler_builtins-1a50a82804be3743.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libcore-94f591d6304be447.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libgetopts-86bdb8605ffe80e0.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libgimli-c2f187b0ce2c186d.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libhashbrown-c87e68c05b7e6ae7.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/liblibc-1929674575942af9.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libminiz_oxide-ac4274ba34088b7e.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libobject-19f8bb4b95ae4e74.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libpanic_abort-9709b5dd45c87a35.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libpanic_unwind-802b485553963e09.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libproc_macro-0dc0b2089ea858e8.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_demangle-8a1ce41bd5ebba6e.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_std_workspace_alloc-836188e641bc6c19.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_std_workspace_core-270987e744c299b8.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_std_workspace_std-97769c80f4f04c6b.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libstd-aaa37882fc02daba.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libstd-aaa37882fc02daba.so -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libterm-4f211dfe3c3efca4.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libtest-203e0eef4f2e4c21.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libtest-203e0eef4f2e4c21.so -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libunicode_width-22a05ba07ce727e9.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libunwind-0ee590c063dbf7c8.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libaddr2line-a93e1e1d8fc43c22.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libadler-b353a1d292e49fc9.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/liballoc-f19953fa31c5e53c.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libcfg_if-35e2f271631dab8b.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libcompiler_builtins-ddbc6586d7a17833.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libcore-14499a277447f4f6.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libgetopts-a643ba6ad20cd7fc.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libgimli-cc1b705e5055e3a6.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libhashbrown-081221f480fdcb96.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/liblibc-15548400be905d1f.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libminiz_oxide-d5d80e62031eaec6.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libobject-f538e004b85c6b56.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libpanic_abort-9719b08ba8e4a62e.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libpanic_unwind-67eb8cc728beb84e.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libproc_macro-6d2282bdaf511097.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_demangle-138ccc5a7c1205f8.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_std_workspace_alloc-48aee1e7bcd00a8b.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_std_workspace_core-d7f7aed366972d31.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_std_workspace_std-36a49e2bcef28653.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libstd-08ee4762acc7bd6c.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libstd-08ee4762acc7bd6c.so +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libterm-cde6bfa2a44e2ae0.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libtest-ab3fca57c5ff3f13.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libtest-ab3fca57c5ff3f13.so +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libunicode_width-070cf192d55ba738.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libunwind-0dfac9185d575a7e.rlib #usr/lib/rustlib/components #usr/lib/rustlib/etc #usr/lib/rustlib/etc/gdb_load_rust_pretty_printers.py diff --git a/config/rootfiles/core/156/filelists/Net-DNS b/config/rootfiles/core/156/filelists/Net-DNS new file mode 120000 index 000000000..5ff1b19c7 --- /dev/null +++ b/config/rootfiles/core/156/filelists/Net-DNS @@ -0,0 +1 @@ +../../../common/Net-DNS \ No newline at end of file diff --git a/lfs/Net-DNS b/lfs/Net-DNS index 5cdc2155d..8bd2356c2 100644 --- a/lfs/Net-DNS +++ b/lfs/Net-DNS @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2020 Michael Tremer & Christian Schmidt # +# 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.25 +VER = 1.29_02 THISAPP = Net-DNS-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 5c0d1a6de317993e146ce6d37c897be5 +$(DL_FILE)_MD5 = 2bf25bccd13ce2dcc4f10a6bef9cae25 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 39cfa7d72e9164eb95f770cedee6e37032dbfc48
by Michael Tremer 29 Mar '21

29 Mar '21

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 39cfa7d72e9164eb95f770cedee6e37032dbfc48 (commit) via 1a5e319b5c3cfca114f5e769a099f1215f6aa4ae (commit) via cb85f8b8c89333f9b30617fcb695d41fec0104e7 (commit) via a71209a343f9dc0cf58fbabad2efc777f49ae4ad (commit) via 799cca48a18513eccade0ac5e6a7f0565054948a (commit) via dc1917a9aaab01861f7ceb0baa3b0b8103deef19 (commit) via c8dd8b783e6d4ab451e3c650e4095e6364774368 (commit) via d315898acd71ba062a2d8f7e64a8eae223d41124 (commit) via b3c86db7f00baf85fb1a315f59f4e8478e300b8c (commit) from 99d987bd4a5e4002580a170c3b91507f79866009 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 39cfa7d72e9164eb95f770cedee6e37032dbfc48 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Mar 29 12:57:56 2021 +0000 core156: Ship gawk Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 1a5e319b5c3cfca114f5e769a099f1215f6aa4ae Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Mon Mar 29 13:45:04 2021 +0200 gawk: Update to 5.1.0 - Update from 4.1.4 to 5.1.0 - Update of rootfile carried out - Changelog is too long to fit in here. Changes for versions 5.0.0 and 5.1.0 can be found in the ChangeLog file in the source tarball Changes for versions 4.2.0 and 4.2.1 can be found in the ChangeLog.1 file in the source tarball Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit cb85f8b8c89333f9b30617fcb695d41fec0104e7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Mar 29 12:55:28 2021 +0000 core156: Ship ed Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a71209a343f9dc0cf58fbabad2efc777f49ae4ad Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Mon Mar 29 13:44:47 2021 +0200 ed: Update to 1.17 - Update from 0.2 to 1.17 - Update of rootfile carried out - ed-0.2-mkstemp-1.patch from LFS is no longer required in later versions of ed or LFS - Changelog is a bit too long to add here. Full change log can be found by viewing ChangeLog file in tar sourceball Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 799cca48a18513eccade0ac5e6a7f0565054948a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Mar 29 12:54:35 2021 +0000 core156: Ship diffutils Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit dc1917a9aaab01861f7ceb0baa3b0b8103deef19 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Mon Mar 29 13:44:28 2021 +0200 diffutils: Update to 3.7 - Update from 3.6 to 3.7 - No update of rootfile required - Changelog 2018-12-31 Jim Meyering <meyering(a)fb.com> version 3.7 * NEWS: Record release date. maint: distribute new file, init.cfg Otherwise, strip-trailing-cr would fail on a system without valgrind. * tests/Makefile.am (EXTRA_DIST): Include init.cfg. 2018-12-30 Dennis Lambe Jr <malsyned(a)malsyned.net> diff: adjust ANSI escapes for compatibility with less -R GNU less can display ANSI-colored text with the -R flag, but this support has some limitations. One of them is that if an escape sequence starts on one line and ends on a different line, only the first line will be colored in less. As a result, when diff creates colored output with multi-line deletes or adds, less will only color the first line. This change resets ANSI color to the default at the end of each line and restarts it at the beginning of the next. It patches normal and context mode. Side-by-side already worked in my testing. * src/context.c (print_context_label, pr_context_hunk): As above. (pr_unidiff_hunk, print_context_header): Likewise. * src/normal.c (print_normal_hunk): Likewise. * tests/colors: Adjust existing tests to accommodate this. * NEWS (Improvements): Mention it. Proposed in http://bugs.gnu.org/31105 2018-12-29 Jim Meyering <meyering(a)fb.com> tests: fix colors test on systems lacking fractional timestamp support * tests/colors: The .NNNNNNNNN suffix is not printed on some systems. Adapt the test to accommodate those systems. tests: strip-trailing-cr: avoid failure with ASAN Valgrind cannot operate on an ASAN-compiled binary. * tests/strip-trailing-cr (valgrind): Define as no-op when diff was compiled with sanitizer support. 2018-12-28 Jim Meyering <meyering(a)fb.com> tests: add test for --strip-trailing-cr UMR bug * tests/strip-trailing-cr: New file. Test for today's bug fix. * tests/Makefile.am (TESTS): Add it. tests: import test infrastructure from coreutils * tests/init.cfg: New file, for require_valgrind_ definition (from coreutils). * tests/Makefile.am (PATH): Don't set stderr_fileno_ here, since it is now initialized in init.cfg. 2018-12-28 Paul Eggert <eggert(a)cs.ucla.edu> Jim Meyering <jim(a)meyering.net> diff: fix UMR with --strip-trailing-cr Problem reported by Hongxu Chen (Bug#31935). * src/io.c (prepare_text): Strip trailing CR before doing the rest of the analysis. * NEWS: Mention the fix. 2018-12-28 Bruno Haible <bruno(a)clisp.org> tests: colors: avoid test failure on AIX 7 * tests/colors: Splice the argument into the printf format string. 2018-12-27 Bruno Haible <address@hidden> maint: don't use an undocumented Autoconf macro * configure.ac: Use AC_CONFIG_HEADERS instead of AC_CONFIG_HEADER. 2018-12-23 Jim Meyering <meyering(a)fb.com> build: avoid build failure with --enable-gcc-warnings and latest gcc * src/diff.c (usage): Assert that each line length is no longer than the minimum required size of 4095. This lets newer gcc (currently 9.0.0 20181219) infer that it need not issue this warning: diff.c:1012:19: error: '%.*s' directive output between 0 and 2147483647 bytes may exceed minimum required size of 4095 [-Werror=format-overflow=] 1012 | printf (" %.*s", msglen, msg); build: update gnulib to latest; and bootstrap and init.sh build: make the autoconf-2.63 requirement explicit * configure.ac: AC_PREREQ: Require 2.63, not 2.59. And quote properly. Autoconf-2.63 has been required for some time via gnulib. This merely makes it explicit. 2018-12-20 Jim Meyering <meyering(a)fb.com> maint: use https: in gnu mirror URL prefix, not http This appears in the generated release announcement message. * cfg.mk (url_dir_list): Use https: prefix, not http:. 2018-07-24 Paul Eggert <eggert(a)cs.ucla.edu> cmp: fix bug in -b diagnostic Problem reported by mancha (Bug#32249). * src/cmp.c (count_newlines): Restore old value of sentinel. * tests/cmp: Test for the bug. build: update gnulib submodule to latest 2018-05-14 Paul Eggert <eggert(a)cs.ucla.edu> doc: prepend "GNU" to NAME in man pages Requested by RMS. * src/cmp.c, src/diff.c, src/diff3.c, src/sdiff.c: Prepend "GNU" to first comment, so that the man page says "GNU". 2018-04-20 Paul Eggert <eggert(a)cs.ucla.edu> sdiff: port to mingw Problem reported by Ross Burton (Bug#31218). * src/sdiff.c (checksigs): Use ‘raise’, not ‘kill’. 2018-03-23 Paul Eggert <eggert(a)cs.ucla.edu> build: update gnulib submodule to latest 2018-01-14 Jim Meyering <meyering(a)fb.com> tests: fix quoting error in previous change * tests/colors: Double-quote $PATH. 2018-01-06 Jim Meyering <meyering(a)fb.com> tests: port tests/colors to some env-munging shell * tests/colors: Also set PATH="$PATH" in env invocation. maint: update gnulib and copyright dates for 2018 * gnulib: Update to latest. * all files: Run "make update-copyright". * bootstrap: Update from gnulib. maint: suppress gcc's new -Wcast-function-type in gnulib * configure.ac (WERROR_CFLAGS): Suppress gcc's new -Wcast-function-type warning in gnulib, because it would trigger on this: sig-handler.h:47:12: error: cast between incompatible function types\ from 'void (* const)(int, siginfo_t *, void *)' \ {aka 'void (* const)(int, struct <anonymous> *, void *)'} \ to 'void (*)(int)' [-Werror=cast-function-type] return (sa_handler_t) a->sa_sigaction; 2017-10-22 Jim Meyering <meyering(a)fb.com> tests: add expected-failing test for minor subopimality In some unusual cases, diff -u prints suboptimal output. * tests/large-subopt: New test script. * tests/Makefile.am (TESTS): Add it. (XFAIL_TESTS): Add it here, too, to record that this test is currently expected to fail. * tests/large-subopt.in1, tests/large-subopt.in2: Inputs derived from those in http://bugs.gnu.org/28796 2017-09-23 Jim Meyering <meyering(a)fb.com> gnulib: update to latest 2017-05-21 Jim Meyering <meyering(a)fb.com> maint: make the announcement template Cc the devel- list * cfg.mk (announcement_Cc_): Define. maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c8dd8b783e6d4ab451e3c650e4095e6364774368 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Mar 29 12:53:36 2021 +0000 core156: Ship bzip2 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d315898acd71ba062a2d8f7e64a8eae223d41124 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Mon Mar 29 13:44:14 2021 +0200 bzip2: Update to 1.0.8 - Update from 1.0.6 to 1.0.8 - Update of rootfile - Changelog 1.0.8 (13 Jul 19) * Accept as many selectors as the file format allows. This relaxes the fix for CVE-2019-12900 from 1.0.7 so that bzip2 allows decompression of bz2 files that use (too) many selectors again. * Fix handling of large (> 4GB) files on Windows. * Cleanup of bzdiff and bzgrep scripts so they don't use any bash extensions and handle multiple archives correctly. * There is now a bz2-files testsuite at https://sourceware.org/git/bzip2-tests.git 1.0.7 (27 Jun 19) * Fix undefined behavior in the macros SET_BH, CLEAR_BH, & ISSET_BH * bzip2: Fix return value when combining --test,-t and -q. * bzip2recover: Fix buffer overflow for large argv[0] * bzip2recover: Fix use after free issue with outFile (CVE-2016-3189) * Make sure nSelectors is not out of range (CVE-2019-12900) Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b3c86db7f00baf85fb1a315f59f4e8478e300b8c Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Mon Mar 29 13:43:59 2021 +0200 bison: Update to 3.7.6 - Update from 3.7.1 to 3.7.6 - No update of rootfile required - Changelog is too large to include here Full changelog can be viewed in ChangeLog file in the source tarball 3.7.6 1 bug fix 3.7.5 4 bug fixes 3.7.4 2 bug fixes 3.7.3 2 bug fixes 3.7.2 6 bug fixes Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/bzip2 | 2 +- config/rootfiles/common/ed | 7 +++---- config/rootfiles/common/gawk | 13 +++++++++---- config/rootfiles/core/156/filelists/bzip2 | 1 + .../rootfiles/{oldcore/100 => core/156}/filelists/diffutils | 0 config/rootfiles/{oldcore/106 => core/156}/filelists/ed | 0 config/rootfiles/{oldcore/103 => core/156}/filelists/gawk | 0 config/rootfiles/core/156/update.sh | 4 +++- lfs/bison | 4 ++-- lfs/bzip2 | 4 ++-- lfs/diffutils | 4 ++-- lfs/ed | 13 +++++-------- lfs/gawk | 4 ++-- 13 files changed, 30 insertions(+), 26 deletions(-) create mode 120000 config/rootfiles/core/156/filelists/bzip2 copy config/rootfiles/{oldcore/100 => core/156}/filelists/diffutils (100%) copy config/rootfiles/{oldcore/106 => core/156}/filelists/ed (100%) copy config/rootfiles/{oldcore/103 => core/156}/filelists/gawk (100%) Difference in files: diff --git a/config/rootfiles/common/bzip2 b/config/rootfiles/common/bzip2 index f6ad610d4..9a8e88148 100644 --- a/config/rootfiles/common/bzip2 +++ b/config/rootfiles/common/bzip2 @@ -2,7 +2,7 @@ bin/bunzip2 bin/bzcat bin/bzip2 lib/libbz2.so.1.0 -lib/libbz2.so.1.0.6 +lib/libbz2.so.1.0.8 usr/bin/bunzip2 usr/bin/bzcat usr/bin/bzcmp diff --git a/config/rootfiles/common/ed b/config/rootfiles/common/ed index 0779fcfe1..55e16d813 100644 --- a/config/rootfiles/common/ed +++ b/config/rootfiles/common/ed @@ -1,6 +1,5 @@ #bin/ed #bin/red -#usr/info -#usr/info/ed.info -#usr/man/man1/ed.1 -#usr/man/man1/red.1 +#usr/share/info/ed.info +#usr/share/man/man1/ed.1 +#usr/share/man/man1/red.1 diff --git a/config/rootfiles/common/gawk b/config/rootfiles/common/gawk index f9e1e8ae4..61778f408 100644 --- a/config/rootfiles/common/gawk +++ b/config/rootfiles/common/gawk @@ -1,7 +1,9 @@ usr/bin/awk usr/bin/gawk -#usr/bin/gawk-4.1.4 -#usr/bin/igawk +usr/bin/gawk-5.1.0 +usr/etc/profile.d +usr/etc/profile.d/gawk.csh +usr/etc/profile.d/gawk.sh #usr/include/gawkapi.h #usr/lib/awk #usr/lib/awk/grcat @@ -11,13 +13,13 @@ usr/lib/gawk/filefuncs.so usr/lib/gawk/fnmatch.so usr/lib/gawk/fork.so usr/lib/gawk/inplace.so +usr/lib/gawk/intdiv.so usr/lib/gawk/ordchr.so usr/lib/gawk/readdir.so usr/lib/gawk/readfile.so usr/lib/gawk/revoutput.so usr/lib/gawk/revtwoway.so usr/lib/gawk/rwarray.so -usr/lib/gawk/testext.so usr/lib/gawk/time.so #usr/share/awk #usr/share/awk/assert.awk @@ -28,10 +30,13 @@ usr/lib/gawk/time.so #usr/share/awk/getopt.awk #usr/share/awk/gettime.awk #usr/share/awk/group.awk +#usr/share/awk/have_mpfr.awk #usr/share/awk/inplace.awk +#usr/share/awk/intdiv0.awk #usr/share/awk/join.awk #usr/share/awk/libintl.awk #usr/share/awk/noassign.awk +#usr/share/awk/ns_passwd.awk #usr/share/awk/ord.awk #usr/share/awk/passwd.awk #usr/share/awk/processarray.awk @@ -46,8 +51,8 @@ usr/lib/gawk/time.so #usr/share/awk/zerofile.awk #usr/share/info/gawk.info #usr/share/info/gawkinet.info +#usr/share/info/gawkworkflow.info #usr/share/man/man1/gawk.1 -#usr/share/man/man1/igawk.1 #usr/share/man/man3/filefuncs.3am #usr/share/man/man3/fnmatch.3am #usr/share/man/man3/fork.3am diff --git a/config/rootfiles/core/156/filelists/bzip2 b/config/rootfiles/core/156/filelists/bzip2 new file mode 120000 index 000000000..03f4ee55e --- /dev/null +++ b/config/rootfiles/core/156/filelists/bzip2 @@ -0,0 +1 @@ +../../../common/bzip2 \ No newline at end of file diff --git a/config/rootfiles/core/156/filelists/diffutils b/config/rootfiles/core/156/filelists/diffutils new file mode 120000 index 000000000..a5c02f3ff --- /dev/null +++ b/config/rootfiles/core/156/filelists/diffutils @@ -0,0 +1 @@ +../../../common/diffutils \ No newline at end of file diff --git a/config/rootfiles/core/156/filelists/ed b/config/rootfiles/core/156/filelists/ed new file mode 120000 index 000000000..0ed331cfa --- /dev/null +++ b/config/rootfiles/core/156/filelists/ed @@ -0,0 +1 @@ +../../../common/ed \ No newline at end of file diff --git a/config/rootfiles/core/156/filelists/gawk b/config/rootfiles/core/156/filelists/gawk new file mode 120000 index 000000000..a3bbe32ce --- /dev/null +++ b/config/rootfiles/core/156/filelists/gawk @@ -0,0 +1 @@ +../../../common/gawk \ No newline at end of file diff --git a/config/rootfiles/core/156/update.sh b/config/rootfiles/core/156/update.sh index 83ae4c603..fca7d4cb6 100644 --- a/config/rootfiles/core/156/update.sh +++ b/config/rootfiles/core/156/update.sh @@ -33,7 +33,9 @@ done # Remove files rm -vf \ - /srv/web/ipfire/html/include/snortupdateutility.js + /srv/web/ipfire/html/include/snortupdateutility.js \ + /usr/bin/gawk-4.1.4 \ + /usr/bin/igawk # Stop services diff --git a/lfs/bison b/lfs/bison index 9c65723f5..3a2681406 100644 --- a/lfs/bison +++ b/lfs/bison @@ -24,7 +24,7 @@ include Config -VER = 3.7.1 +VER = 3.7.6 THISAPP = bison-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -45,7 +45,7 @@ objects =$(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = e7c8c321351ebdf70f5f0825f3faaee2 +$(DL_FILE)_MD5 = d61aa92e3562cb7292b004ce96173cf7 install : $(TARGET) diff --git a/lfs/bzip2 b/lfs/bzip2 index da20ce68c..9c6f9c5a4 100644 --- a/lfs/bzip2 +++ b/lfs/bzip2 @@ -24,7 +24,7 @@ include Config -VER = 1.0.6 +VER = 1.0.8 THISAPP = bzip2-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -47,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 00b516f4704d4a7cb50a1d97e6e8e15b +$(DL_FILE)_MD5 = 67e051268d0c475ea773822f7500d0e5 install : $(TARGET) diff --git a/lfs/diffutils b/lfs/diffutils index aee8f36f1..03c278d2a 100644 --- a/lfs/diffutils +++ b/lfs/diffutils @@ -24,7 +24,7 @@ include Config -VER = 3.6 +VER = 3.7 THISAPP = diffutils-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -47,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 07cf286672ced26fba54cd0313bdc071 +$(DL_FILE)_MD5 = 4824adc0e95dbbf11dfbdfaad6a1e461 install : $(TARGET) diff --git a/lfs/ed b/lfs/ed index d628a029b..b2f2dd8fe 100644 --- a/lfs/ed +++ b/lfs/ed @@ -24,10 +24,10 @@ include Config -VER = 0.2 +VER = 1.17 THISAPP = ed-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.lz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -35,13 +35,11 @@ TARGET = $(DIR_INFO)/$(THISAPP) ############################################################################### # Top-level Rules ############################################################################### -objects = $(DL_FILE) $(THISAPP)-mkstemp-1.patch +objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(THISAPP)-mkstemp-1.patch = $(DL_FROM)/$(THISAPP)-mkstemp-1.patch -$(DL_FILE)_MD5 = ddd57463774cae9b50e70cd51221281b -$(THISAPP)-mkstemp-1.patch_MD5 = e7e2248f9baa76de3db8210298e0d79e +$(DL_FILE)_MD5 = 894748c9bbf35cb7c599f5317b1a8cdb install : $(TARGET) @@ -70,8 +68,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_DL)/$(THISAPP)-mkstemp-1.patch + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure --prefix=/usr --exec-prefix="" --disable-nls cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/gawk b/lfs/gawk index a4f8eeb9c..2e32f3bea 100644 --- a/lfs/gawk +++ b/lfs/gawk @@ -25,7 +25,7 @@ include Config -VER = 4.1.4 +VER = 5.1.0 THISAPP = gawk-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -49,7 +49,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 4e7dbc81163e60fd4f0b52496e7542c9 +$(DL_FILE)_MD5 = 8470c34eeecc41c1aa0c5d89e630df50 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 99d987bd4a5e4002580a170c3b91507f79866009
by Michael Tremer 29 Mar '21

29 Mar '21

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 99d987bd4a5e4002580a170c3b91507f79866009 (commit) via 4e24418705464a159d9618e474b37d44d251d467 (commit) via ad173413e368afdbc70ea537bec4cfa8f091635a (commit) via 395513f525f46659a1587d37c0a82cdcbd79547e (commit) via 8ada7e9b513753c01867c05821c6d21a3bd18d6b (commit) via 9db81dc9d410a5de240711cd3b8c8e4eca086bfe (commit) via e3e38ee6111aa21541da49727c49ee7b0ef3b447 (commit) via 6c958adf2f2a115004fe6c3c5ab698f99c80e23b (commit) from 9a11c96b8a90e6eeb676226553b76307b9abdb47 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 99d987bd4a5e4002580a170c3b91507f79866009 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Mar 28 20:40:34 2021 +0200 lfs/Config: fix build if MAX_PARALLELISM is lower than one If you have 2GB RAM the build of dnsdist will fail because MAX_PARALLELISM was set to zero by RAM/2048 because a bit of RAM is used by the system. This patch ensure that the lowest PARALLELISM value is 1. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 4e24418705464a159d9618e474b37d44d251d467 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sun Mar 28 15:54:05 2021 +0200 Tor: update to 0.4.5.7 Full changelog as per https://gitweb.torproject.org/tor.git/plain/ChangeLog?h=tor-0.4.5.7: Changes in version 0.4.5.7 - 2021-03-16 Tor 0.4.5.7 fixes two important denial-of-service bugs in earlier versions of Tor. One of these vulnerabilities (TROVE-2021-001) would allow an attacker who can send directory data to a Tor instance to force that Tor instance to consume huge amounts of CPU. This is easiest to exploit against authorities, since anybody can upload to them, but directory caches could also exploit this vulnerability against relays or clients when they download. The other vulnerability (TROVE-2021-002) only affects directory authorities, and would allow an attacker to remotely crash the authority with an assertion failure. Patches have already been provided to the authority operators, to help ensure network stability. We recommend that everybody upgrade to one of the releases that fixes these issues (0.3.5.14, 0.4.4.8, or 0.4.5.7) as they become available to you. This release also updates our GeoIP data source, and fixes a few smaller bugs in earlier releases. o Major bugfixes (security, denial of service): - Disable the dump_desc() function that we used to dump unparseable information to disk. It was called incorrectly in several places, in a way that could lead to excessive CPU usage. Fixes bug 40286; bugfix on 0.2.2.1-alpha. This bug is also tracked as TROVE-2021- 001 and CVE-2021-28089. - Fix a bug in appending detached signatures to a pending consensus document that could be used to crash a directory authority. Fixes bug 40316; bugfix on 0.2.2.6-alpha. Tracked as TROVE-2021-002 and CVE-2021-28090. o Minor features (geoip data): - We have switched geoip data sources. Previously we shipped IP-to- country mappings from Maxmind's GeoLite2, but in 2019 they changed their licensing terms, so we were unable to update them after that point. We now ship geoip files based on the IPFire Location Database instead. (See https://location.ipfire.org/ for more information). This release updates our geoip files to match the IPFire Location Database as retrieved on 2021/03/12. Closes ticket 40224. o Minor bugfixes (directory authority): - Now that exit relays don't allow exit connections to directory authority DirPorts (to prevent network reentry), disable authorities' reachability self test on the DirPort. Fixes bug 40287; bugfix on 0.4.5.5-rc. o Minor bugfixes (documentation): - Fix a formatting error in the documentation for VirtualAddrNetworkIPv6. Fixes bug 40256; bugfix on 0.2.9.4-alpha. o Minor bugfixes (Linux, relay): - Fix a bug in determining total available system memory that would have been triggered if the format of Linux's /proc/meminfo file had ever changed to include "MemTotal:" in the middle of a line. Fixes bug 40315; bugfix on 0.2.5.4-alpha. o Minor bugfixes (metrics port): - Fix a BUG() warning on the MetricsPort for an internal missing handler. Fixes bug 40295; bugfix on 0.4.5.1-alpha. o Minor bugfixes (onion service): - Remove a harmless BUG() warning when reloading tor configured with onion services. Fixes bug 40334; bugfix on 0.4.5.1-alpha. o Minor bugfixes (portability): - Fix a non-portable usage of "==" with "test" in the configure script. Fixes bug 40298; bugfix on 0.4.5.1-alpha. o Minor bugfixes (relay): - Remove a spammy log notice falsely claiming that the IPv4/v6 address was missing. Fixes bug 40300; bugfix on 0.4.5.1-alpha. - Do not query the address cache early in the boot process when deciding if a relay needs to fetch early directory information from an authority. This bug resulted in a relay falsely believing it didn't have an address and thus triggering an authority fetch at each boot. Related to our fix for 40300. o Removed features (mallinfo deprecated): - Remove mallinfo() usage entirely. Libc 2.33+ now deprecates it. Closes ticket 40309. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ad173413e368afdbc70ea537bec4cfa8f091635a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Mar 29 10:31:34 2021 +0000 core156: Ship suricata Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 395513f525f46659a1587d37c0a82cdcbd79547e Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sun Mar 28 00:03:04 2021 +0100 rust: Update to 1.51 For details see: https://github.com/rust-lang/rust/blob/master/RELEASES.md Please note: I can only build on Intel 32bit and 64bit, rootfiles for 'aarch64' and 'armv5tel' are still missing. Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8ada7e9b513753c01867c05821c6d21a3bd18d6b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Mar 29 10:28:40 2021 +0000 core156: Ship header.pl Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 9db81dc9d410a5de240711cd3b8c8e4eca086bfe Author: Leo-Andres Hofmann <hofmann(a)leo-andres.de> Date: Thu Mar 25 21:49:41 2021 +0100 header.pl: Hide PPPoE menu item if RED is in IP mode Fixes: #11342 Signed-off-by: Leo-Andres Hofmann <hofmann(a)leo-andres.de> Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e3e38ee6111aa21541da49727c49ee7b0ef3b447 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Mar 29 10:27:53 2021 +0000 core156: Drop snortupdateutility.js Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 6c958adf2f2a115004fe6c3c5ab698f99c80e23b Author: Leo-Andres Hofmann <hofmann(a)leo-andres.de> Date: Thu Mar 25 17:33:17 2021 +0100 Remove unused snortupdateutility.js This script doesn't seem to be maintained or used anywhere anymore. The last reference to it was removed in commit 1772664. Signed-off-by: Leo-Andres Hofmann <hofmann(a)leo-andres.de> Acked-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/cfgroot/header.pl | 6 + config/rootfiles/common/i586/rust | 64 +- config/rootfiles/common/web-user-interface | 1 - config/rootfiles/common/x86_64/rust | 66 +- config/rootfiles/core/156/filelists/files | 1 + .../{oldcore/131 => core/156}/filelists/suricata | 0 config/rootfiles/core/156/update.sh | 3 + html/html/include/snortupdateutility.js | 744 --------------------- lfs/Config | 4 +- lfs/rust | 10 +- lfs/tor | 6 +- 11 files changed, 82 insertions(+), 823 deletions(-) copy config/rootfiles/{oldcore/131 => core/156}/filelists/suricata (100%) delete mode 100644 html/html/include/snortupdateutility.js Difference in files: diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl index 5684c01c5..8dea804d0 100644 --- a/config/cfgroot/header.pl +++ b/config/cfgroot/header.pl @@ -170,6 +170,12 @@ sub genmenu { $menu->{'02.status'}{'subMenu'}->{'74.modem-status'}{'enabled'} = 1; } + # Disable the Dialup/PPPoE menu item when the RED interface is in IP mode + # (the "Network" module is loaded by general-functions.pl) + if(&Network::is_red_mode_ip()) { + $menu->{'01.system'}{'subMenu'}->{'20.dialup'}{'enabled'} = 0; + } + # Disbale unusable things in cloud environments if (&General::running_in_cloud()) { $menu->{'03.network'}{'subMenu'}->{'30.dhcp'}{'enabled'} = 0; diff --git a/config/rootfiles/common/i586/rust b/config/rootfiles/common/i586/rust index 4592d661f..1ba069dee 100644 --- a/config/rootfiles/common/i586/rust +++ b/config/rootfiles/common/i586/rust @@ -6,13 +6,9 @@ #usr/bin/rustdoc #usr/etc/bash_completion.d #usr/etc/bash_completion.d/cargo -#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/librustc_driver-c20ca3c04a59a7fd.so +#usr/lib/libstd-17af607fafeec010.so +#usr/lib/libtest-6ed499b2de6f7ed3.so #usr/lib/rustlib #usr/lib/rustlib/components #usr/lib/rustlib/etc @@ -26,33 +22,33 @@ #usr/lib/rustlib/i686-unknown-linux-gnu #usr/lib/rustlib/i686-unknown-linux-gnu/bin #usr/lib/rustlib/i686-unknown-linux-gnu/lib -#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/i686-unknown-linux-gnu/lib/libaddr2line-c8071f4fd64b8447.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libadler-0349698873defa34.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/liballoc-4ee3c33938208aa4.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libcfg_if-026ad87104cdfeea.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libcompiler_builtins-9a06243c6c7e8528.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libcore-7da5ae6b1d061c3d.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libgetopts-0ddc724072fa12a1.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libgimli-0eddbd769f241c1d.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libhashbrown-9e99065747e32362.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/liblibc-92bbd0da49665057.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libminiz_oxide-24ad70872c68e01f.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libobject-5ab850799bc1d85d.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libpanic_abort-95ba58a890227a5f.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libpanic_unwind-469a8af1d4d55ce7.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libproc_macro-28c6ba6967e07051.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libprofiler_builtins-d58f76d15eb44c57.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_demangle-7a538ce2f1f58338.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_std_workspace_alloc-63380016f02a674e.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_std_workspace_core-b83ea8012e4ee99e.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_std_workspace_std-1bece10cc5dfb00b.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libstd-17af607fafeec010.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libstd-17af607fafeec010.so +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libterm-2aea246853cd806a.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libtest-6ed499b2de6f7ed3.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libtest-6ed499b2de6f7ed3.so +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libunicode_width-9a244ee40f5e4b24.rlib +#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libunwind-78445e0a22ee32d6.rlib #usr/lib/rustlib/install.log #usr/lib/rustlib/manifest-cargo #usr/lib/rustlib/manifest-rust-std-i686-unknown-linux-gnu diff --git a/config/rootfiles/common/web-user-interface b/config/rootfiles/common/web-user-interface index 9b2667676..540bf1e4b 100644 --- a/config/rootfiles/common/web-user-interface +++ b/config/rootfiles/common/web-user-interface @@ -300,7 +300,6 @@ srv/web/ipfire/html/images/view-refresh.png srv/web/ipfire/html/images/wakeup.gif srv/web/ipfire/html/images/window-new.png srv/web/ipfire/html/include -srv/web/ipfire/html/include/snortupdateutility.js srv/web/ipfire/html/include/zoneconf.js srv/web/ipfire/html/index.cgi srv/web/ipfire/html/redirect-templates diff --git a/config/rootfiles/common/x86_64/rust b/config/rootfiles/common/x86_64/rust index f21cdc9fd..6f4c7fd45 100644 --- a/config/rootfiles/common/x86_64/rust +++ b/config/rootfiles/common/x86_64/rust @@ -7,14 +7,10 @@ #usr/etc #usr/etc/bash_completion.d #usr/etc/bash_completion.d/cargo -#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/libLLVM-11-rust-1.51.0-stable.so +#usr/lib/librustc_driver-7ea116e55de24565.so +#usr/lib/libstd-b1047a2788193be4.so +#usr/lib/libtest-db2b7a6bef408fa0.so #usr/lib/rustlib #usr/lib/rustlib/components #usr/lib/rustlib/etc @@ -34,37 +30,37 @@ #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/lib -#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/libaddr2line-4b4efaa8c4601753.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libadler-eaad965909c4200f.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liballoc-d4ef8bf89076ed01.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcfg_if-2642d2bccc00517a.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcompiler_builtins-e2523c360f03ba10.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcore-3aaf8f932781f33e.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgetopts-95dbee16e1f1413e.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgimli-d36e07ed2cc56ee4.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libhashbrown-58a065cdff5508a2.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-760e48b3f782e7f5.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libminiz_oxide-c6b02b522c91c060.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libobject-dca728ac8ed54d87.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_abort-e64bb1b2baa83853.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_unwind-e8e399e2092f3b2a.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libproc_macro-54c67f2a732d07c8.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libprofiler_builtins-3d6f66b0d6604f40.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/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_demangle-3855d04b1bb40ceb.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_alloc-82aeeedcc8d1450a.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_core-36070e2029bb21ea.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_std-bb10221986b0d0dc.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-b1047a2788193be4.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-b1047a2788193be4.so +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libterm-48aa4fef4e05ebc9.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-db2b7a6bef408fa0.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-db2b7a6bef408fa0.so +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunicode_width-ca628c5eca5e5caf.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunwind-5c4d6c9d7595f844.rlib #usr/libexec/cargo-credential-1password #usr/share/doc/cargo #usr/share/doc/cargo/LICENSE-APACHE diff --git a/config/rootfiles/core/156/filelists/files b/config/rootfiles/core/156/filelists/files index a86b19a51..940d3ebe6 100644 --- a/config/rootfiles/core/156/filelists/files +++ b/config/rootfiles/core/156/filelists/files @@ -1,3 +1,4 @@ srv/web/ipfire/cgi-bin/firewall.cgi srv/web/ipfire/cgi-bin/zoneconf.cgi +var/ipfire/header.pl var/ipfire/network-functions.pl diff --git a/config/rootfiles/core/156/filelists/suricata b/config/rootfiles/core/156/filelists/suricata new file mode 120000 index 000000000..f671f6993 --- /dev/null +++ b/config/rootfiles/core/156/filelists/suricata @@ -0,0 +1 @@ +../../../common/suricata \ No newline at end of file diff --git a/config/rootfiles/core/156/update.sh b/config/rootfiles/core/156/update.sh index 0e98ffdc5..83ae4c603 100644 --- a/config/rootfiles/core/156/update.sh +++ b/config/rootfiles/core/156/update.sh @@ -32,6 +32,8 @@ for (( i=1; i<=$core; i++ )); do done # Remove files +rm -vf \ + /srv/web/ipfire/html/include/snortupdateutility.js # Stop services @@ -49,6 +51,7 @@ ldconfig # Start services telinit u +/etc/init.d/suricata restart # This update needs a reboot... #touch /var/run/need_reboot diff --git a/html/html/include/snortupdateutility.js b/html/html/include/snortupdateutility.js deleted file mode 100644 index 10750519c..000000000 --- a/html/html/include/snortupdateutility.js +++ /dev/null @@ -1,744 +0,0 @@ -/* -File Info: utility.js - JavaScript library - -Author: Drew S. Dupont - -Date: 2/26/2003 - 8/12/2004 (or present day) - -Description: Utility functions in JavaScript - Drew S. Dupont <dsdupont(a)alumni.indiana.edu> -*/ -// Show/Hide HTML Span -function showHideHTML(id, content) { - // Browser variables - var ie45, ns6, ns4, dom = false; - - // Basic browser parse - if (navigator.appName == "Microsoft Internet Explorer") { - ie45 = parseInt(navigator.appVersion) >= 4; - } else if (navigator.appName == "Netscape") { - ns6 = parseInt(navigator.appVersion) >= 5; - ns4 = parseInt(navigator.appVersion) < 5; - } - dom = ie45 || ns6; - - // Return if using an old Netscape browser - if(ns4) return; - - // Check for type of call supported - el = document.all ? document.all[id] : dom ? document.getElementById(id) : document.layers[id]; - - // Check if content to be "switched" is "" - if (content == "") { - // Return old content and replace with "" - content = el.innerHTML; - el.innerHTML = ""; - } else { - // Replace current content with new content and return "" - el.innerHTML = content; - content = ""; - } - - // Return content (either old or "") - return content; -} - -// Check for special chars -function checkForSpecialChars(field, alphaStart, specialCheckChars) { - // Local vars - var alphaStartChars = /^[a-zA-Z]/; - var noSpecialChars = /([^a-zA-Z0-9 _,?!':;\r\t\n\/\\\-\.#@]+)/; - - // Check if should start with an alpha char - if (alphaStart) { - // Make sure starts with a alpha char - if (alphaStartChars.test(field.value)) { - // Check for special chars - if (noSpecialChars.test(field.value)) { - // Return true - return true; - } else { - // Check for specialCheckChars - if (specialCheckChars && (specialCheckChars.test(field.value))) { - // Return true - return true; - } else { - // Return false - return false; - } - } - } else { - // Return true - return true; - } - } else { - // Check if contains any special chars - if (noSpecialChars.test(field.value)) { - // Return true - return true; - } else { - // Check for specialCheckChars - if (specialCheckChars && (specialCheckChars.test(field.value))) { - // Return true - return true; - } else { - // Return false - return false; - } - } - } -} // End checkForSpecialChars - -// Launch help -function launchHelp(helpSrc) { - helpWindow = window.open(helpSrc, "helpWindow", "resizable=yes,menubar=no,statusbar=no,titlebar=no,scrollbars=yes,width=400,height=400") - helpWindow.moveTo(25, 25); - helpWindow.focus(); -} - -// Image On -function imageOn(imageName) { - document[imageName].src = eval(imageName + "_over.src"); -} - -// Image Off -function imageOff(imageName) { - document[imageName].src = eval(imageName + ".src"); -} - -// Image Down -function imageDown(imageName) { - document[imageName].src = eval(imageName + "_down.src"); -} - -// Image button On -function imageButtonOn(item, imageName) { - item.src = eval(imageName + "_over.src"); -} - -// Image button Off -function imageButtonOff(item, imageName) { - item.src = eval(imageName + ".src"); -} - -// Image button Down -function imageButtonDown(item, imageName) { - item.src = eval(imageName + "_down.src"); -} - -// changeStatus -function changeStatus(message) { - // Set window status - window.status = message; - - // Return true - return true; -} // End changeStatus - -// isNumeric function -function isNumeric(num) { - // Boolean var - var bolValidNum = true; - var digits = "1234567890"; - var len = num.length; - - // Loop over num - for (i = 0; i < len; ++i) { - numSub = num.substring(i, i + 1); - - // Test for numeric match - if (digits.indexOf(numSub) == -1) { - bolValidNum = false; - } - } - - // Return boolean var - return bolValidNum; -} // End isNumeric - -// Check for numeric and display nice error -function checkNumeric(field, message) { - // Is it valid - if (!isNumeric(field.value)) { - alert(message); - field.focus(); - } -} // End checkNumeric - -// Function getInt which return numeric value of passed in string -function getInt(str, i, minlength, maxlength) { - for (x = maxlength; x >= minlength; --x) { - var token = str.substring(i, i + x); - - // Check for numeric - if (isNumeric(token)) { - return token; - } - } - - // Return null - return null; -} - -// Function dateCheck, requires global err variable for passing error messages -// and requires the isNumeric function -function dateCheck(date, humanname, dateFormat) { - // Date validation - var date_s = date; - - // If no dateFormat, then set one - if (dateFormat == null) { - format = "mm/dd/yyyy"; - } else { - format = dateFormat; - } - - var date_err = 0; // Possible values are 0, 1 - var date_year_err = 0; // Possible values are 0, 1 - var date_month_err = 0; // Possible values are 1-12 - var date_day_err = 0; // Possible values are 0, 1, 2, 3, 4 - var i_date_s = 0; - var i_format = 0; - var err = ""; - var c = ""; - var token = ""; - var token2 = ""; - var x, y; - var year = 0; - var month = 0; - var date = 0; - var bYearProvided = false; - var MONTH_NAMES = new Array('January','February','March','April','May','June','July','August','September','October','November','December','Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec'); - - // Trim the leading spaces from the string - while (date_s.charAt(0) == ' ') { - date_s = date_s.slice(1); - } - - while (i_format < format.length) { - // Get next token from format string - c = format.charAt(i_format); - token = ""; - - while ((format.charAt(i_format) == c) && (i_format < format.length)) { - token += format.charAt(i_format); - ++i_format; - } - - // Extract contents of value based on format token - if ((token == "yyyy") || (token == "yy") || (token == "y")) { - if (token == "yyyy") { x = 4; y = 4; } // 4-digit year - if (token == "yy") { x = 2; y = 2; } // 2-digit year - if (token == "y") { x = 2; y = 4; } // 2-or-4-digit year - - year = getInt(date_s, i_date_s, x, y); - bYearProvided = true; - - if ((year == null) || (year.length != token.length)) { - date_year_err = 1; - } - - i_date_s += year.length; - } else { - if (token == "mmm") { // Month name - month = 0; - - for (var i = 0; i < MONTH_NAMES.length; ++i) { - var month_name = MONTH_NAMES[i]; - - if (date_s.substring(i_date_s, (i_date_s + month_name.length)).toLowerCase() == month_name.toLowerCase()) { - month = i + 1; - - if (month > 12) { - month -= 12; - } - - i_date_s += month_name.length; - break; - } - } - - if ((month == 0) || (month < 1) || (month > 12)) { - date_month_err = 1; - } - } else { - if ((token == "mm") || (token == "m")) { - x = token.length; y = 2; - month = getInt(date_s, i_date_s, x, y); - - if ((month == null) || (month < 1) || (month > 12)) { - date_month_err = 1; - } - - i_date_s += month.length; - } else { - if (token=="dd" || token=="d") { - x = token.length; y = 2; - date = getInt(date_s, i_date_s, x, y); - - if ((date == null) || (date < 1) || (date > 31)) { - date_day_err = 1; - } - - i_date_s += date.length; - } else { - if (date_s.substring(i_date_s, (i_date_s + token.length)) != token) { - date_err = 1; - } else { - i_date_s += token.length; - } - } - } - } - } - } - - // If there are any trailing characters left in the date_s, it doesn't match - if (i_date_s != date_s.length) { - date_err = 1; - } - - // Is date valid for month? - if ((month == 4) || (month == 6) || (month == 9) || (month == 11)) { - if (date > 30) { - date_day_err = 2; - } - } else { - if (month == 2) { - // Check for leap year - if ((((year % 4) == 0) && ((year % 100) != 0)) || ((year % 400) == 0)) { - // Leap year - if (date > 29) { - date_day_err = 3 - } - } else { - if (date > 28) { - date_day_err = 4; - } - } - } else { - if (date > 31) { - date_day_err = 1; - } - } - } - - // Add to the error message, if needed - if (date_err != 0) { - err += "\n - The " + humanname + " must be a valid date in the format " + format + "."; - } - - // Add to the error message, if needed - if (date_month_err != 0) { - err += "\n - The month must be between 1-12."; - } - - // Add to the error message, if needed - if (date_year_err != 0) { - err += "\n - The " + humanname + " must have a valid year."; - } - - // Add to the error message, if needed - if (date_day_err != 0) { - switch (date_day_err) { - case 1: - err += "\n - The month you entered in the " + humanname + " can only have between 1 and 31 days."; - break; - case 2: - err += "\n - The month you entered in the " + humanname + " can only have between 1 and 30 days."; - break; - case 3: - err += "\n - The month you entered in the " + humanname + " can only have between 1 and 29 days in a Leap Year."; - break; - default: - err += "\n - The month you entered in the " + humanname + " can only have between 1 and 28 days in a non-Leap Year."; - break; - } - } - - return err; -} // End dateCheck - -// Compares two MM/DD/YYY dates for less than (-1), equal to (0), or -// greater than (1) -function dateCompare(date1, date2) { - var localDate1 = new Date(date1.substring(6,10), date1.substring(0,2), date1.substring(3,5)); - var localDate2 = new Date(date2.substring(6,10), date2.substring(0,2), date2.substring(3,5)); - - // Greater than - if (localDate1.getTime() > localDate2.getTime()) { - return 1; - } else { - // Less than - if (localDate1.getTime() < localDate2.getTime()) { - return -1; - } else { - // Equal - return 0; - } - } -} // End dateCompare - -// All-purpose form validation script -function checkForm(dataForm) { - var msg = ""; - var stripBlanksStart = /^\s+/g; - var stripBlanksEnd = /\s+$/g; - var squeezeBlanks = /\s+/g; - var stripNonNumbers = /\D+/g; - var stripNotDollars = /[^0-9\.]/g; - var noSpaces = /\s+/g; - var allNumbers = /^\d+$/; - var zipCodeCheck = /^(\d{5})$|^(\d{5}-\d{4})$/; - var passwordNumbers = /\d{1,}/; - var passwordLetters = /\D{1,}/; - var emailPattern = /^[a-zA-Z0-9]([a-zA-Z0-9_\-\.]*)(a)([a-zA-Z0-9_\-\.]*)(\.[a-zA-Z]{2,3}(\.[a-zA-Z]{2}){0,2})$/i; - var replaceSeps = /[-,\.\/]/g; - var time24Format = /^(([0-1]?\d)|(2[0-3])):[0-5]\d(:([0-5]\d))?/; - var time12Format = /^(\d|0\d|1[0-2]):[0-5]\d(:[0-5]\d)?( (A|P)\.?M\.?)?/; - var ipNetworkAddress = /^((\d{1,2}|[1]\d{2}|2[0-4]\d|25[0-5])(\.(\d{1,2}|[1]\d{2}|2[0-4]\d|25[0-5])){3}){1}((\/(0\.0\.0\.0|128\.0\.0\.0|192\.0\.0\.0|224\.0\.0\.0|240\.0\.0\.0|248\.0\.0\.0|252\.0\.0\.0|254\.0\.0\.0|(255\.(0\.0\.0|128\.0\.0|192\.0\.0|224\.0\.0|240\.0\.0|248\.0\.0|252\.0\.0|254\.0\.0|(255\.(0\.0|128\.0|192\.0|224\.0|240\.0|248\.0|252\.0|254\.0|(255\.(0|128|192|224|240|248|252|254|255))))))))|(\/(\d|[1-2]\d|3[0-2]))){0,1}$/; - var ipNetworkPort = /^(\d{1,4}|[1-5]\d{4}|6[0-4]\d{3}|65[0-4]\d{2}|655[0-2]\d|6553[0-5]){1}((\:|\-)(\d{1,4}|[1-5]\d{4}|6[0-4]\d{3}|65[0-4]\d{2}|655[0-2]\d|6553[0-5])){0,1}$/; - var passwordLength = 6; - var error_fields = ""; - var errors = ""; - - // Loop over form elements - for (var i = 0; i < dataForm.length; ++i) { - var element = dataForm.elements[i]; - - // Check for select box - if (element.selectbox) { - // Check for required - if (element.required) { - // Check for value - if (element.options[element.selectedIndex].value == "") { - error_fields += "\n - " + element.humanname + " requires a selection."; - } - } - continue; - } - - // Strip the leading and trailing blanks - element.value = element.value.replace(stripBlanksStart, ''); - element.value = element.value.replace(stripBlanksEnd, ''); - - // If it is required and is empty, alert - if (element.required && (!element.value.length)) { - error_fields += "\n - " + element.humanname + " is required."; - continue; - } else { - // If it isn't required and doesn't have any length, skip it - if ((! element.required) && (! element.value.length)) { - continue; - } - } - - // Check for special characters - if (element.checkspecialchars) { - if (checkForSpecialChars(element, element.alphaStart, element.specialChars)) { - error_fields += "\n - " + element.humanname + " contains invalid characters."; - continue; - } - } - - // Convert to uppercase if necessary - if (element.uppercase) { - element.value = element.value.toUpperCase(); - } - - // Convert to uppercase if necessary - if (element.lowercase) { - element.value = element.value.toLowerCase(); - } - - // UCFirst if necessary - if (element.ucfirst) { - // Squeeze the blanks - rs = element.value.replace(squeezeBlanks, ' '); - dsegs = rs.split(' '); - element.value = ""; - - // Loop over chars - for (j = 0; j < dsegs.length; ++j) { - if (dsegs[j].length > 1) { - fl = dsegs[j].substr(0, 1); - fl = fl.toUpperCase(); - rn = dsegs[j].substr(1); - rn = rn.toLowerCase(); - dsegs[j] = fl + rn; - } - - // Check for first value - element.value = j ? element.value + ' ' + dsegs[j] : dsegs[j]; - } - } - - // Check for equality test - if (element.equalto) { - // Check for truevalue and use if found, otherwise use value - var elementValue1 = element.truevalue ? element.truevalue : element.value; - var elementValue2 = element.equaltovalue.truevalue ? element.equaltovalue.truevalue : element.equaltovalue.value; - - // Check for value equality - if (elementValue1 != elementValue2) { - error_fields +="\n - " + element.humanname + " is not the same as " + element.equaltovalue.humanname; - continue; - } - } - - // Check for less than - if (element.lessthan) { - // Check for truevalue and use if found, otherwise use value - var elementValue1 = element.truevalue ? element.truevalue : element.value; - var elementValue2 = element.lessthanvalue.truevalue ? element.lessthanvalue.truevalue : element.lessthanvalue.value; - - // Check for values - if ((elementValue1 != '') && (elementValue2 != '')) { - // Check for value less than - if (elementValue1 >= elementValue2) { - error_fields +="\n - " + element.humanname + " must be less than " + element.lessthanvalue.humanname; - continue; - } - } - } - - // Check for less than equalto - if (element.lessthanequalto) { - // Check for truevalue and use if found, otherwise use value - var elementValue1 = element.truevalue ? element.truevalue : element.value; - var elementValue2 = element.lessthanequaltovalue.truevalue ? element.lessthanequaltovalue.truevalue : element.lessthanequaltovalue.value; - - // Check for values - if ((elementValue1 != '') && (elementValue2 != '')) { - // Check for value less than equalto - if (elementValue1 > elementValue2) { - error_fields +="\n - " + element.humanname + " must be less than or equal to " + element.lessthanequaltovalue.humanname; - continue; - } - } - } - - // Check for greater than - if (element.greaterthan) { - // Check for truevalue and use if found, otherwise use value - var elementValue1 = element.truevalue ? element.truevalue : element.value; - var elementValue2 = element.greaterthanvalue.truevalue ? element.greaterthanvalue.truevalue : element.greaterthanvalue.value; - - // Check for values - if ((elementValue1 != '') && (elementValue2 != '')) { - // Check for value greater than - if (elementValue1 <= elementValue2) { - error_fields +="\n - " + element.humanname + " must be greater than " + element.greaterthanvalue.humanname; - continue; - } - } - } - - // Check for greater than equalto - if (element.greaterthanequalto) { - // Check for truevalue and use if found, otherwise use value - var elementValue1 = element.truevalue ? element.truevalue : element.value; - var elementValue2 = element.greaterthanequaltovalue.truevalue ? element.greaterthanequaltovalue.truevalue : element.greaterthanequaltovalue.value; - - // Check for values - if ((elementValue1 != '') && (elementValue2 != '')) { - // Check for value greater than equalto - if (elementValue1 < elementValue2) { - error_fields +="\n - " + element.humanname + " must be greater than or equal to " + element.greaterthanequaltovalue.humanname; - continue; - } - } - } - - // Check a price (sort of) - if (element.price) { - // Strip out currency stuff - element.value = element.value.replace(stripNotDollars, ''); - continue; - } - - // Check a telephone number - if (element.telephone) { - // Strip out parens and spaces - rs = element.value.replace(stripNonNumbers, ''); - - if (rs.length == 7) { - element.value = rs.substr(0, 3) + "-" + rs.substr(3, 4); - } else { - if (rs.length == 10) { - element.value = rs.substr(0, 3) + "-" + rs.substr(3, 3) + "-" + rs.substr(6, 4); - } else { - error_fields += "\n - " + element.humanname + " is an invalid telephone number."; - } - } - continue; - } - - // Check a zip code - if (element.zipcode) { - if (!zipCodeCheck.test(element.value)) { - error_fields +="\n - " + element.humanname + " is an invalid zipcode."; - } - continue; - } - - // Check a password (sort of) - if (element.password) { - if (element.value.length < passwordLength) { - error_fields += "\n - " + element.humanname + " is too short"; - error_fields += "\n Minimum length is " + passwordLength + " characters."; - continue; - } - - if (!passwordNumbers.test(element.value)) { - error_fields += "\n - " + element.humanname + " must contain at least one number."; - continue; - } - - if (!passwordLetters.test(element.value)) { - error_fields += "\n - " + element.humanname + " must contain at least one letter."; - continue; - } - } - - // Check for all numbers - if (element.numeric) { - if (!allNumbers.test(element.value)) { - error_fields += "\n - " + element.humanname + " is not numeric."; - } - continue; - } - - // Check an email address for validity - if (element.email) { - element.value = element.value.replace(noSpaces, ''); - - if (!emailPattern.test(element.value)) { - error_fields += "\n - " + element.humanname + " is not a valid email address."; - } - continue; - } - - // Check a date - if (element.date) { - error_fields += dateCheck(element.value, element.humanname, element.format); - continue; - } - - // Check a time - if (element.time) { - // Check for 24 hour time - if (element.time24) { - // Check for valid - if (!time24Format.test(element.value)) { - error_fields += "\n - " + element.humanname + " is not a valid 24 hour time."; - } - } else { - // Check for valid - if (!time12Format.test(element.value)) { - error_fields += "\n - " + element.humanname + " is not a valid 12 hour time."; - } - } - continue; - } - - // Check the lengths - if (element.minlen && (element.value.length < element.minlen)) { - error_fields += "\n - " + element.humanname + " is too short"; - error_fields += "\n Minimum length is " + element.minlen + " characters."; - continue; - } - - if (element.maxlen && (element.value.length > element.maxlen)) { - error_fields +="\n - " + element.humanname + " is too long"; - error_fields +="\n Maximum length is " + element.maxlen + " characters."; - continue; - } - - // Check for ip/network address - if (element.ipnetworkaddress) { - if (!ipNetworkAddress.test(element.value)) { - error_fields +="\n - " + element.humanname + " is not a valid ip/network address"; - } - continue; - } - - // Check for ip/network port - if (element.ipnetworkport) { - if (!ipNetworkPort.test(element.value)) { - error_fields +="\n - " + element.humanname + " is not a valid ip/network port"; - } else { - var searchChar = ""; - var portArray = ""; - - if (element.value.indexOf(":") > -1) { - searchChar = ":"; - } else if (element.value.indexOf("-") > -1) { - searchChar = "-"; - } - - if (searchChar != '') { - portArray = element.value.split(searchChar); - - if (portArray.length == 2) { - if (parseInt(portArray[0]) > parseInt(portArray[1])) { - error_fields +="\n - " + element.humanname + " can not have a start port greater than an end port"; - } - } - } - } - continue; - } - } - - // Check for any errors - if (error_fields == "") { - return true; - } else { - msg = "The following fields have errors:\n"; - msg += error_fields; - alert(msg); - return false; - } -} - -// Clear data -function clearData(field, data) { - // Check if they equal - if (field.value == data) { - // Clear data - field.value = ''; - } -} - -// Set empty data -function setEmptyData(field, data) { - // Check if they equal - if (! field.value.length) { - // Clear data - field.value = data; - } -} - -// Trim whitespace from beginning and end -function trim(data) { - var objRegExp = /^(\s*)$/; - - // Check for all spaces - if (objRegExp.test(data)) { - data = data.replace(objRegExp, ''); - - if (data.length == 0) - return data; - } - - // Check for leading & trailing spaces - objRegExp = /^(\s*)([\W\w]*)(\b\s*$)/; - - if (objRegExp.test(data)) { - // Remove leading and trailing whitespace characters - data = data.replace(objRegExp, '$2'); - } - - return data; -} diff --git a/lfs/Config b/lfs/Config index ee3dc2365..eadbbc408 100644 --- a/lfs/Config +++ b/lfs/Config @@ -35,7 +35,9 @@ unexport BUILD_ARCH BUILD_PLATFORM BUILDTARGET CROSSTARGET TOOLCHAIN TOOLS_DIR unexport XZ_OPT PARALLELISM = $(shell echo $$( \ - if [ -n "$(MAX_PARALLELISM)" ] && [ $(MAX_PARALLELISM) -lt $(DEFAULT_PARALLELISM) ]; then \ + if [ -n "$(MAX_PARALLELISM)" ] && [ $(MAX_PARALLELISM) -lt 1 ]; then \ + echo 1 ; \ + elif [ -n "$(MAX_PARALLELISM)" ] && [ $(MAX_PARALLELISM) -lt $(DEFAULT_PARALLELISM) ]; then \ echo $(MAX_PARALLELISM); \ else \ echo $(DEFAULT_PARALLELISM); \ diff --git a/lfs/rust b/lfs/rust index 5af9c4cec..2c357944d 100644 --- a/lfs/rust +++ b/lfs/rust @@ -24,7 +24,7 @@ include Config -VER = 1.50.0 +VER = 1.51.0 THISAPP = rust-$(VER) DL_FILE = $(THISAPP)-$(RUST_BOOTSTRAP).tar.gz @@ -53,10 +53,10 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(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 +$(THISAPP)-x86_64-unknown-linux-gnu.tar.gz_MD5 = efc4d147e25918e60678a69fcaf67b55 +$(THISAPP)-i686-unknown-linux-gnu.tar.gz_MD5 = 666d7a99abf2834b2cb4bb8e6c571c76 +$(THISAPP)-aarch64-unknown-linux-gnu.tar.gz_MD5 = e85e1758b9770bae16c253825e2ecf9c +$(THISAPP)-arm-unknown-linux-gnueabi.tar.gz_MD5 = da4fa1b2bd21dc6d2d7e791d8faaa3eb install : $(TARGET) diff --git a/lfs/tor b/lfs/tor index 8ad5986b0..34e3b3ffb 100644 --- a/lfs/tor +++ b/lfs/tor @@ -24,7 +24,7 @@ include Config -VER = 0.4.5.6 +VER = 0.4.5.7 THISAPP = tor-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tor -PAK_VER = 58 +PAK_VER = 59 DEPS = libseccomp @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 22a04ef62c714b7d9d8928ebe238e4c4 +$(DL_FILE)_MD5 = 3a1800592293a8d4122823eab9233739 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree tag, v2.25-core155, created. c1472bdfdbd2f22de7a1ebe4d79d1ec065bd5679
by Michael Tremer 26 Mar '21

26 Mar '21

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The tag, v2.25-core155 has been created at c1472bdfdbd2f22de7a1ebe4d79d1ec065bd5679 (commit) - Log ----------------------------------------------------------------- commit c1472bdfdbd2f22de7a1ebe4d79d1ec065bd5679 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 25 14:36:34 2021 +0000 openssl: Update to 1.1.1k From https://www.openssl.org/news/secadv/20210325.txt: OpenSSL Security Advisory [25 March 2021] ========================================= CA certificate check bypass with X509_V_FLAG_X509_STRICT (CVE-2021-3450) ======================================================================== Severity: High The X509_V_FLAG_X509_STRICT flag enables additional security checks of the certificates present in a certificate chain. It is not set by default. Starting from OpenSSL version 1.1.1h a check to disallow certificates in the chain that have explicitly encoded elliptic curve parameters was added as an additional strict check. An error in the implementation of this check meant that the result of a previous check to confirm that certificates in the chain are valid CA certificates was overwritten. This effectively bypasses the check that non-CA certificates must not be able to issue other certificates. If a "purpose" has been configured then there is a subsequent opportunity for checks that the certificate is a valid CA. All of the named "purpose" values implemented in libcrypto perform this check. Therefore, where a purpose is set the certificate chain will still be rejected even when the strict flag has been used. A purpose is set by default in libssl client and server certificate verification routines, but it can be overridden or removed by an application. In order to be affected, an application must explicitly set the X509_V_FLAG_X509_STRICT verification flag and either not set a purpose for the certificate verification or, in the case of TLS client or server applications, override the default purpose. OpenSSL versions 1.1.1h and newer are affected by this issue. Users of these versions should upgrade to OpenSSL 1.1.1k. OpenSSL 1.0.2 is not impacted by this issue. This issue was reported to OpenSSL on 18th March 2021 by Benjamin Kaduk from Akamai and was discovered by Xiang Ding and others at Akamai. The fix was developed by Tomáš Mráz. NULL pointer deref in signature_algorithms processing (CVE-2021-3449) ===================================================================== Severity: High An OpenSSL TLS server may crash if sent a maliciously crafted renegotiation ClientHello message from a client. If a TLSv1.2 renegotiation ClientHello omits the signature_algorithms extension (where it was present in the initial ClientHello), but includes a signature_algorithms_cert extension then a NULL pointer dereference will result, leading to a crash and a denial of service attack. A server is only vulnerable if it has TLSv1.2 and renegotiation enabled (which is the default configuration). OpenSSL TLS clients are not impacted by this issue. All OpenSSL 1.1.1 versions are affected by this issue. Users of these versions should upgrade to OpenSSL 1.1.1k. OpenSSL 1.0.2 is not impacted by this issue. This issue was reported to OpenSSL on 17th March 2021 by Nokia. The fix was developed by Peter Kästle and Samuel Sapalski from Nokia. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree tag, v2.5-core150, created. d328c232d7df7bf3f8582388f428c47a92fab0c1
by Michael Tremer 26 Mar '21

26 Mar '21

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The tag, v2.5-core150 has been created at d328c232d7df7bf3f8582388f428c47a92fab0c1 (commit) - Log ----------------------------------------------------------------- commit d328c232d7df7bf3f8582388f428c47a92fab0c1 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Sep 28 10:27:24 2020 +0000 credits.cgi: update contributors Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core155, created. c1472bdfdbd2f22de7a1ebe4d79d1ec065bd5679
by Michael Tremer 26 Mar '21

26 Mar '21

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, core155 has been created at c1472bdfdbd2f22de7a1ebe4d79d1ec065bd5679 (commit) - Log ----------------------------------------------------------------- commit c1472bdfdbd2f22de7a1ebe4d79d1ec065bd5679 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 25 14:36:34 2021 +0000 openssl: Update to 1.1.1k From https://www.openssl.org/news/secadv/20210325.txt: OpenSSL Security Advisory [25 March 2021] ========================================= CA certificate check bypass with X509_V_FLAG_X509_STRICT (CVE-2021-3450) ======================================================================== Severity: High The X509_V_FLAG_X509_STRICT flag enables additional security checks of the certificates present in a certificate chain. It is not set by default. Starting from OpenSSL version 1.1.1h a check to disallow certificates in the chain that have explicitly encoded elliptic curve parameters was added as an additional strict check. An error in the implementation of this check meant that the result of a previous check to confirm that certificates in the chain are valid CA certificates was overwritten. This effectively bypasses the check that non-CA certificates must not be able to issue other certificates. If a "purpose" has been configured then there is a subsequent opportunity for checks that the certificate is a valid CA. All of the named "purpose" values implemented in libcrypto perform this check. Therefore, where a purpose is set the certificate chain will still be rejected even when the strict flag has been used. A purpose is set by default in libssl client and server certificate verification routines, but it can be overridden or removed by an application. In order to be affected, an application must explicitly set the X509_V_FLAG_X509_STRICT verification flag and either not set a purpose for the certificate verification or, in the case of TLS client or server applications, override the default purpose. OpenSSL versions 1.1.1h and newer are affected by this issue. Users of these versions should upgrade to OpenSSL 1.1.1k. OpenSSL 1.0.2 is not impacted by this issue. This issue was reported to OpenSSL on 18th March 2021 by Benjamin Kaduk from Akamai and was discovered by Xiang Ding and others at Akamai. The fix was developed by Tomáš Mráz. NULL pointer deref in signature_algorithms processing (CVE-2021-3449) ===================================================================== Severity: High An OpenSSL TLS server may crash if sent a maliciously crafted renegotiation ClientHello message from a client. If a TLSv1.2 renegotiation ClientHello omits the signature_algorithms extension (where it was present in the initial ClientHello), but includes a signature_algorithms_cert extension then a NULL pointer dereference will result, leading to a crash and a denial of service attack. A server is only vulnerable if it has TLSv1.2 and renegotiation enabled (which is the default configuration). OpenSSL TLS clients are not impacted by this issue. All OpenSSL 1.1.1 versions are affected by this issue. Users of these versions should upgrade to OpenSSL 1.1.1k. OpenSSL 1.0.2 is not impacted by this issue. This issue was reported to OpenSSL on 17th March 2021 by Nokia. The fix was developed by Peter Kästle and Samuel Sapalski from Nokia. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 59ebcaedbd5a1cc2a451c80460f674c312edbcd8 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Mar 20 09:57:20 2021 +0000 gmp: fix build on arm 32bit Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. c1472bdfdbd2f22de7a1ebe4d79d1ec065bd5679
by Michael Tremer 25 Mar '21

25 Mar '21

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via c1472bdfdbd2f22de7a1ebe4d79d1ec065bd5679 (commit) from 59ebcaedbd5a1cc2a451c80460f674c312edbcd8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c1472bdfdbd2f22de7a1ebe4d79d1ec065bd5679 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 25 14:36:34 2021 +0000 openssl: Update to 1.1.1k From https://www.openssl.org/news/secadv/20210325.txt: OpenSSL Security Advisory [25 March 2021] ========================================= CA certificate check bypass with X509_V_FLAG_X509_STRICT (CVE-2021-3450) ======================================================================== Severity: High The X509_V_FLAG_X509_STRICT flag enables additional security checks of the certificates present in a certificate chain. It is not set by default. Starting from OpenSSL version 1.1.1h a check to disallow certificates in the chain that have explicitly encoded elliptic curve parameters was added as an additional strict check. An error in the implementation of this check meant that the result of a previous check to confirm that certificates in the chain are valid CA certificates was overwritten. This effectively bypasses the check that non-CA certificates must not be able to issue other certificates. If a "purpose" has been configured then there is a subsequent opportunity for checks that the certificate is a valid CA. All of the named "purpose" values implemented in libcrypto perform this check. Therefore, where a purpose is set the certificate chain will still be rejected even when the strict flag has been used. A purpose is set by default in libssl client and server certificate verification routines, but it can be overridden or removed by an application. In order to be affected, an application must explicitly set the X509_V_FLAG_X509_STRICT verification flag and either not set a purpose for the certificate verification or, in the case of TLS client or server applications, override the default purpose. OpenSSL versions 1.1.1h and newer are affected by this issue. Users of these versions should upgrade to OpenSSL 1.1.1k. OpenSSL 1.0.2 is not impacted by this issue. This issue was reported to OpenSSL on 18th March 2021 by Benjamin Kaduk from Akamai and was discovered by Xiang Ding and others at Akamai. The fix was developed by Tomáš Mráz. NULL pointer deref in signature_algorithms processing (CVE-2021-3449) ===================================================================== Severity: High An OpenSSL TLS server may crash if sent a maliciously crafted renegotiation ClientHello message from a client. If a TLSv1.2 renegotiation ClientHello omits the signature_algorithms extension (where it was present in the initial ClientHello), but includes a signature_algorithms_cert extension then a NULL pointer dereference will result, leading to a crash and a denial of service attack. A server is only vulnerable if it has TLSv1.2 and renegotiation enabled (which is the default configuration). OpenSSL TLS clients are not impacted by this issue. All OpenSSL 1.1.1 versions are affected by this issue. Users of these versions should upgrade to OpenSSL 1.1.1k. OpenSSL 1.0.2 is not impacted by this issue. This issue was reported to OpenSSL on 17th March 2021 by Nokia. The fix was developed by Peter Kästle and Samuel Sapalski from Nokia. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/openssl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/lfs/openssl b/lfs/openssl index a50d686f0..c56c24af0 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -24,7 +24,7 @@ include Config -VER = 1.1.1j +VER = 1.1.1k THISAPP = openssl-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -78,7 +78,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = cccaa064ed860a2b4d1303811bf5c682 +$(DL_FILE)_MD5 = c4e7d95f782b08116afa27b30393dd27 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9a11c96b8a90e6eeb676226553b76307b9abdb47
by Michael Tremer 25 Mar '21

25 Mar '21

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 9a11c96b8a90e6eeb676226553b76307b9abdb47 (commit) from 1ac60db42ef50d5a0b8f2a435432c68759d1d36b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9a11c96b8a90e6eeb676226553b76307b9abdb47 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 25 14:36:34 2021 +0000 openssl: Update to 1.1.1k From https://www.openssl.org/news/secadv/20210325.txt: OpenSSL Security Advisory [25 March 2021] ========================================= CA certificate check bypass with X509_V_FLAG_X509_STRICT (CVE-2021-3450) ======================================================================== Severity: High The X509_V_FLAG_X509_STRICT flag enables additional security checks of the certificates present in a certificate chain. It is not set by default. Starting from OpenSSL version 1.1.1h a check to disallow certificates in the chain that have explicitly encoded elliptic curve parameters was added as an additional strict check. An error in the implementation of this check meant that the result of a previous check to confirm that certificates in the chain are valid CA certificates was overwritten. This effectively bypasses the check that non-CA certificates must not be able to issue other certificates. If a "purpose" has been configured then there is a subsequent opportunity for checks that the certificate is a valid CA. All of the named "purpose" values implemented in libcrypto perform this check. Therefore, where a purpose is set the certificate chain will still be rejected even when the strict flag has been used. A purpose is set by default in libssl client and server certificate verification routines, but it can be overridden or removed by an application. In order to be affected, an application must explicitly set the X509_V_FLAG_X509_STRICT verification flag and either not set a purpose for the certificate verification or, in the case of TLS client or server applications, override the default purpose. OpenSSL versions 1.1.1h and newer are affected by this issue. Users of these versions should upgrade to OpenSSL 1.1.1k. OpenSSL 1.0.2 is not impacted by this issue. This issue was reported to OpenSSL on 18th March 2021 by Benjamin Kaduk from Akamai and was discovered by Xiang Ding and others at Akamai. The fix was developed by Tomáš Mráz. NULL pointer deref in signature_algorithms processing (CVE-2021-3449) ===================================================================== Severity: High An OpenSSL TLS server may crash if sent a maliciously crafted renegotiation ClientHello message from a client. If a TLSv1.2 renegotiation ClientHello omits the signature_algorithms extension (where it was present in the initial ClientHello), but includes a signature_algorithms_cert extension then a NULL pointer dereference will result, leading to a crash and a denial of service attack. A server is only vulnerable if it has TLSv1.2 and renegotiation enabled (which is the default configuration). OpenSSL TLS clients are not impacted by this issue. All OpenSSL 1.1.1 versions are affected by this issue. Users of these versions should upgrade to OpenSSL 1.1.1k. OpenSSL 1.0.2 is not impacted by this issue. This issue was reported to OpenSSL on 17th March 2021 by Nokia. The fix was developed by Peter Kästle and Samuel Sapalski from Nokia. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/{oldcore/100 => core/156}/filelists/openssl | 0 lfs/openssl | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) copy config/rootfiles/{oldcore/100 => core/156}/filelists/openssl (100%) Difference in files: diff --git a/config/rootfiles/core/156/filelists/openssl b/config/rootfiles/core/156/filelists/openssl new file mode 120000 index 000000000..e011a9266 --- /dev/null +++ b/config/rootfiles/core/156/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/lfs/openssl b/lfs/openssl index a50d686f0..c56c24af0 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -24,7 +24,7 @@ include Config -VER = 1.1.1j +VER = 1.1.1k THISAPP = openssl-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -78,7 +78,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = cccaa064ed860a2b4d1303811bf5c682 +$(DL_FILE)_MD5 = c4e7d95f782b08116afa27b30393dd27 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1ac60db42ef50d5a0b8f2a435432c68759d1d36b
by Michael Tremer 25 Mar '21

25 Mar '21

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 1ac60db42ef50d5a0b8f2a435432c68759d1d36b (commit) via a2f77069aa37f93800b10c0071de6bd3bcb3f5b9 (commit) via 92d8c1f73c548c61b0c2a33c76d66c9b917d5122 (commit) via 5f97b190dbe0d23314809925d1a9ecc3f4a7fea4 (commit) from 9823fd82e19693ddd7c5066d46c1769a59277769 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 1ac60db42ef50d5a0b8f2a435432c68759d1d36b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 25 09:22:42 2021 +0000 core156: Ship network-functions.pl Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a2f77069aa37f93800b10c0071de6bd3bcb3f5b9 Author: Leo-Andres Hofmann <hofmann(a)leo-andres.de> Date: Wed Mar 24 17:47:16 2021 +0100 zoneconf.cgi: Avoid unnecessary MAC address changes Ensure that a bridge always has a MAC address configured, to prevent udev/network-hotplug-bridges assigning random addresses at each start. Cache previously generated MAC addresses so that they are not regenerated each time the configuration is saved by the user. Add more comments to existing code. Fixes: #12583 Signed-off-by: Leo-Andres Hofmann <hofmann(a)leo-andres.de> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 92d8c1f73c548c61b0c2a33c76d66c9b917d5122 Author: Leo-Andres Hofmann <hofmann(a)leo-andres.de> Date: Wed Mar 24 17:47:15 2021 +0100 network-functions.pl: Add MAC address compare function Signed-off-by: Leo-Andres Hofmann <hofmann(a)leo-andres.de> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5f97b190dbe0d23314809925d1a9ecc3f4a7fea4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 25 09:17:49 2021 +0000 sysbench: Disable build on armv5tel This package ships a bundled version of luajit and concurrency kit. The latter does not build on this architecture. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/cfgroot/network-functions.pl | 12 ++++++++ config/rootfiles/core/156/filelists/files | 1 + html/cgi-bin/zoneconf.cgi | 47 +++++++++++++++++++++++++++---- lfs/sysbench | 1 + 4 files changed, 55 insertions(+), 6 deletions(-) Difference in files: diff --git a/config/cfgroot/network-functions.pl b/config/cfgroot/network-functions.pl index e94404f05..9908ee8ab 100644 --- a/config/cfgroot/network-functions.pl +++ b/config/cfgroot/network-functions.pl @@ -431,6 +431,18 @@ sub valid_mac($) { return $mac =~ /^([0-9A-Fa-f]{2}[:]){5}([0-9A-Fa-f]{2})$/; } +# Compares two MAC addresses and returns true if they are equal +sub is_mac_equal { + my $mac_1 = uc shift; # convert to upper case + my $mac_2 = uc shift; + + if(valid_mac($mac_1) && valid_mac($mac_2) && ($mac_1 eq $mac_2)) { + return 1; + } + + return 0; +} + sub random_mac { my $address = "02"; diff --git a/config/rootfiles/core/156/filelists/files b/config/rootfiles/core/156/filelists/files index 270153d0c..a86b19a51 100644 --- a/config/rootfiles/core/156/filelists/files +++ b/config/rootfiles/core/156/filelists/files @@ -1,2 +1,3 @@ srv/web/ipfire/cgi-bin/firewall.cgi srv/web/ipfire/cgi-bin/zoneconf.cgi +var/ipfire/network-functions.pl diff --git a/html/cgi-bin/zoneconf.cgi b/html/cgi-bin/zoneconf.cgi index c0d44764f..ad0ec85fa 100644 --- a/html/cgi-bin/zoneconf.cgi +++ b/html/cgi-bin/zoneconf.cgi @@ -195,17 +195,23 @@ foreach (@nics) { ### Evaluate POST parameters ### if ($cgiparams{"ACTION"} eq $Lang::tr{"save"}) { - my %VALIDATE_nic_check = (); - my $VALIDATE_error = ""; + my %VALIDATE_nic_check = (); # array of flags (assigned, restricted/pppoe, vlan, ...) per NIC + my $VALIDATE_error = ""; # contains an error message if the config validation failed # Loop trough all known zones to ensure a complete configuration file is created foreach (@Network::known_network_zones) { my $uc = uc $_; - my $slave_string = ""; + my $slave_string = ""; # list of interfaces attached to the bridge my $zone_mode = $cgiparams{"MODE $uc"}; my $VALIDATE_vlancount = 0; my $VALIDATE_zoneslaves = 0; + # Each zone can contain up to one bridge and up to one VLAN, + # cache their mac addresses to prevent unnecessary changes + my $bridge_mac = $ethsettings{"${uc}_MACADDR"}; + my $vlan_mac = $vlansettings{"${uc}_MAC_ADDRESS"}; + + # Clear old configuration $ethsettings{"${uc}_MACADDR"} = ""; $ethsettings{"${uc}_MODE"} = ""; $ethsettings{"${uc}_SLAVES"} = ""; @@ -236,23 +242,47 @@ if ($cgiparams{"ACTION"} eq $Lang::tr{"save"}) { next; } + # Zone in bridge mode: Always assign a MAC to the bridge + if($zone_mode eq "BRIDGE") { + # Ensure that the bridge's cached MAC does not come from a real NIC + # (this could happen if the zone was in default mode before) + foreach (@nics) { + my $nic_mac = $_->[0]; + if(Network::is_mac_equal($bridge_mac, $nic_mac)) { + $bridge_mac = ""; + last; + } + } + + # Generate random MAC if none was configured + if(! Network::valid_mac($bridge_mac)) { + $bridge_mac = Network::random_mac(); + } + + # Assign the address to the bridge + $ethsettings{"${uc}_MACADDR"} = $bridge_mac; + } + foreach (@nics) { my $mac = $_->[0]; my $nic_access = $cgiparams{"ACCESS $uc $mac"}; next unless ($nic_access); + # This NIC is to be assigned: check preconditions if ($nic_access ne "NONE") { if ($VALIDATE_nic_check{"RESTRICT $mac"}) { # If this interface is already assigned to RED in PPP mode, throw an error $VALIDATE_error = $Lang::tr{"zoneconf val ppp assignment error"}; last; } + # Enforce bridge mode when you try to assign multiple NICs to a zone if ($zone_mode ne "BRIDGE" && $VALIDATE_zoneslaves > 0 && $nic_access ne "") { $VALIDATE_error = $Lang::tr{"zoneconf val zoneslave amount error"}; last; } + # Mark this NIC as "accessed by zone" $VALIDATE_nic_check{"ACC $mac"} = 1; $VALIDATE_zoneslaves++; } @@ -265,6 +295,7 @@ if ($cgiparams{"ACTION"} eq $Lang::tr{"save"}) { $VALIDATE_nic_check{"NATIVE $mac"} = 1; + # Zone in bridge mode: Add NIC to slave list. Otherwise access NIC directly if ($zone_mode eq "BRIDGE") { $slave_string = "${slave_string}${mac} "; } else { @@ -286,14 +317,18 @@ if ($cgiparams{"ACTION"} eq $Lang::tr{"save"}) { last; } - my $rnd_mac = &Network::random_mac(); + # Generate random MAC if none was configured + if(! Network::valid_mac($vlan_mac)) { + $vlan_mac = Network::random_mac(); + } $vlansettings{"${uc}_PARENT_DEV"} = $mac; $vlansettings{"${uc}_VLAN_ID"} = $vlan_tag; - $vlansettings{"${uc}_MAC_ADDRESS"} = $rnd_mac; + $vlansettings{"${uc}_MAC_ADDRESS"} = $vlan_mac; # Generated MAC + # Zone in bridge mode: Add VLAN to slave list if ($zone_mode eq "BRIDGE") { - $slave_string = "${slave_string}${rnd_mac} "; + $slave_string = "${slave_string}${vlan_mac} "; } $VALIDATE_vlancount++; # We can't allow more than one VLAN per zone diff --git a/lfs/sysbench b/lfs/sysbench index ff9478d28..f39fd45df 100644 --- a/lfs/sysbench +++ b/lfs/sysbench @@ -16,6 +16,7 @@ DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) +SUP_ARCH = x86_64 i586 aarch64 PROG = sysbench PAK_VER = 2 hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM March 2021