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

commit 4e24418705464a159d9618e474b37d44d251d467 Author: Peter Müller peter.mueller@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@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit ad173413e368afdbc70ea537bec4cfa8f091635a Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Mar 29 10:31:34 2021 +0000

core156: Ship suricata

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

commit 395513f525f46659a1587d37c0a82cdcbd79547e Author: Matthias Fischer matthias.fischer@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@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 8ada7e9b513753c01867c05821c6d21a3bd18d6b Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Mar 29 10:28:40 2021 +0000

core156: Ship header.pl

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

commit 9db81dc9d410a5de240711cd3b8c8e4eca086bfe Author: Leo-Andres Hofmann hofmann@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@leo-andres.de Reviewed-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit e3e38ee6111aa21541da49727c49ee7b0ef3b447 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Mar 29 10:27:53 2021 +0000

core156: Drop snortupdateutility.js

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

commit 6c958adf2f2a115004fe6c3c5ab698f99c80e23b Author: Leo-Andres Hofmann hofmann@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@leo-andres.de Acked-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@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@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-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