Development August 2024

development@lists.ipfire.org

9 participants
57 discussions

[PATCH] libnet: Update to version 1.3
by Adolf Belka 09 Aug '24

09 Aug '24

- Update from version 1.1.6 to 1.3 - Update of rootfile - sobump gives suricata and arping as dependencies so those packages also need to be shipped. - Changelog 1.3 ### Changes - License change of critical files from 4-clause BSD to 3-clause and 2-clause BSD. This fixes issue #85: "GPL license compatibility". - Migrate from Travis-CI (Linux) and Appveyor (Win32) to GitHub Actions - Win32 changes: - switch to npcap from winpcap - Simplify and update build scripts - Encode version in DLL instead of in filename - Add support for LLDP, mandatory TLVs. - Add support for Cisco UniDirectional Link Detection (UDLD), RFC5171 - Initial support for unit tests: - `libnet-build_ethernet()` - Complete UDLD API tests - Initial "devcontainer": provide VS Code development environment for rapid setup of a development environment - Run unit tests in GitHub Actions - New GitHub Action for FreeBSD 13 clang/gcc - Calling `libnet_init()` with a RAW type no longer sets a TX buffer max size. Use the new `libnet_setfd_max_sndbuf()` instead when needed. - Remove support for `SOCK_PACKET` sockets causing invalid builds on, e.g., musl libc. We assume everyone on Linux has `PF_PACKET` now. ### Fixes - Fix #139: fail-to-build-from-source on FreeBSD - Fix #122: unused parameter warnings - Fix #123: potential memory leak in `libnet_cq_add()` - Fix #124: potential name conflict with C++ keyword `new` - Fix #96: pointer type warnings when dumping raw data with `%p` - Fix #97: non-standard types: - `int64_t` instead of `__int64_t` for mingw cross build - `uint32_t` instead of `u_int` and `uint16_t` instead of `u_short` - Fix #98: lots of signed vs unsigned comparisons - Fix #102: possible buffer overflows in `libnet_plist_chain_dump_string()` - Reproducible build fixes for man-page generation, use LC_ALL=C and UTC - Simplify `fixmanpages` - Fix #120: possible NULL pointer dereference in `libnet_cq_add()` - Fix #120: memory leak in `libnet_plist_chain_new()` - Fix segmentation fault in `libnet_ifaddrlist()` - Fix #150: segfault when number of IPs > 512 1.2 ### Changes - Removed Lua bindings from repo and dist files, now available separately - Removed generated HTML and Nroff (man pages) documentation files, must be regenerated with Doxygen using `make doc` - Add `pkg-config` support with `libnet.pc`, replaces `libnet-config` tool, although it is kept for compatibility for now - Factorize socket setup code for socket opening to provide output device selection for IPv4 - Make `libnet_get_hwaddr()` work with 802.1q interfaces in bpf (BSD) - New API for OSPF HELLO messages, with neighbor ### Fixes - Use `getifaddrs()` on OpnBSD and Linux - For samples, `netinet/in.h` is not on windows - Fix errors with missing `IPPROTO_MH` on windows - Fix build error on Mac OS X - Fix #34 checksum caculation when IPv6 extension headers being used - Remove unneeded trailing `-Wl` from `-version-info` line - `libnet_build_snmp()` fix warning - Use `LIBNET_*RESOLVE` const in `libnet_name2addr*` - Fix i486 sample synflood6 warning - Some samples need `#include<netinet/in.h>` for `IPPROTO_*` on OpenBSD 5.2 - Fix gcc warnings - Check for `socklen_t`. Suggested by g.esp and Stefanos Harhalakis - libnet: update for obsolete INCLUDE directive - Fix warning inside comment - Automatic link options `#pragma comment(lib, ...)` are only for MSVC - Fix several warnings for MS C/C++ compiler - `libnet_open_raw4()` doesn't return a SOCKET on win32 - Fixes error messages sometimes include newline, sometimes not - Properly set `l->err_buf` if `libnet_ifaddrlist()` fails - dlpi: Try harder to find the device for the interface - dlpi: Correctly extract unit number from devices with numbers in their name - Make interface selection work for interfaces with multiple addresses - Fix memory leak, device list needs to freed after use - Fix file descriptor leak in `libnet_ifaddrlist()` - Fix `libnet_get_hwaddr()` for large(!) number of interfaces - Fix to support musl libc, removes support for GLIBC <2.1 - Fix win32 buffer overrun in `libnet_get_ipaddr4()` - Interface selection was ignoring interfaces with IPv6 - Use `LIBNET_API` on public functions, instead of an export file - Add Visual Studio 2010 project files, with build instructions - Define INET6 on IRIX, making libnet compile cleanly - Check for FreeBSD pre-11 before enabling `LIBNET_BSD_BYTE_SWAP` - Use `LIBNET_BSDISH_OS` and `LIBNET_BSD_BYTE_SWAP` on Darwin - Add BSD byteswap for Darwin. Otherwise `sendto(` returns `EINVAL` - `netinet/in.h` is needed for `IPPROTO_` and `sockaddr_in` Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/common/libnet | 14 ++++++++------ lfs/libnet | 9 +++++---- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/config/rootfiles/common/libnet b/config/rootfiles/common/libnet index ffa20fd0e..07d741391 100644 --- a/config/rootfiles/common/libnet +++ b/config/rootfiles/common/libnet @@ -9,9 +9,11 @@ #usr/include/libnet/libnet-types.h #usr/lib/libnet.a #usr/lib/libnet.la -usr/lib/libnet.so -usr/lib/libnet.so.1 -usr/lib/libnet.so.1.7.0 -#usr/share/man/man3/libnet-functions.h.3 -#usr/share/man/man3/libnet-macros.h.3 -#usr/share/man/man3/libnet.h.3 +#usr/lib/libnet.so +usr/lib/libnet.so.9 +usr/lib/libnet.so.9.0.0 +#usr/lib/pkgconfig/libnet.pc +#usr/share/doc/libnet +#usr/share/doc/libnet/ChangeLog.md +#usr/share/doc/libnet/LICENSE +#usr/share/doc/libnet/README.md diff --git a/lfs/libnet b/lfs/libnet index 7768d9fae..7f44f2f1e 100644 --- a/lfs/libnet +++ b/lfs/libnet @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 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.1.6 +VER = 1.3 THISAPP = libnet-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 328ff98701fc19dc4f717e47ad5bc490741b248588eadc196de16b66ffa2df27ce58105c704d640fa6d93ba254259d4e90d03babdb33fc0f1f0e2b18ed448c4b +$(DL_FILE)_BLAKE2 = b43f15143e6a1de3350b814d7acd4a41d61eb08e6dfeb729868e55f65c445942ae52905953f3a4fad00402b47fc5119634233ea3ae28806c1869bb34ef6fba9b install : $(TARGET) @@ -71,7 +71,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && ./configure \ + --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) -- 2.45.2

1 0

[PATCH 1/2] libgcrypt: Update to version 1.11.0
by Adolf Belka 09 Aug '24

09 Aug '24

- Update from version 1.10.3 to 1.11.0 - Update of rootfile - Update of libgcrypt requires an update of netatalk as old version will not build with libgcrypt-1.11.0 - Changelog 1.11.0 * New and extended interfaces: - Add an API for Key Encapsulation Mechanism (KEM). [T6755] - Add Streamlined NTRU Prime sntrup761 algorithm. [rCcf9923e1a5] - Add Kyber algorithm according to FIPS 203 ipd 2023-08-24. [rC18e5c0d268] - Add Classic McEliece algorithm. [rC003367b912] - Add One-Step KDF with hash and MAC. [T5964] - Add KDF algorithm HKDF of RFC-5869. [T5964] - Add KDF algorithm X963KDF for use in CMS. [rC3abac420b3] - Add GMAC-SM4 and Poly1305-SM4. [rCd1ccc409d4] - Add ARIA block cipher algorithm. [rC316c6d7715] - Add explicit FIPS indicators for MD and MAC algorithms. [T6376] - Add support for SHAKE as MGF in RSA. [T6557] - Add gcry_md_read support for SHAKE algorithms. [T6539] - Add gcry_md_hash_buffers_ext function. [T7035] - Add cSHAKE hash algorithm. [rC065b3f4e02] - Support internal generation of IV for AEAD cipher mode. [T4873] * Performance: - Add SM3 ARMv8/AArch64/CE assembly implementation. [rCfe891ff4a3] - Add SM4 ARMv8/AArch64 assembly implementation. [rCd8825601f1] - Add SM4 GFNI/AVX2 and GFI/AVX512 implementation. [rC5095d60af4,rCeaed633c16] - Add SM4 ARMv9 SVE CE assembly implementation. [rC2dc2654006] - Add PowerPC vector implementation of SM4. [rC0b2da804ee] - Optimize ChaCha20 and Poly1305 for PPC P10 LE. [T6006] - Add CTR32LE bulk acceleration for AES on PPC. [rC84f2e2d0b5] - Add generic bulk acceleration for CTR32LE mode (GCM-SIV) for SM4 and Camellia. [rCcf956793af] - Add GFNI/AVX2 implementation of Camellia. [rC4e6896eb9f] - Add AVX2 and AVX512 accelerated implementations for GHASH (GCM) and POLYVAL (GCM-SIV). [rCd857e85cb4, rCe6f3600193] - Add AVX512 implementation for SHA512. [rC089223aa3b] - Add AVX512 implementation for Serpent. [rCce95b6ec35] - Add AVX512 implementation for Poly1305 and ChaCha20 [rCcd3ed49770, rC9a63cfd617] - Add AVX512 accelerated implementation for SHA3 and Blake2 [rCbeaad75f46,rC909daa700e] - Add VAES/AVX2 accelerated i386 implementation for AES. [rC4a42a042bc] - Add bulk processing for XTS mode of Camellia and SM4. [rC32b18cdb87, rCaad3381e93] - Accelerate XTS and ECB modes for Twofish and Serpent. [rCd078a928f5,rC8a1fe5f78f] - Add AArch64 crypto/SHA512 extension implementation for SHA512. [rCe51d3b8330] - Add AArch64 crypto-extension implementation for Camellia. [rC898c857206] - Accelerate OCB authentication on AMD with AVX2. [rC6b47e85d65] * Bug fixes: - For PowerPC check for missing optimization level for vector register usage. [T5785] - Fix EdDSA secret key check. [T6511] - Fix decoding of PKCS#1-v1.5 and OAEP padding. [rC34c2042792] - Allow use of PKCS#1-v1.5 with SHA3 algorithms. [T6976] - Fix AESWRAP padding length check. [T7130] * Other: - Allow empty password for Argon2 KDF. [rCa20700c55f] - Various constant time operation imporvements. - Add "bp256", "bp384", "bp512" aliases for Brainpool curves. - Support for the random server has been removed. [T5811] - The control code GCRYCTL_ENABLE_M_GUARD is deprecated and not supported any more. Please use valgrind or other tools. [T5822] - Logging is now done via the libgpg-error logging functions. [rCab0bdc72c7] Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/common/libgcrypt | 3 +-- lfs/libgcrypt | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/common/libgcrypt b/config/rootfiles/common/libgcrypt index f08cf1db3..d00f191b7 100644 --- a/config/rootfiles/common/libgcrypt +++ b/config/rootfiles/common/libgcrypt @@ -1,12 +1,11 @@ #usr/bin/dumpsexp #usr/bin/hmac256 -#usr/bin/libgcrypt-config #usr/bin/mpicalc #usr/include/gcrypt.h #usr/lib/libgcrypt.la #usr/lib/libgcrypt.so usr/lib/libgcrypt.so.20 -usr/lib/libgcrypt.so.20.4.3 +usr/lib/libgcrypt.so.20.5.0 #usr/lib/pkgconfig/libgcrypt.pc #usr/share/aclocal/libgcrypt.m4 #usr/share/info/gcrypt.info diff --git a/lfs/libgcrypt b/lfs/libgcrypt index dfd7a9a2f..341683bfb 100644 --- a/lfs/libgcrypt +++ b/lfs/libgcrypt @@ -24,7 +24,7 @@ include Config -VER = 1.10.3 +VER = 1.11.0 THISAPP = libgcrypt-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 1a228e02820e886016eb55dee75936c4422a15fb4f95a2f9bcd1e4faac4015d4321c7c8d23f164eb08ece5d62935ab3b3d3104eabfdd22db997ab3e5689dfa6f +$(DL_FILE)_BLAKE2 = fe3f42480c0b9a0c50c24f4c54197404b4e1056d8baa9c0c07c671c9c05b90777580b4cbcde931b50ecb4dd93f5ddad89cea99aa36a35f86f796a003e3816f7d install : $(TARGET) -- 2.45.2

1 1

[PATCH] libcap-ng: Update to version 0.8.5
by Adolf Belka 09 Aug '24

09 Aug '24

- Update from version 0.8.3 to 0.8.5 - Update of rootfile not required - Changelog 0.8.5 - Remove python global exception handler since it's deprecated - Make the utilities link against just built libraries - Remove unused macro in cap-ng.h 0.8.4 - In capng_change_id, clear PR_SET_KEEPCAPS if returning an error - pscap: add -p option for reporting a specified process (Masatake Yamato) - Annotate function prototypes to warn if results are unused - Drop python2 support Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- lfs/libcap-ng | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/libcap-ng b/lfs/libcap-ng index 1bf9945c4..8bd5ba6fb 100644 --- a/lfs/libcap-ng +++ b/lfs/libcap-ng @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 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 = 0.8.3 +VER = 0.8.5 THISAPP = libcap-ng-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = c54dd753e0ef6dd21bcf6af7b003f85ded9faf2fbf1ea834cda6b181b165ff4b11a0284c23c73d0e6f97a810b3e6a63fceeb57ff583a2b32f23924bdee597ef5 +$(DL_FILE)_BLAKE2 = ce0fc4ebceaa66d6f888f8b752e501bed7513d45231425054340016a6215ce52f0cd81b3a4a54c7c9ec0b623965002d66316c6c37844f0bd132b186ff7c6a41f install : $(TARGET) -- 2.45.2

1 3

[PATCH] backup.pl: Fixes bug13734 - tar treats colon in filename as remote location
by Adolf Belka 08 Aug '24

08 Aug '24

- When a user tries to restore on the console from a backup on IPFire that has a colon in the filename the tar treats this as meaning that everything after the colon is information about a remote location to do the extraction to. This results in a filename that cannot be found, and a remote location that is not correct and the tar operation fails. - This has been confirmed by myself. - If the user tries a restore from a file downloaded to another computer then for most, if not all browsers, the colon will have been replaced by an underscore or other character. Firefox, Chromium and Vivaldi do this. - So any backup file that is selected to be restored using the WUI will no longer have a colon in the filename. - This patch adds --force-local to the tar command, which means that tar will treat the colon as a character in the filename. This will ensure that if a user has any backup files stored on their IPFire system, with a colon in the filename then doing a restore from this file will not cause tar to fail. - The NOW variable is also changed to replace the colon by a dash and to separate the date and time by an underscore. This filename will be accepted by browsers, without doing any replacements. Tested out with Firefox, Chromium & Vivaldi. - The above ensures that both the new and old filename versions will work for doing a restore. Fixes: bug13734 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/backup/backup.pl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/config/backup/backup.pl b/config/backup/backup.pl index d848084e9..7b2f95304 100644 --- a/config/backup/backup.pl +++ b/config/backup/backup.pl @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 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 # @@ -21,7 +21,7 @@ shopt -s nullglob -NOW="$(date "+%Y-%m-%d-%H:%M")" +NOW="$(date "+%Y-%m-%d_%H-%M")" list_addons() { local file @@ -82,7 +82,8 @@ restore_backup() { # Extract backup if ! tar xvzpf "${filename}" -C / \ --exclude-from="/var/ipfire/backup/exclude" \ - --exclude-from="/var/ipfire/backup/exclude.user"; then + --exclude-from="/var/ipfire/backup/exclude.user" \ + --force-local; then echo "Could not extract backup" >&2 return 1 fi -- 2.45.2

3 3

[PATCH] libarchive: Update to version 3.7.4
by Adolf Belka 08 Aug '24

08 Aug '24

- Update from version 3.7.0 to 3.7.4 - Update of rootfile - CVE fix in 3.7.4 - Changelog 3.7.4 Security fixes: rar: Fix OOB in rar e8 filter (#2135) (CVE-2024-26256) zip: Fix out of boundary access (#2145) Important bugfixes: 7zip: Limit amount of properties (#2131) bsdtar: Fix error handling around strtol() usages (#2110) passphrase: Improve newline handling on Windows (#2115) passphrase: Never allow empty passwords (#2116) rar: Fix "File CRC Error" when extracting specific rar4 archives (#2124) xar: Avoid infinite link loop (#2123) zip: Update AppleDouble support for directories (#2108) zstd: Implement core detection (#2083, #2071) 3.7.3 New features: PCRE2 support (#2031) add trailing letter b to bsdtar(1) substitute pattern (#2012) add support for long options "--group" and "--owner" to tar(1) (#2054) Security fixes: Fix possible vulnerability in tar error reporting introduced in f27c173 (#2101) Important bugfixes: ISO9660: preserve the natural order of links (#1974) rar5: fix decoding unicode filenames on Windows (#1978) rar5: fix infinite loop if during rar5 decompression the last block produced no data (#2105) xz filter: fix incorrect eof at the end of an lzip member (#2027) zip: fix end-of-data marker processing when decompressing zip archives (#2042) multiple bsdunzip(1) fixes (#2022, #2030) filetime truncation fix on Windows (#2050) 3.7.2 Security fixes: Multiple vulnerabilities have been fixed in the PAX writer (1b4e0d0) Important bugfixes: bsdunzip(1) now correctly handles arguments following an -x after the zipfile New features: bsdunzip(1) now supports the "--version" flag 7-zip reader now translates Windows permissions into UNIX permissions (#1943) uudecode filter in raw mode now supports file name and file mode zstd filter now supports the "long" write option (#1962) 3.7.1 Security fixes: SEGV and stack buffer overflow in verbose mode of cpio (#1934, #1935) Feature updates: bsdunzip updated to match latest upstream code (#1926) Important bugfixes: miscellaneous functional bugfixes (#1731, #1929, #1930) build fixes on multiple platforms (Android #1921, older MacOS X #1919, #1933 and others) Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/common/libarchive | 2 +- lfs/libarchive | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/config/rootfiles/common/libarchive b/config/rootfiles/common/libarchive index 81089e9e2..2f38c29a7 100644 --- a/config/rootfiles/common/libarchive +++ b/config/rootfiles/common/libarchive @@ -7,7 +7,7 @@ #usr/lib/libarchive.la #usr/lib/libarchive.so usr/lib/libarchive.so.13 -usr/lib/libarchive.so.13.7.0 +usr/lib/libarchive.so.13.7.4 #usr/lib/pkgconfig/libarchive.pc #usr/share/man/man1/bsdcat.1 #usr/share/man/man1/bsdcpio.1 diff --git a/lfs/libarchive b/lfs/libarchive index 91041023b..668f2a87e 100644 --- a/lfs/libarchive +++ b/lfs/libarchive @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 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 = 3.7.0 +VER = 3.7.4 THISAPP = libarchive-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -41,7 +41,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 8fb72a0504038c71584c0416c1d747b7f5c82266518704353e7fdf794bd9f9e2dc22b8fa2538fa8d12a3b9776581077040371d25647fe72c02a4ec5f3bb8d950 +$(DL_FILE)_BLAKE2 = 128f72235da61e112201046c0cfe62a8c580cf73b426c4cfe270ae913356f6ad430ba33a663dcd617b082c7baf45ada8d1c9928c45fea16fd57e8020693a60bc install : $(TARGET) @@ -74,7 +74,9 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --disable-static + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --disable-static cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) -- 2.45.2

1 1

Re: The unshared changes give a problem with build after doing git pull on next
by Michael Tremer 08 Aug '24

08 Aug '24

Hello, We should not touch the mount propagation of the host’s namespace. Instead, we should create our own mount namespace and that should be private. You can however try to see what happens when you add —-propagation=slave to the first unshare command. I just installed the plain Ubuntu Server, installed git, checkout out the repository, downloaded the toolchain and ran the build. -Michael > On 3 Aug 2024, at 12:22, Matthias Fischer <matthias.fischer(a)ipfire.org> wrote: > > On 03.08.2024 10:54, Michael Tremer wrote: >> Hello Matthias, > > Hi Michael, > > just looked through https://man7.org/linux/man-pages/man1/unshare.1.html > and ran 'findmnt -o+PROPAGATION' (see attachment). > > I don't know if this could help but does this differ from your test > installation? > > Best > Matthias > >>> On 3 Aug 2024, at 08:47, Matthias Fischer <matthias.fischer(a)ipfire.org> wrote: >>> >>> Hi Michael, >>> >>> [shortened some stuff] >>> >>> ... >>> >>>>>>> >>>>>>> Being curious I tried to build 'next', but I always get the same error: >>>>>>> >>>>>>> ***SNIP*** >>>>>>> root@Devel64-1: /git/ipfire-2.x # ./make.sh build >>>>>>> Packaged toolchain compilation >>>>>>> Building IPFire >>>>>>> stage2 >>>>>>> Jul 26 13:32:59: Building stage2 unshare: cannot change >>>>>>> /git/ipfire-2.x/build_x86_64/proc filesystem propagation: Invalid argument >>> >>>>>> ... >>> >>>> It looks like you can simply update the kernel staying on the same release: >>>> >>>> https://ubuntu.com/security/livepatch/docs/livepatch/reference/kernels >>>> >>>> For 22.04 LTS, there is a Linux 6.8 image available. >>>> >>>> Could you check that and confirm that it fixes the mount propagation problem? >>> >>> Done. >>> >>> Current state is as follows: >>> >>> ***SNIP*** >>> ... >>> root@Devel64-1: /git/ipfire-2.x # lsb_release -a >>> No LSB modules are available. >>> Distributor ID: Ubuntu >>> Description: Ubuntu 22.04.4 LTS >>> Release: 22.04 >>> Codename: jammy >>> ... >>> root@Devel64-1: /git/ipfire-2.x # uname -mrs >>> Linux 6.8.0-39-generic x86_64 >>> ... >>> ***SNAP*** >>> >>> But when I try to build 'next' I get exactly the same error as >>> before: >>> >>> ***SNIP*** >>> root@Devel64-1: /git/ipfire-2.x # ./make.sh build >>> Packaged toolchain compilation >>> Building IPFire >>> stage2 >>> Aug 2 21:21:15: Building stage2 unshare: cannot change >>> /git/ipfire-2.x/build_x86_64/proc filesystem propagation: Invalid argument >> >> Ah, this is good information. So it is not the kernel, it rather is Ubuntu handling something differently. >> >> I will have a look at this and get back to you. >> >>> ERROR: Downloading stage2 >>> [ FAIL ] >>> Check /git/ipfire-2.x/log_x86_64/_build.ipfire.log for errors if >>> applicable [ FAIL ] >>> ***SNAP*** >>> >>> Being curious, I commented line line 633 in 'make.sh' >>> ("--mount-proc=${BUILD_DIR}/proc") => Building starts but fails during >>> 'glib 2.77.0': >>> >>> ***SNIP*** >>> ... >>> glib (2.77.0) >>> [ 1:14 ][0/1011] >>> >>> [951/1374] Compiling C object gio/gio.p/gio-tool-tree.c.o >>> [952/1374] Linking target gio/gio >>> [953/1374] Compiling C object >>> gio/gio-querymodules.p/gio-querymodules.c.o >>> [954/1374] Linking target gio/gio-querymodules >>> [955/1374] Compiling C object gio/gresource.p/gresource-tool.c.o >>> [956/1374] Compiling C object >>> gio/glib-compile-schemas.p/.._subprojects_gvdb_gvdb_gvdb-reader.c.o >>> [957/1374] Linking target gio/gresource >>> [958/1374] Compiling C object >>> gio/glib-compile-schemas.p/.._subprojects_gvdb_gvdb_gvdb-builder.c.o >>> [959/1374] Compiling C object >>> gio/glib-compile-resources.p/.._subprojects_gvdb_gvdb_gvdb-reader.c.o >>> [960/1374] Compiling C object >>> gio/glib-compile-resources.p/.._subprojects_gvdb_gvdb_gvdb-builder.c.o >>> [961/1374] Compiling C object >>> gio/glib-compile-resources.p/glib-compile-resources.c.o >>> [962/1374] Linking target gio/glib-compile-resources >>> [963/1374] Compiling C object >>> gio/tests/modules/libtestmodulea.so.p/test-module-a.c.o >>> [964/1374] Compiling C object gio/gapplication.p/gapplication-tool.c.o >>> [965/1374] Compiling C object gio/gsettings.p/gsettings-tool.c.o >>> [966/1374] Linking target gio/tests/modules/libtestmodulea.so >>> [967/1374] Generating gio/tests/plugin-resources.c with a custom command >>> FAILED: gio/tests/plugin-resources.c >>> /usr/src/glib-2.77.0/builddir/gio/glib-compile-resources >>> --compiler=gcc --target=gio/tests/plugin-resources.c --sour >>> cedir=/usr/src/glib-2.77.0/gio/tests --internal --generate-source >>> --c-name _g_plugin ../gio/tests/test4.gresource.xml >>> /usr/src/glib-2.77.0/builddir/gio/glib-compile-resources: error >>> while loading shared libraries: libgio-2.0.so.0: can >>> not open shared object file: No such file or directory >>> [968/1374] Linking target gio/gapplication >>> [969/1374] Compiling C object >>> gio/glib-compile-schemas.p/glib-compile-schemas.c.o >>> [970/1374] Linking target gio/gsettings >>> [971/1374] Compiling C object >>> gio/tests/modules/libtestmoduleb.so.p/test-module-b.c.o >>> [972/1374] Compiling C object >>> gio/tests/gdbus-overflow.p/gdbus-overflow.c.o >>> [973/1374] Compiling C object gio/gdbus.p/gdbus-tool.c.o >>> [974/1374] Compiling C object >>> gio/tests/gdbus-object-manager-example/libgdbus-example-objectmanager.so.p/meson-gener >>> ated_.._objectmanager-gen.c.o >>> ninja: build stopped: subcommand failed. >>> make: *** [glib:75: /usr/src/log/glib-2.77.0] Error 1 >>> make: Leaving directory '/usr/src/lfs' >>> >>> ERROR: Building glib >>> [ FAIL ] >>> Check /git/ipfire-2.x/log_x86_64/_build.ipfire.log for errors if >>> applicable [ FAIL ] >>> ***SNAP*** >>> >>> Best >>> Matthias >>

2 3

Fwd: The unshared changes give a problem with build after doing git pull on next
by Matthias Fischer 08 Aug '24

08 Aug '24

Again - I only hit "Reply" not "Reply all"... -------- Forwarded Message -------- Subject: Re: The unshared changes give a problem with build after doing git pull on next Date: Thu, 8 Aug 2024 14:06:24 +0200 From: Matthias Fischer <matthias.fischer(a)ipfire.org> To: Michael Tremer <michael.tremer(a)ipfire.org> Hi, ok - please don't laugh. I did something completely different... I added the following to 'make.sh': ***SNIP*** diff --git a/make.sh b/make.sh index 922fc4b4c..212256ab1 100755 --- a/make.sh +++ b/make.sh @@ -662,6 +662,11 @@ execute() { # If unshare is asked to terminate, terminate all child processes "--kill-child" ) + +mount --bind ${BUILD_DIR}/proc ${BUILD_DIR}/proc + +mount --make-rslave ${BUILD_DIR}/proc + fi while [ $# -gt 0 ]; do ***SNAP*** No 'invalid argument' error anymore. I don't know why - but with this patch the build is running... Any comments? Best Matthias On 06.08.2024 17:40, Michael Tremer wrote: > Hello, > > We should not touch the mount propagation of the host’s namespace. > > Instead, we should create our own mount namespace and that should be private. > > You can however try to see what happens when you add —-propagation=slave to the first unshare command. > > I just installed the plain Ubuntu Server, installed git, checkout out the repository, downloaded the toolchain and ran the build. > > -Michael > >> On 3 Aug 2024, at 12:22, Matthias Fischer <matthias.fischer(a)ipfire.org> wrote: >> >> On 03.08.2024 10:54, Michael Tremer wrote: >>> Hello Matthias, >> >> Hi Michael, >> >> just looked through https://man7.org/linux/man-pages/man1/unshare.1.html >> and ran 'findmnt -o+PROPAGATION' (see attachment). >> >> I don't know if this could help but does this differ from your test >> installation? >> >> Best >> Matthias >> >>>> On 3 Aug 2024, at 08:47, Matthias Fischer <matthias.fischer(a)ipfire.org> wrote: >>>> >>>> Hi Michael, >>>> >>>> [shortened some stuff] >>>> >>>> ... >>>> >>>>>>>> >>>>>>>> Being curious I tried to build 'next', but I always get the same error: >>>>>>>> >>>>>>>> ***SNIP*** >>>>>>>> root@Devel64-1: /git/ipfire-2.x # ./make.sh build >>>>>>>> Packaged toolchain compilation >>>>>>>> Building IPFire >>>>>>>> stage2 >>>>>>>> Jul 26 13:32:59: Building stage2 unshare: cannot change >>>>>>>> /git/ipfire-2.x/build_x86_64/proc filesystem propagation: Invalid argument >>>> >>>>>>> ... >>>> >>>>> It looks like you can simply update the kernel staying on the same release: >>>>> >>>>> https://ubuntu.com/security/livepatch/docs/livepatch/reference/kernels >>>>> >>>>> For 22.04 LTS, there is a Linux 6.8 image available. >>>>> >>>>> Could you check that and confirm that it fixes the mount propagation problem? >>>> >>>> Done. >>>> >>>> Current state is as follows: >>>> >>>> ***SNIP*** >>>> ... >>>> root@Devel64-1: /git/ipfire-2.x # lsb_release -a >>>> No LSB modules are available. >>>> Distributor ID: Ubuntu >>>> Description: Ubuntu 22.04.4 LTS >>>> Release: 22.04 >>>> Codename: jammy >>>> ... >>>> root@Devel64-1: /git/ipfire-2.x # uname -mrs >>>> Linux 6.8.0-39-generic x86_64 >>>> ... >>>> ***SNAP*** >>>> >>>> But when I try to build 'next' I get exactly the same error as >>>> before: >>>> >>>> ***SNIP*** >>>> root@Devel64-1: /git/ipfire-2.x # ./make.sh build >>>> Packaged toolchain compilation >>>> Building IPFire >>>> stage2 >>>> Aug 2 21:21:15: Building stage2 unshare: cannot change >>>> /git/ipfire-2.x/build_x86_64/proc filesystem propagation: Invalid argument >>> >>> Ah, this is good information. So it is not the kernel, it rather is Ubuntu handling something differently. >>> >>> I will have a look at this and get back to you. >>> >>>> ERROR: Downloading stage2 >>>> [ FAIL ] >>>> Check /git/ipfire-2.x/log_x86_64/_build.ipfire.log for errors if >>>> applicable [ FAIL ] >>>> ***SNAP*** >>>> >>>> Being curious, I commented line line 633 in 'make.sh' >>>> ("--mount-proc=${BUILD_DIR}/proc") => Building starts but fails during >>>> 'glib 2.77.0': >>>> >>>> ***SNIP*** >>>> ... >>>> glib (2.77.0) >>>> [ 1:14 ][0/1011] >>>> >>>> [951/1374] Compiling C object gio/gio.p/gio-tool-tree.c.o >>>> [952/1374] Linking target gio/gio >>>> [953/1374] Compiling C object >>>> gio/gio-querymodules.p/gio-querymodules.c.o >>>> [954/1374] Linking target gio/gio-querymodules >>>> [955/1374] Compiling C object gio/gresource.p/gresource-tool.c.o >>>> [956/1374] Compiling C object >>>> gio/glib-compile-schemas.p/.._subprojects_gvdb_gvdb_gvdb-reader.c.o >>>> [957/1374] Linking target gio/gresource >>>> [958/1374] Compiling C object >>>> gio/glib-compile-schemas.p/.._subprojects_gvdb_gvdb_gvdb-builder.c.o >>>> [959/1374] Compiling C object >>>> gio/glib-compile-resources.p/.._subprojects_gvdb_gvdb_gvdb-reader.c.o >>>> [960/1374] Compiling C object >>>> gio/glib-compile-resources.p/.._subprojects_gvdb_gvdb_gvdb-builder.c.o >>>> [961/1374] Compiling C object >>>> gio/glib-compile-resources.p/glib-compile-resources.c.o >>>> [962/1374] Linking target gio/glib-compile-resources >>>> [963/1374] Compiling C object >>>> gio/tests/modules/libtestmodulea.so.p/test-module-a.c.o >>>> [964/1374] Compiling C object gio/gapplication.p/gapplication-tool.c.o >>>> [965/1374] Compiling C object gio/gsettings.p/gsettings-tool.c.o >>>> [966/1374] Linking target gio/tests/modules/libtestmodulea.so >>>> [967/1374] Generating gio/tests/plugin-resources.c with a custom command >>>> FAILED: gio/tests/plugin-resources.c >>>> /usr/src/glib-2.77.0/builddir/gio/glib-compile-resources >>>> --compiler=gcc --target=gio/tests/plugin-resources.c --sour >>>> cedir=/usr/src/glib-2.77.0/gio/tests --internal --generate-source >>>> --c-name _g_plugin ../gio/tests/test4.gresource.xml >>>> /usr/src/glib-2.77.0/builddir/gio/glib-compile-resources: error >>>> while loading shared libraries: libgio-2.0.so.0: can >>>> not open shared object file: No such file or directory >>>> [968/1374] Linking target gio/gapplication >>>> [969/1374] Compiling C object >>>> gio/glib-compile-schemas.p/glib-compile-schemas.c.o >>>> [970/1374] Linking target gio/gsettings >>>> [971/1374] Compiling C object >>>> gio/tests/modules/libtestmoduleb.so.p/test-module-b.c.o >>>> [972/1374] Compiling C object >>>> gio/tests/gdbus-overflow.p/gdbus-overflow.c.o >>>> [973/1374] Compiling C object gio/gdbus.p/gdbus-tool.c.o >>>> [974/1374] Compiling C object >>>> gio/tests/gdbus-object-manager-example/libgdbus-example-objectmanager.so.p/meson-gener >>>> ated_.._objectmanager-gen.c.o >>>> ninja: build stopped: subcommand failed. >>>> make: *** [glib:75: /usr/src/log/glib-2.77.0] Error 1 >>>> make: Leaving directory '/usr/src/lfs' >>>> >>>> ERROR: Building glib >>>> [ FAIL ] >>>> Check /git/ipfire-2.x/log_x86_64/_build.ipfire.log for errors if >>>> applicable [ FAIL ] >>>> ***SNAP*** >>>> >>>> Best >>>> Matthias >>> > > >

1 0

Fwd: The unshared changes give a problem with build after doing git pull on next
by Matthias Fischer 08 Aug '24

08 Aug '24

Sorry, I forgot to send this to the list... -------- Forwarded Message -------- Subject: Re: The unshared changes give a problem with build after doing git pull on next Date: Wed, 7 Aug 2024 13:45:28 +0200 From: Matthias Fischer <matthias.fischer(a)ipfire.org> To: Michael Tremer <michael.tremer(a)ipfire.org> On 06.08.2024 17:40, Michael Tremer wrote: > Hello, Hi, > We should not touch the mount propagation of the host’s namespace. > > Instead, we should create our own mount namespace and that should be private. > > You can however try to see what happens when you add —-propagation=slave to the first unshare command. [Where exactly is the "first unshare command"? Looking at the code, the first occurence is at line 639ff. But line 646 already reads "--propagation=slave" so I didn't change it...] I then tried several things. I did not pay attention to whether these tests were useful in this context - I only tested: First: both machines are still running without any problems as long as don't try to build 'next'. ;-) Hm. So I tested the 'unshare' commands that are executed from line 642 onwards step by step. Interesting: no seen problems, cursor just jumps to the next line... Before and after I ran that "findmnt -o+PROPAGATION" command - see attachments. Useful? I don't know... But even the complete command ran without any errors: unshare --cgroup --mount --propagation=slave --pid --fork --time --uts --mount-proc=${BUILD_DIR}/proc --kill-child But as soon as I start './make.sh build' the "invalid argument" error is back again. I then played with two commands found in https://github.com/util-linux/util-linux/issues/718 mount --bind ${BUILD_DIR}/proc ${BUILD_DIR}/proc and mount --make-rprivate ${BUILD_DIR}/proc ${BUILD_DIR}/proc And for the first time I see that dir with 'findmnt...' (see 3rd attachment). But I don't know how to go on... Is there anything left I could try? Best Matthias > I just installed the plain Ubuntu Server, installed git, checkout out the repository, downloaded the toolchain and ran the build. > > -Michael > >> On 3 Aug 2024, at 12:22, Matthias Fischer <matthias.fischer(a)ipfire.org> wrote: >> >> On 03.08.2024 10:54, Michael Tremer wrote: >>> Hello Matthias, >> >> Hi Michael, >> >> just looked through https://man7.org/linux/man-pages/man1/unshare.1.html >> and ran 'findmnt -o+PROPAGATION' (see attachment). >> >> I don't know if this could help but does this differ from your test >> installation? >> >> Best >> Matthias >> >>>> On 3 Aug 2024, at 08:47, Matthias Fischer <matthias.fischer(a)ipfire.org> wrote: >>>> >>>> Hi Michael, >>>> >>>> [shortened some stuff] >>>> >>>> ... >>>> >>>>>>>> >>>>>>>> Being curious I tried to build 'next', but I always get the same error: >>>>>>>> >>>>>>>> ***SNIP*** >>>>>>>> root@Devel64-1: /git/ipfire-2.x # ./make.sh build >>>>>>>> Packaged toolchain compilation >>>>>>>> Building IPFire >>>>>>>> stage2 >>>>>>>> Jul 26 13:32:59: Building stage2 unshare: cannot change >>>>>>>> /git/ipfire-2.x/build_x86_64/proc filesystem propagation: Invalid argument >>>> >>>>>>> ... >>>> >>>>> It looks like you can simply update the kernel staying on the same release: >>>>> >>>>> https://ubuntu.com/security/livepatch/docs/livepatch/reference/kernels >>>>> >>>>> For 22.04 LTS, there is a Linux 6.8 image available. >>>>> >>>>> Could you check that and confirm that it fixes the mount propagation problem? >>>> >>>> Done. >>>> >>>> Current state is as follows: >>>> >>>> ***SNIP*** >>>> ... >>>> root@Devel64-1: /git/ipfire-2.x # lsb_release -a >>>> No LSB modules are available. >>>> Distributor ID: Ubuntu >>>> Description: Ubuntu 22.04.4 LTS >>>> Release: 22.04 >>>> Codename: jammy >>>> ... >>>> root@Devel64-1: /git/ipfire-2.x # uname -mrs >>>> Linux 6.8.0-39-generic x86_64 >>>> ... >>>> ***SNAP*** >>>> >>>> But when I try to build 'next' I get exactly the same error as >>>> before: >>>> >>>> ***SNIP*** >>>> root@Devel64-1: /git/ipfire-2.x # ./make.sh build >>>> Packaged toolchain compilation >>>> Building IPFire >>>> stage2 >>>> Aug 2 21:21:15: Building stage2 unshare: cannot change >>>> /git/ipfire-2.x/build_x86_64/proc filesystem propagation: Invalid argument >>> >>> Ah, this is good information. So it is not the kernel, it rather is Ubuntu handling something differently. >>> >>> I will have a look at this and get back to you. >>> >>>> ERROR: Downloading stage2 >>>> [ FAIL ] >>>> Check /git/ipfire-2.x/log_x86_64/_build.ipfire.log for errors if >>>> applicable [ FAIL ] >>>> ***SNAP*** >>>> >>>> Being curious, I commented line line 633 in 'make.sh' >>>> ("--mount-proc=${BUILD_DIR}/proc") => Building starts but fails during >>>> 'glib 2.77.0': >>>> >>>> ***SNIP*** >>>> ... >>>> glib (2.77.0) >>>> [ 1:14 ][0/1011] >>>> >>>> [951/1374] Compiling C object gio/gio.p/gio-tool-tree.c.o >>>> [952/1374] Linking target gio/gio >>>> [953/1374] Compiling C object >>>> gio/gio-querymodules.p/gio-querymodules.c.o >>>> [954/1374] Linking target gio/gio-querymodules >>>> [955/1374] Compiling C object gio/gresource.p/gresource-tool.c.o >>>> [956/1374] Compiling C object >>>> gio/glib-compile-schemas.p/.._subprojects_gvdb_gvdb_gvdb-reader.c.o >>>> [957/1374] Linking target gio/gresource >>>> [958/1374] Compiling C object >>>> gio/glib-compile-schemas.p/.._subprojects_gvdb_gvdb_gvdb-builder.c.o >>>> [959/1374] Compiling C object >>>> gio/glib-compile-resources.p/.._subprojects_gvdb_gvdb_gvdb-reader.c.o >>>> [960/1374] Compiling C object >>>> gio/glib-compile-resources.p/.._subprojects_gvdb_gvdb_gvdb-builder.c.o >>>> [961/1374] Compiling C object >>>> gio/glib-compile-resources.p/glib-compile-resources.c.o >>>> [962/1374] Linking target gio/glib-compile-resources >>>> [963/1374] Compiling C object >>>> gio/tests/modules/libtestmodulea.so.p/test-module-a.c.o >>>> [964/1374] Compiling C object gio/gapplication.p/gapplication-tool.c.o >>>> [965/1374] Compiling C object gio/gsettings.p/gsettings-tool.c.o >>>> [966/1374] Linking target gio/tests/modules/libtestmodulea.so >>>> [967/1374] Generating gio/tests/plugin-resources.c with a custom command >>>> FAILED: gio/tests/plugin-resources.c >>>> /usr/src/glib-2.77.0/builddir/gio/glib-compile-resources >>>> --compiler=gcc --target=gio/tests/plugin-resources.c --sour >>>> cedir=/usr/src/glib-2.77.0/gio/tests --internal --generate-source >>>> --c-name _g_plugin ../gio/tests/test4.gresource.xml >>>> /usr/src/glib-2.77.0/builddir/gio/glib-compile-resources: error >>>> while loading shared libraries: libgio-2.0.so.0: can >>>> not open shared object file: No such file or directory >>>> [968/1374] Linking target gio/gapplication >>>> [969/1374] Compiling C object >>>> gio/glib-compile-schemas.p/glib-compile-schemas.c.o >>>> [970/1374] Linking target gio/gsettings >>>> [971/1374] Compiling C object >>>> gio/tests/modules/libtestmoduleb.so.p/test-module-b.c.o >>>> [972/1374] Compiling C object >>>> gio/tests/gdbus-overflow.p/gdbus-overflow.c.o >>>> [973/1374] Compiling C object gio/gdbus.p/gdbus-tool.c.o >>>> [974/1374] Compiling C object >>>> gio/tests/gdbus-object-manager-example/libgdbus-example-objectmanager.so.p/meson-gener >>>> ated_.._objectmanager-gen.c.o >>>> ninja: build stopped: subcommand failed. >>>> make: *** [glib:75: /usr/src/log/glib-2.77.0] Error 1 >>>> make: Leaving directory '/usr/src/lfs' >>>> >>>> ERROR: Building glib >>>> [ FAIL ] >>>> Check /git/ipfire-2.x/log_x86_64/_build.ipfire.log for errors if >>>> applicable [ FAIL ] >>>> ***SNAP*** >>>> >>>> Best >>>> Matthias >>> > > >

1 0

Test of cleanup branch
by Adolf Belka 08 Aug '24

08 Aug '24

Hi Michael, I installed CU188 from the nightly onto a vm system and looked though all the WUI pages and everything looked fine. I then restored a CU187 backup from my testing and then checked the OpenVPN RW and N2N. Both worked fine with no problems. Also the logging for that all worked with no problems. Also checked out the IPS, IP Blocklists, Firewall groups and rules, DNS ... Everything I have looked at shows no impact from the cleanup branch changes. It looks good to me. Of course good for others to also evaluate. Regards, Adolf.

2 20

[PATCH v2] collectd: Fixes bug-13074, create collectd.d directory
by Adolf Belka 07 Aug '24

07 Aug '24

- As requested in bug 13074, create a collectd.d directory to enable any addon definitions to be created. - Added include statement in conf file to load everything that is stored in the collectd.d directory. - collectd.precache and collectd.thermal have been left in their original locations - Removed the arm section in the initscript as only aarch64 is now used. - Modified the lfs to create the collectd.d directory - Removal of collectd.custom file as this was the previous way to define custom collectd profiles but would have been overwritten by any update of collectd. - Update of rootfile to take account of new path and removal of collectd.custom - Tested out in vm testbed with Core Update 188 and all existing graphs were still created and updated. From my evaluation the changes have not affected anything. - The creation of the collectd.d directory now allows users to add their own desired profiles but also if it is decided that an addon should be included in the processes graph, or if a new graph for addons is created then profiles for that addon can be placed in the collectd.d directory and will be automatically included by collectd. Fixes: Bug13074 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/collectd/collectd.conf | 2 +- config/collectd/collectd.custom | 1 - config/rootfiles/common/collectd | 2 +- lfs/collectd | 3 ++- src/initscripts/system/collectd | 5 +---- 5 files changed, 5 insertions(+), 8 deletions(-) delete mode 100644 config/collectd/collectd.custom diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf index 27e1fe984..e51d9108b 100644 --- a/config/collectd/collectd.conf +++ b/config/collectd/collectd.conf @@ -74,5 +74,5 @@ include "/etc/collectd.precache" </Plugin> #include "/etc/collectd.thermal" -include "/etc/collectd.custom" include "/etc/collectd.vpn" +include "/etc/collectd.d/*" diff --git a/config/collectd/collectd.custom b/config/collectd/collectd.custom deleted file mode 100644 index 7443bf3e6..000000000 --- a/config/collectd/collectd.custom +++ /dev/null @@ -1 +0,0 @@ -# Use this file to add custom configs and rules for collectd diff --git a/config/rootfiles/common/collectd b/config/rootfiles/common/collectd index 65408dc7f..c8a3ad607 100644 --- a/config/rootfiles/common/collectd +++ b/config/rootfiles/common/collectd @@ -1,8 +1,8 @@ etc/collectd.conf -etc/collectd.custom etc/collectd.precache etc/collectd.thermal etc/collectd.vpn +etc/collectd.d etc/rc.d/rc0.d/K50collectd etc/rc.d/rc3.d/S29collectd etc/rc.d/rc6.d/K50collectd diff --git a/lfs/collectd b/lfs/collectd index 24f5bc632..6d0f666f6 100644 --- a/lfs/collectd +++ b/lfs/collectd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 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 # @@ -125,6 +125,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --with-librrd=/usr/share/rrdtool-1.2.30 \ --with-fp-layout=nothing cd $(DIR_APP) && make install #collectd-4 does not support parallel build + mkdir /etc/collectd.d cp -vf $(DIR_SRC)/config/collectd/collectd.* /etc/ mv /etc/collectd.vpn /var/ipfire/ovpn/collectd.vpn chown nobody.nobody /var/ipfire/ovpn/collectd.vpn diff --git a/src/initscripts/system/collectd b/src/initscripts/system/collectd index 56b799d56..263511fc7 100644 --- a/src/initscripts/system/collectd +++ b/src/initscripts/system/collectd @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 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 # @@ -68,9 +68,6 @@ case "$1" in # ARM does not support to scan for sensors. In that case, # we create an empty configuration file. machine=$(uname -m) - if [ "${machine:0:3}" = "arm" ]; then - touch /etc/sysconfig/lm_sensors - fi if [ "${machine:0:7}" = "aarch64" ]; then touch /etc/sysconfig/lm_sensors fi -- 2.45.2

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development August 2024