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 5e84cecc11037d3a8e728c1de084c57ebb68b7de (commit) via 9b3462a2ca55192b6330f9df839247859eec1e69 (commit) via d705f5e58801d6116e09af9dfaec8d6ed58827b3 (commit) via 01de28ec05cde5d945500ef6bd5ce25c3586f686 (commit) via 36391d1d0d2dfb69077e2d860d2af3c975cf86f6 (commit) via 55b13b3b94713ab800bf28d919cd2b2b036f3f31 (commit) via dda60a8af902f383eb291b3cbe09f8d7f0150698 (commit) via 637b614f1c73d004a5eca20696958a4aa85c0c2a (commit) via e8dc56382628fab7d970a6e799269aa73e4ec2ae (commit) via c3a156c047d34770da7e8f1c67c5301204cf1b44 (commit) via 33bbc4aee45173cf17f22a11bee3ccbe30f0daaf (commit) via 06683f9630e7ab5dc33fc65b6d63ef3317f4804b (commit) via 00124b6d9faa53e278f03c6d0504a7d0cae25330 (commit) via b7420d15630e62a20e43ad385c92133b82e5f673 (commit) via 86a84624f5723774cfb0df337cbaec0681d9aa7d (commit) from 66e1d282c8e46168677abed8606cbbfb6c1ffe1c (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 5e84cecc11037d3a8e728c1de084c57ebb68b7de Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Jan 24 09:59:52 2025 +0100
core192: ship captive portal changes
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 9b3462a2ca55192b6330f9df839247859eec1e69 Author: Adolf Belka adolf.belka@ipfire.org Date: Thu Jan 9 20:04:38 2025 +0100
language files: Updated de, en, es, fr & tr language files
- Changed the phrase in the code from Captive wrong ext to Captive wrong type as it is now the type and not the extension that is being checked.
Fixes: Bug13795 Tested-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit d705f5e58801d6116e09af9dfaec8d6ed58827b3 Author: Adolf Belka adolf.belka@ipfire.org Date: Thu Jan 9 20:04:37 2025 +0100
perl-File-LibMagic: New package implemented for content type extraction of a file
- It was placed in make.sh after perl-Config-AutoConf as that package is at least one build dependency.
Fixes: Bug13795 Tested-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 01de28ec05cde5d945500ef6bd5ce25c3586f686 Author: Adolf Belka adolf.belka@ipfire.org Date: Thu Jan 9 20:04:36 2025 +0100
captive.cgi: Update code to check for the image content type not just the extension
- The File-LibMagic used to do this content type check. As this requires the actual file and path name to access, the CGI::upload command had to be brought to before the content type check and download the file to /tmp/. Then the content type can be identified. If it is either image/png or image/jpeg then the logo.tmp file is moved to replace the existing logo.dat. If the uploaded logo is not a png or jpeg image content then the logo.tmp file in /tmp/ is deleted by unlinking it. - I also added the actual content type to the error message if it is not a png or jpeg. - Tested the code out on my vm testbed and it worked fine. Only png or jpeg content type is accepted It makes no difference what the extension on the file is. When not the correct content type the old logo.dat is left alone and not changed and the new logo stored in /tmp/ is removed. If the content type is correct then the new logo file in /tmp/ is moved to replace the existing logo.data file. - When the wrong type of content was in the file, for example html code, then the error message is shown saying that the content type is not correct and showing the actual content type, in this case text/html.
Fixes: Bug13795 Tested-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 36391d1d0d2dfb69077e2d860d2af3c975cf86f6 Author: Adolf Belka adolf.belka@ipfire.org Date: Thu Jan 9 20:04:35 2025 +0100
logo.cgi: Fix for bug13795 - captive portal not displaying uploaded logo
- This v2 version now includes the use of File-LibMagic to identify the specific content type and apply that to the modified header command so that image/png or image/jp[eg are used depending on the type of image provided. - Something changed in some package in CU188 that means that the existing method of printing the content type to the browser no longer worked. - I tested it in some stand alone code and even if using text/txt for the content-type print statement the File::Copy::copy then resulted in an Internal Server Error with the same message as with the image file which was "malformed header from script 'logo.cgi': Bad header:". - I tested it with text, html, image and application. In all cases the error message about a bad header was provided. - Did some searching and found an alternative way to explicitly print the header info which is what I have used in this patch change. - With this approach, in the stand alone code, I was able to get an image, html code or text shown in the browser correctly and without any error message. - I then used this new method in the logo.cgi code as submitted here and tested the change in my vm testbed and the image was shown in the captive portal correctly. - So this change fixes the problem with the logo not being shown but I have been unable to identify what changed to stop the method that worked prior to CU188 from working any more.
Fixes: Bug13795 Tested-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 55b13b3b94713ab800bf28d919cd2b2b036f3f31 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Jan 24 09:54:04 2025 +0100
core192: ship unbound root.hints
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit dda60a8af902f383eb291b3cbe09f8d7f0150698 Author: Adolf Belka adolf.belka@ipfire.org Date: Mon Jan 6 10:52:08 2025 +0100
root.hints: Update to version Dec 18, 2024
- Update from version Jul 3, 2019 to Dec 18, 2024 - Not sure if there have been other version in between or not as no history is stored anywhere on this. - No changelog for any changes to the root.hints file but the diff in the file shows that just one change has been done to the B.ROOT-SERVERS.NET. entry with a change in IP.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Reviewed-by: Bernhard Bitsch bbitsch@ipfire.org Tested-by: Bernhard Bitsch bbitsch@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 637b614f1c73d004a5eca20696958a4aa85c0c2a Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Jan 24 09:51:54 2025 +0100
core192: ship ppp
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit e8dc56382628fab7d970a6e799269aa73e4ec2ae Author: Adolf Belka adolf.belka@ipfire.org Date: Fri Jan 3 15:21:22 2025 +0100
ppp: Update to version 2.5.2
- Update from version 2.5.1 to 2.5.2 - Update of rootfile - Changelog 2.5.2 Some old and probably unused code has been removed, notably the pppgetpass program and the passprompt plugin, and some of the files in the sample and scripts directories. If a remote number has been set, it is available to scripts in the REMOTENUMBER environment variable. The Solaris port has been updated, including updated installation instructions in README.sol2. Various other bug fixes and minor enhancements.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit c3a156c047d34770da7e8f1c67c5301204cf1b44 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Jan 24 09:47:16 2025 +0100
core192: ship liburcu
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 33bbc4aee45173cf17f22a11bee3ccbe30f0daaf Author: Adolf Belka adolf.belka@ipfire.org Date: Fri Jan 3 15:21:21 2025 +0100
liburcu: Update to version 0.15.0
- Update from version 0.14.1 to 0.15.0 - Update of rootfile - Changelog 0.15.0 * Fix compilation errors * Document cmm_cast_volatile * Honor URCU_DEREFERENCE_USE_VOLATILE * arm: Use atomic builtins for xchg if supported * Introduce _CMM_TOOLCHAIN_SUPPORT_C11_MM * Seperate uatomic and uatomic_mo * uatomic: Fix header guard comment * Fix: missing typename in URCU_FORCE_CAST * Allow building with GCC >= 13.3 on RISC-V * pointer.h: Fix the rcu_cmpxchg_pointer documentation * rculfhash: make cds_lfht_iter_get_node argument const * lfstack: make cds_lfs_empty argument const * wfcqueue: make cds_wfcq_empty arguments const * wfstack: make cds_wfs_empty argument const * cds_list: make cds_list_replace @old argument const * cds_list: make cds_list_empty const * Adjust shell script to allow Bash in other locations * futex.h: Indent preprocessor directives * futex.h: Use urcu_posix_assert to validate unused values * Use futex on OpenBSD * fix: handle EINTR correctly in get_cpu_mask_from_sysfs * Relicense src/compat-smp.h to MIT * uatomic/x86: Remove redundant memory barriers * cleanup: move rand_r compat code to tests * ppc: Document cache line size choice * Fix: change order of _cds_lfht_new_with_alloc parameters * Add support for custom memory allocators for rculfhash * ppc.h: use mftb on ppc * rcutorture: Check histogram of ages * docs: Add links to project resources * Fix: allow clang to build liburcu on RISC-V * Fix -Walloc-size * cleanup: use an enum for the error states of nr_cpus_mask * fix: add missing SPDX licensing tags * urcu/uatomic/riscv: Mark RISC-V as broken * Fix: urcu-bp: misaligned reader accesses * rculfhash: Only pass integral types to atomic builtins * LoongArch: Document that byte and short atomics are implemented with LL/SC * Add LoongArch support * Tests: Add test for byte/short atomics on addresses which are not word-aligned * Complete removal of urcu-signal flavor * doc/examples: Remove urcu-signal example * tests/common: Remove urcu-signal common test files * tests/benchmark: Remove urcu-signal benchmark tests * tests/regression: Remove urcu-signal regression tests * tests/unit: Remove urcu-signal unit tests * Fix: Add missing cmm_smp_mb() in deprecated urcu-signal * urcu/uatomic.h: Improve verbosity of static assert error messages * urcu/compiler: Add urcu_static_assert * Phase 1 of deprecating liburcu-signal * uatomic/generic: Fix redundant declaration warning * tests: Add tests for checking race conditions * Add cmm_emit_legacy_smp_mb() * urcu/annotate: Add CMM annotation * tests/unit/test_build: Quiet unused return value * benchmark: Use uatomic for accessing global states * tests: Use uatomic for accessing global states * urcu-wait: Fix wait state load/store * Add CMM memory model * urcu/arch/generic: Use atomic builtins if configured * urcu/compiler: Use atomic builtins if configured * configure: Add --enable-compiler-atomic-builtins option * Fix: tests/rcutorture: Put thread offline on busy-wait * tests/regression/rcutorture: Use urcu-wait * tests/rcutorture: Factor out thread registration * tests/regression/rcutorture: Add wait state * urcu-wait: Initialize node in URCU_WAIT_NODE_INIT * Complete REUSE support * extras/abi: license data files under CC-1.0 * examples: use SPDX identifiers * tests: use SPDX identifiers * src: use SPDX identifiers * Public headers: use SPDX identifiers * Build system: use SPDX identifiers * Fix: urcu-wait: add missing futex.h include * doc: update GCC baseline to 4.8 * doc: update FreeBSD tested version * doc: Remove Solaris from tested platforms * Revert "compiler.h: Introduce caa_unqual_scalar_typeof" * rculfhash: Use caa_container_of_check_null in cds_lfht_entry * compiler.h: Introduce caa_container_of_check_null * compiler.h: Introduce caa_unqual_scalar_typeof * Avoid calling caa_container_of on NULL pointer in cds_lfht macros * Fix: revise urcu_read_lock_update() comment * Fix: uatomic powerpc comment about lwsync * fix: aarch64: allow RHEL7 gcc 4.8.5-11 * aarch64: Implement caa_cpu_relax as yield instruction * fix: warning 'noreturn' function does return on ppc * Fix: use __noreturn__ for C11-compatibility * Adjust shell scripts to allow Bash in other locations * Add support for OpenBSD * Bump version to 0.15.0-pre
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 06683f9630e7ab5dc33fc65b6d63ef3317f4804b Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Jan 24 09:45:53 2025 +0100
core192: ship kbd
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 00124b6d9faa53e278f03c6d0504a7d0cae25330 Author: Adolf Belka adolf.belka@ipfire.org Date: Fri Jan 3 15:21:20 2025 +0100
kbd: Update to version 2.7.1
- Update from version 2.6.4 to 2.7.1 - Update of rootfile - Changelog 2.7.1 setfont: Fixed regression in argument parsing. Allow arguments and options to be mixed. dumpkeys: Fixed dumpkeys on pc and non-pc architectures. The value of keycode 0 has a special meaning, but on some architectures (like powerpc) keyboards may generate keycode zero. 2.7.0 libkeymap: Add API to get/set keymap keywords. Export functions to convert the value to kernel code. Fix double kbdfile open. Dump action codes for keycode 0. libkfont: Fix buffer allocation for doubled font. Check console mode. keymaps: Add hcesar layout, for portuguese speaking countries. Update Colemak-DH keymaps with upstream changes. sv-latin1.map: make Ctrl+AltGr+9 act as Ctrl+]. fonts: Remove non-free Agafari fonts. build-sys: Use autoconf 2.72. Do not substitute variables from configure. Makefiles cleanup. Fix build warning. other: Add configure option to control keymaps compression. Update man pages. Remove deprecated startup scripts. Remove outdated docs. Update translations (from translationproject.org)
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit b7420d15630e62a20e43ad385c92133b82e5f673 Author: Adolf Belka adolf.belka@ipfire.org Date: Fri Jan 3 15:21:19 2025 +0100
dbus: Update to version 1.16.0
- Update from version 1.14.10 to 1.16.0 - Update of rootfile - Autotools has been removed from dbus so build converted to meson - Changelog 1.16.0 Build system and dependencies: • The Meson build system is the recommended way to build dbus on Unix. This requires Meson 0.56 and Python 3.5. · Projects that depend on libdbus can build it as a Meson subproject. See tests/use-as-subproject/meson.build for suggested build options. • CMake continues to be available as an alternative build system, and is recommended on Windows. This requires CMake 3.10. • A C99 compiler such as gcc, clang, or Visual Studio 2015 is required. A C11 compiler such as gcc, clang, or Visual Studio 2019 is recommended. • On platforms with larger-than-64-bit pointers, a C11 compiler is required Behaviour changes: • On Unix, the well-known system bus socket is in the runtime state directory by default (normally /run) (see 1.15.4 for more details) • On Linux with systemd, dbus-daemon starts as the target user/group (retaining CAP_AUDIT_WRITE) instead of starting as root and dropping privileges Feature removals: • Autotools build system • pam_console/pam_foreground integration (Autotools --with-console-auth, CMake -DDBUS_CONSOLE_AUTH_DIR) New features and significant bug fixes: • ProcessFD in GetConnectionCredentials() on Linux (see 1.15.8 for more details) • On Unix, the system message bus now loads .service files from /etc and /run • Use close_range() to close unwanted file descriptors or mark them close-on-exec, if available • Use 64-bit timestamps internally on 32-bit platforms, for Y2038 safety • Use APIs that can return 64-bit timestamps and inode numbers on 32-bit glibc • AF_UNIX sockets are available on sufficiently recent Windows • dbus-send can send arrays of variants, variant values in dictionaries, and nested variants • Portability to CPU architectures with larger-than-64-bit pointers Dependencies: • Building with CMake now requires CMake ≥ 3.10. Bug fixes: • Avoid deprecation warnings with newer Meson versions (dbus!507, Simon McVittie) • Avoid deprecation warnings with newer CMake versions (dbus#541, Ralf Habacker) Tests and CI enhancements: • When building with CMake, set the same environment variables as Meson. This improves test coverage. (dbus#533, Ralf Habacker) • Remove a remaining reference to Debian 11, which is EOL (dbus!508, Simon McVittie) 1.15.92 Build-time configuration changes: • When building with Meson, the embedded_tests option has been renamed to intrusive_tests. This option adds test instrumentation in libdbus and dbus-daemon, which reduces performance and is not secure. For production builds of dbus in OS distributions, it must be false (-Dintrusive_tests=false, which is the default) During development, it should be set true (-Dintrusive_tests=true) for full test coverage. (dbus#537, Simon McVittie) • Similarly, when building with CMake, the DBUS_BUILD_TESTS option no longer enables intrusive test instrumentation. A new option -DDBUS_ENABLE_INTRUSIVE_TESTS=ON is equivalent to the Meson build system's -Dintrusive_tests=true. Bug fixes: • If a DBusWatch callback fails because there is insufficient memory, make sure to retry it within a finite time (dbus#536, Petr Malat) • On macOS with launchd enabled, if the session bus launchd integration is not correctly configured, don't treat that as a fatal error that prevents connecting to the system bus (dbus#510, Mohamed Akram) • If intrusive test instrumentation is enabled, older versions of dbus would simulate an out-of-memory condition once per 2**32 allocations, even if not specifically requested. This is no longer done. (dbus#535, Simon McVittie) • Fix compilation on non-Linux platforms with glibc, such as Debian GNU/Hurd (dbus#539, Simon McVittie) • Avoid test failures with non-trivial NSS modules, similar to dbus#256 (dbus#540, Simon McVittie) • When built with CMake, make paths in DBus1Config relocatable (dbus!499, Ralf Habacker) 1.15.90 Build-time configuration changes: • The experimental Containers1 interface has been removed from this branch. It is incomplete and not ready for production use, and has been compile-time-disabled and impossible to enable without patching since 1.13.20. To reduce confusion, delete the code completely. It remains present on the git `master` branch for 1.17.x, and will hopefully be reinstated during the 1.17.x cycle. (dbus!488, dbus!490; Simon McVittie) Bug fixes: • Fix the Devhelp index for API documentation (dbus!486, Simon McVittie) • Fix detection of socketpair() on Solaris 10 (dbus#531, Simon McVittie) • Avoid undefined signed integer overflow when calculating hash table indexes (dbus!487, Jami Kettunen) 1.15.12 Enhancements: • D-Bus Specification 0.43: · Recommend loading system services from /etc/dbus-1/system-services and /run/dbus-1/system-services (dbus!467, Luca Boccassi) · Reorganise documentation of the message bus to make it easier to add new interfaces (dbus!472, Simon McVittie) · Document o.fd.DBus.Debug.Stats interface (dbus!472, Simon McVittie) · Document o.fd.DBus.Verbose interface (dbus!472, Simon McVittie) · Formatting improvements (dbus!471, dbus!472; Simon McVittie) · Don't imply that all clients need to support obsolete message bus implementations (dbus!471, Simon McVittie) • API design advice: · Document typical approaches to emulating nullable types in the D-Bus type system (dbus!446, Zeeshan Ali Khan) • On Unix, additionally load system services from: · /etc/dbus-1/system-services, reserved for use by either the local system administrator, or software such as asset managers and configuration management frameworks acting on their behalf · /run/dbus-1/system-services, for ephemeral services (dbus!467, Luca Boccassi) Bug fixes: • Increase file descriptor soft limit to hard limit before testing file descriptor passing, and correctly skip the test for flooding the bus with fds when the limit is too low, fixing test failures on Solaris (dbus#176, Alan Coopersmith)
• When building API documentation with Doxygen, always generate a working link in the index HTML page (dbus#519, dbus!470; Ralf Habacker, Simon McVittie) • When building with Meson, add (more) test dependencies so that 'meson test' does not always need to be preceded by 'meson compile' (dbus!468, Simon McVittie) • When installing with Meson, don't fail if we are installing as root but the user/group that will own the setuid dbus-daemon-launch-helper do not yet exist (dbus#492, Jordan Williams) • When building with Meson on Solaris, fix detection and build of Solaris audit API integration (dbus!477, Alan Coopersmith) • Fix service activation timeouts when built with embedded tests (test instrumentation) and run on a platform with a large file descriptor limit (dbus#527, Simon McVittie) • Fix test failures on platforms where deleting the current working directory is not allowed, such as Solaris (dbus!480, Alan Coopersmith) Internal changes: • CI fixes (dbus!474, Simon McVittie) 1.15.10 Build-time configuration changes: • The Autotools build system has been removed. Its replacement is Meson. (dbus#443, Ralf Habacker) Enhancements: • Use 64-bit timestamps internally. This will allow 32-bit builds of libdbus to continue working after 2038 if there is OS-level support for 64-bit time_t, either opt-in (as on 32-bit glibc systems) or by default. (dbus!444, Alexander Kanavin) • When building with CMake, build more HTML documentation (dbus#504, Ralf Habacker) Bug fixes: • Don't crash if configured to watch more than 128 directories with inotify (dbus#481, hongjinghao) • Never add (uid_t) -1, (gid_t) -1 or (pid_t) 0 to credentials (dbus!464, Alyssa Ross) • Fix a regression since 1.15.0 for "autolaunch:" on Windows (dbus#503, Thomas Sondergaard) • When building with Meson, don't use stdatomic.h if it exists but is non-functional, for example under Visual Studio 2022 (dbus#494, Thomas Sondergaard) • When building with Meson, add test dependencies so that 'meson test' does not always need to be preceded by 'meson compile' (dbus!465, Alyssa Ross) • When building with Meson, really enable launchd if appropriate (dbus!463, Alyssa Ross) • In the test suite, use a more widely-implemented group name 'tty' in preference to 'bin' (dbus#514, Alyssa Ross) • Ensure that `dbus-test-tool spam` options cannot leave the payload length uninitialized (dbus!469, Simon McVittie) • Fix compiler warnings with gcc 14 (dbus!469, Simon McVittie) Documentation: • Clarify ownership transfer of pending call in dbus_connection_send_with_reply() (dbus!455, Wiebe Cazemier) • Explicitly document dbus-send exit status (dbus#452, Philip Withnall) • Refer to d-spy in preference to unmaintaned D-Feet (dbus!460, Ludovico de Nittis) • Update URL to Bustle tool (dbus!460, Ludovico de Nittis) Internal changes: • Replace _dbus_string_append_int(), _dbus_string_append_uint() with calls to _dbus_string_append_printf() (dbus!445, Simon McVittie) • Clean up unused macros in CMake build (dbus!463, Alyssa Ross) • Internal CI changes (dbus#487, dbus#488, dbus#489, dbus#509; Ralf Habacker, Simon McVittie) 1.15.8 Build-time configuration changes: • For this version of dbus, Meson is the recommended build system for all Unix platforms. CMake continues to be recommended for Windows, but this recommendation might change to Meson in a future release, so please test the Meson build. See INSTALL for details. • Autotools-generated files are no longer included in the tarball release. The Autotools build system is likely to be removed in a future dbus release, so Autotools users should migrate to Meson as soon as possible. It is still possible to build using Autotools, by following the same procedure as for a git clone (starting with the `./autogen.sh` script). Enhancements: • D-Bus Specification 0.42: · GetConnectionCredentials can return ProcessFD (dbus!420, dbus!398; Luca Boccassi) • On Linux with sufficiently new glibc and kernel headers, report a pinned process file descriptor (pidfd) as the ProcessFD member of the GetConnectionCredentials() result (dbus!420, dbus!398; Luca Boccassi) • On Linux with systemd, start as the target user/group (retaining CAP_AUDIT_WRITE to preserve the ability to write to the audit log), instead of starting as root and dropping privileges (dbus!399, Luca Boccassi) • On 32-bit glibc systems, opt-in to 64-bit timestamps if possible. This will allow 32-bit builds of libdbus to continue working after 2038. (dbus#465, Simon McVittie) • On 32-bit glibc systems when built with CMake, also opt-in to large file sizes, offsets and inode numbers, as was done for Autotools since 1.12.x and Meson since the Meson build was introduced (dbus#465, fd.o #93545; Simon McVittie) • Avoid known dbus-daemon options being interpreted as optional arguments (dbus#467, Xin Shi) • If libdbus is a Meson subproject in a larger project, announce it as an implementation of the dbus-1 dependency (dbus!415, Barnabás Pőcze) • When built with CMake, get the version number from Meson instead of Autotools, in preparation for the Autotools build system being removed (dbus!382, Ralf Habacker) • When built with Meson, disable some unwanted warnings when either assertions or checks is disabled (dbus!412, Simon McVittie) • Use C11 <stdatomic.h> if possible (dbus!431, Simon McVittie) • Expand coverage of SPDX/REUSE copyright/license information (dbus!427, Simon McVittie) • On Linux, let dbus-daemon start up successfully (with a warning) if inotify initialization fails, even if DBUS_FATAL_WARNINGS=1 is present in the environment (dbus#473, Simon McVittie) • On Unix, provide a better error message when looking up a user by name or user ID fails (dbus!442, Simon McVittie) Bug fixes: • Avoid a dbus-daemon crash if re-creating a connection's policy fails. If it isn't possible to re-create its policy (for example if it belongs to a user account that has been deleted or if the Name Service Switch is broken, on a system not supporting SO_PEERGROUPS), we now log a warning, continue to use its current policy, and continue to reload other connections' policies. (dbus#343; Peter Benie, Simon McVittie) • If getting the groups from a user ID fails, report the error correctly, instead of logging "(null)" (dbus#343, Simon McVittie) • Return the primary group ID in GetConnectionCredentials()' UnixGroupIDs field for processes with a valid-but-empty supplementary group list (dbus!422, cptpcrd) • `sudo meson install` without a DESTDIR is now possible, although strongly discouraged on production systems (dbus#436, Simon McVittie) • Fix a Meson deprecation warning (dbus#439, Simon McVittie) Tests and CI enhancements: • Internal CI changes (dbus#455, dbus!414, dbus#468, dbus#469, dbus!424, dbus!430, dbus#436, dbus#470; Ralf Habacker, Simon McVittie) 1.15.6 Denial-of-service fixes: • Fix an assertion failure in dbus-daemon when a privileged Monitoring connection (dbus-monitor, busctl monitor, gdbus monitor or similar) is active, and a message from the bus driver cannot be delivered to a client connection due to <deny> rules or outgoing message quota. This is a denial of service if triggered maliciously by a local attacker. (dbus#457; hongjinghao, Simon McVittie) Enhancements: • Special-case reading pseudo-files from Linux /proc to take into account the filesystem's unusual semantics (dbus!401, Luca Boccassi) Other fixes: • Fix compilation on compilers not supporting __FUNCTION__ (dbus!404, Barnabás Pőcze) • Fix some memory leaks on out-of-memory conditions (dbus!403, Barnabás Pőcze) • Documentation: · Update the README to recommend building with Meson (dbus!402, Ahmed Abdelfattah) · Fix syntax of a code sample in dbus-api-design (dbus!396; Yen-Chin, Lee) • CMake build fixes: · Detect presence of <sys/syscall.h> (dbus!400, Luca Boccassi) Tests and CI enhancements: • Fix CI pipelines after freedesktop/freedesktop#540 (dbus!405, dbus#456; Simon McVittie) • Ensure the messagebus user is created if necessary (dbus#445, Ralf Habacker) 1.15.4 Dependencies: • Building with CMake now requires CMake ≥ 3.9. Build-time configuration changes: • On Unix platforms, a path in the runtime state directory (often /run) is now used for the well-known system bus socket by default. OS distributors should check that the path used is equivalent to the interoperable path /var/run/dbus/system_bus_socket, especially if running on an OS where /var/run is not guaranteed to be a symbolic link to /run. (dbus#180; Issam E. Maghni, Simon McVittie) · With Autotools, this is controlled by --runstatedir, which defaults to ${localstatedir}/run but is often set to /run by OS distributors. The path to the system bus socket can be overridden with the --with-system-socket option if required. · With CMake, this is controlled by the RUNSTATEDIR option, which has behaviour similar to Autotools. There is no separate option for the path to the system bus socket. · With Meson, this is controlled by the runtime_dir option, which defaults to /run if the installation prefix is set to /usr, or has behaviour similar to Autotools otherwise. The path to the system bus socket can be overridden with the system_socket option if required. Denial of service fixes: • Fix an incorrect assertion that could be used to crash dbus-daemon or other users of DBusServer prior to authentication, if libdbus was compiled with assertions enabled. We recommend that production builds of dbus, for example in OS distributions, should be compiled with checks but without assertions. (dbus#421, Ralf Habacker; thanks to Evgeny Vereshchagin) Enhancements: • D-Bus Specification 0.41: · Clarify handling of /run vs. /var/run on Unix systems (dbus#180, Simon McVittie) • Add dbus_connection_set_builtin_filters_enabled(), intended to be called by tools that use BecomeMonitor() such as dbus-monitor (dbus#301, Kai A. Hiller) • When using the Meson build system, dbus can now be used as a subproject. To avoid colliding with a separate system copy of dbus, building it as a static library with tests, tools and the message bus disabled is strongly recommended. See test/use-as-subproject for sample code. (dbus!368, dbus!388; Daniel Wagner) Other fixes: • When connected to a dbus-broker, stop dbus-monitor from incorrectly replying to Peer method calls that were sent to the dbus-broker with a NULL destination (dbus#301, Kai A. Hiller) • Fix out-of-bounds varargs read in the dbus-daemon's config-parser. This is not attacker-triggerable and appears to be harmless in practice, but is technically undefined behaviour and is detected as such by AddressSanitizer. (dbus!357, Evgeny Vereshchagin) • Avoid a data race in multi-threaded use of DBusCounter (dbus#426, Ralf Habacker) • Fix a crash with some glibc versions when non-auditable SELinux events are logged (dbus!386, Jeremi Piotrowski) • If dbus_message_demarshal() runs out of memory while validating a message, report it as NoMemory rather than InvalidArgs (dbus#420, Simon McVittie) • Use C11 _Alignof if available, for better standards-compliance (dbus!389, Khem Raj) • Stop including an outdated copy of pkg.m4 in the git tree (dbus!365, Simon McVittie) • Meson build fixes: · Use -fvisibility=hidden on Unix if supported, in particular on Linux (dbus!383, dbus#437; Simon McVittie) · Fix build on macOS, and any other platform that has CLOCK_MONOTONIC but not pthread_condattr_setclock() (dbus#419, Jordan Williams) • Documentation: · Consistently use Gitlab bug reporting URL (dbus!372, Marco Trevisan) • Licensing: · Use MIT license for some test files that did not previous specify a license, with permission from their authors (dbus!359, Simon McVittie) · Add more SPDX/REUSE license markers (dbus!311, dbus!369, dbus!370, dbus!371, dbus!375, dbus!376; Ralf Habacker, Simon McVittie) · Correct syntax of some SPDX license markers (dbus!360, Ralf Habacker) • Tests fixes: · Fix an assertion failure in test-autolaunch-win (dbus#422, Ralf Habacker) · Expand test coverage under CMake (dbus!322, Ralf Habacker) · Fix the test-apparmor-activation test after dbus#416 (dbus!380, Dave Jones) Internal changes: • Add static assertions for some things we assume about pointers (dbus!345, Simon McVittie) • Refactoring (dbus!356, dbus#430, dbus#431; Simon McVittie, Xin Shi) • Fix CI builds with recent git versions (dbus#447, Simon McVittie) • Build dbus with clang during CI (dbus!358, Evgeny Vereshchagin) 1.15.2 Behaviour changes: • On Linux, dbus-daemon and other uses of DBusServer now create a path-based Unix socket, unix:path=..., when asked to listen on a unix:tmpdir=... address. This makes unix:tmpdir=... equivalent to unix:dir=... on all platforms. Previous versions would have created an abstract socket, unix:abstract=..., in this situation. This change primarily affects the well-known session bus when run via dbus-launch(1) or dbus-run-session(1). The user bus, enabled by configuring dbus with --enable-user-session and running it on a systemd system, already used path-based Unix sockets and is unaffected by this change. This behaviour change prevents a sandbox escape via the session bus socket in sandboxing frameworks that can share the network namespace with the host system, such as Flatpak. This change might cause a regression in situations where the abstract socket is intentionally shared between the host system and a chroot or container, such as some use-cases of schroot(1). That regression can be resolved by using a bind-mount to share either the D-Bus socket, or the whole /tmp directory, with the chroot or container. (dbus#416, Simon McVittie) Denial of service fixes: Evgeny Vereshchagin discovered several ways in which an authenticated local attacker could cause a crash (denial of service) in dbus-daemon --system or a custom DBusServer. In uncommon configurations these could potentially be carried out by an authenticated remote attacker. • An invalid array of fixed-length elements where the length of the array is not a multiple of the length of the element would cause an assertion failure in debug builds or an out-of-bounds read in production builds. This was a regression in version 1.3.0. (dbus#413, CVE-2022-42011; Simon McVittie) • A syntactically invalid type signature with incorrectly nested parentheses and curly brackets would cause an assertion failure in debug builds. Similar messages could potentially result in a crash or incorrect message processing in a production build, although we are not aware of a practical example. (dbus#418, CVE-2022-42010; Simon McVittie) • A message in non-native endianness with out-of-band Unix file descriptors would cause a use-after-free and possible memory corruption in production builds, or an assertion failure in debug builds. This was a regression in version 1.3.0. (dbus#417, CVE-2022-42012; Simon McVittie) Enhancements: • D-Bus Specification 0.40 (dbus#416, Simon McVittie) · Clarify that unix:tmpdir is not required to use abstract sockets, even where supported · Mention implications of abstract sockets for Linux namespacing 1.15.0 Dependencies: • On platforms where a pointer is larger than 64 bits, dbus requires at least a C11 compiler. On other platforms, dbus now requires either a C99 compiler such as gcc or clang, or Microsoft Visual Studio 2015 or later. Some workarounds for pre-C99 environments are currently still present, but we plan to remove them during this development cycle. • Building with CMake now requires CMake ≥ 3.4. • Building with Meson requires Meson ≥ 0.56 and Python ≥ 3.5. Feature removal: • Remove support for the obsolete pam_console and pam_foreground modules (the Autotools --with-console-auth-dir= and CMake -DDBUS_CONSOLE_AUTH_DIR= options, which have been deprecated since dbus 1.11.18). (dbus#181, fd.o#101629) Build-time configuration changes: • Add a Meson build system. This is currently considered experimental, but the intention is for it to replace Autotools and/or CMake in future releases, preferably both. Please test! (dbus!303, dbus!325; Félix Piédallu, Marc-André Lureau, Simon McVittie) · This requires Meson 0.56 or newer, and Python 3.5 or newer. · Expat can be built as a subproject using Meson's "wrap" mechanism, if desired. This should make it considerably easier to build dbus for Windows or other platforms without a library packaging system. · GLib can also be built as a subproject using Meson's "wrap" mechanism, if desired. This should make it considerably easier to build full test coverage on Windows or other platforms without a library packaging system. • Please note that not all Meson build options correspond 1:1 to how the closest equivalents in Autotools or CMake behave, and the Meson build options are subject to change. Distributors and developers evaluating the Meson build should check that they are configuring dbus the way they intend to. Enhancements: • D-Bus Specification 0.39: · Document how to represent internationalized domain names in D-Bus names (dbus!324, Simon McVittie) · Improve documentation of AF_UNIX sockets (Marc-André Lureau) • On Unix, speed up closing file descriptors for subprocesses by using closefrom() or close_range() where available (dbus#278; rim, Simon McVittie) • On Windows, dbus can now use AF_UNIX sockets, not just TCP. This requires Windows 10 build 17063 or later at runtime, and either Windows 10 SDK 17063 or mingw-w64 version 9.0.0 or later at compile-time. (dbus!249, Marc-André Lureau) • Teach dbus-send to handle variants in containers: arrays of variants, variant values in dictionaries, and nested variants (dbus!206, Frederik Van Bogaert) • Detect programming errors with Windows mutexes if assertions are enabled, similar to what we already did for pthreads mutexes (dbus#369, Ralf Habacker) • Move license text into LICENSES, and start to use SPDX markers (Simon McVittie, Ralf Habacker) Fixes: • Portability to CPU architectures with larger-than-64-bit pointers (dbus!335, dbus!318; Alex Richardson) • Fix build failure on FreeBSD (dbus!277, Alex Richardson) • Fix build failure on macOS with launchd enabled (dbus!287, Dawid Wróbel) • Preserve errno on failure to open /proc/self/oom_score_adj (dbus!285, Gentoo#834725; Mike Gilbert) • Improve dbus-launch --autolaunch so it can pick up an existing bus from Linux XDG_RUNTIME_DIR or macOS launchd, even if X11 autolaunching was disabled (dbus#385, dbus#392; Simon McVittie, Alex Richardson) • Correctly escape AF_UNIX socket paths when converting them to D-Bus address strings (dbus#405, Marc-André Lureau) • On Linux, don't log warnings if oom_score_adj is read-only but does not need to be changed (dbus!291, Simon McVittie) • Slightly improve error-handling for inotify (dbus!235, Simon McVittie) • Don't crash if dbus-daemon is asked to watch more than 128 directories for changes (dbus!302, Jan Tojnar) • Silence various compiler warnings (dbus!275, dbus!289, dbus!305, dbus!307, dbus!312, dbus!315; Ralf Habacker, Simon McVittie, Alex Richardson, Marc-André Lureau) • On Windows, use safer locking patterns for the system-global mutex used to implement autolaunching (dbus#368, dbus#370; Ralf Habacker) • Index dbus-arch-deps.h for API documentation when building out-of-tree (dbus!312, Marc-André Lureau) • Silence xmlto warnings when building man pages (dbus!312, Marc-André Lureau) • Fix build failure when checks are disabled but assertions are enabled (dbus#412, Johannes Kauffmann) • Use C99 flexible arrays in the memory pool implementation for better support for modern compilers (dbus!343, dbus!344; Alex Richardson, Simon McVittie) • Autotools build system fixes: · Don't treat --with-x or --with-x=yes as a request to disable X11, fixing a regression in 1.13.20. Instead, require X11 libraries and fail if they cannot be detected. (dbus!263, Lars Wendler) · When a CMake project uses an Autotools-built libdbus in a non-standard prefix, find dbus-arch-deps.h successfully (dbus#314, Simon McVittie) · Don't include generated XML catalog in source releases (dbus!317, Jan Tojnar) · Improve robustness of detecting gcc __sync atomic builtins (dbus!320, Alex Richardson) • CMake build system fixes: · Detect endianness correctly, fixing interoperability with other D-Bus implementations on big-endian systems (dbus#375, Ralf Habacker) · Fix a race condition generating man pages and HTML documentation (dbus#381, Ralf Habacker) · When building for Unix, install session and system bus setup in the intended locations (dbus!267, dbus!297; Ralf Habacker, Alex Richardson) · Detect setresuid() and getresuid() (dbus!319, Alex Richardson) · Detect backtrace() on FreeBSD (dbus!281, Alex Richardson) · Don't include headers from parent directory (dbus!282, Alex Richardson) · Fix -Wunused-command-line-argument on FreeBSD (dbus!278, Alex Richardson) · Only add warning flags if the compiler supports them (dbus!276, Alex Richardson) · Distinguish between host and target TMPDIR when cross-compiling (dbus!279, Alex Richardson) · Improve compiler warning detection (dbus#387, Ralf Habacker) · Allow TEST_SOCKET_DIR to be overridden (dbus!295, Ralf Habacker) · Fix detection of atomic operations (dbus!306, Alex Richardson) · Use DWARF 2 instead of STABS for debug symbols on Windows, for compatibility with newer gcc versions (dbus!323, Marc-André Lureau) · Fix use of paths relative to the dbus project directory when dbus is vendored into a larger CMake project (dbus!332, Jordan Williams) Tests and CI enhancements: • Add an automated test for Windows autolaunching (dbus#235, Ralf Habacker) • Avoid compiler warnings in test code (dbus#383, dbus!274, dbus!275; Simon McVittie, Ralf Habacker) • Avoid LeakSanitizer warnings in test code (dbus!326, Simon McVittie) • Speed up a particularly slow unit test by a factor of 30 (dbus!328, Simon McVittie) • On Unix, skip tests that switch uid if run in a container that is unable to do so, instead of failing (dbus#407, Simon McVittie) • On Unix, consistently create test sockets in DBUS_TEST_SOCKET_DIR and not the build directory, allowing the build directory to be mounted with a non-POSIX filesystem (dbus!334, Alex Richardson) • Gitlab-CI improvements (dbus#383, dbus#388, dbus!262, dbus!288, dbus!292, dbus!296, dbus!299, dbus!301; Ralf Habacker, Simon McVittie, Alex Richardson) • Added FreeBSD Gitlab-CI build jobs (dbus!280, dbus!347; Alex Richardson) • Use the latest MSYS2 packages for CI (Ralf Habacker, Simon McVittie)
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 86a84624f5723774cfb0df337cbaec0681d9aa7d Author: Adolf Belka adolf.belka@ipfire.org Date: Wed Jan 22 22:07:00 2025 +0100
clamav: Update to version 1.4.2
- Update from version 1.4.1 to 1.4.2 - Update of rootfile - Changelog 1.4.2 - [CVE-2025-20128](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2025-20128): Fixed a possible buffer overflow read bug in the OLE2 file parser that could cause a denial-of-service (DoS) condition. This issue was introduced in version 1.0.0 and affects all currently supported versions. It will be fixed in: - 1.4.2 - 1.0.8 Thank you to OSS-Fuzz for identifying this issue.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/kbd | 10 ++--- config/rootfiles/common/liburcu | 17 +++------ .../{perl-Text-CSV_XS => perl-File-LibMagic} | 18 +++++---- config/rootfiles/common/ppp | 44 +++++++++++----------- config/rootfiles/core/192/filelists/files | 3 ++ .../{oldcore/112 => core/192}/filelists/kbd | 0 .../{oldcore/163 => core/192}/filelists/liburcu | 0 .../core/192/filelists/perl-File-LibMagic | 1 + .../{oldcore/125 => core/192}/filelists/ppp | 0 config/rootfiles/core/192/update.sh | 4 ++ config/rootfiles/packages/clamav | 2 + config/rootfiles/packages/dbus | 4 +- config/unbound/root.hints | 10 ++--- doc/language_issues.en | 2 +- doc/language_issues.it | 2 +- doc/language_issues.nl | 2 +- doc/language_issues.pl | 2 +- doc/language_issues.ru | 2 +- doc/language_missings | 8 ++-- html/cgi-bin/captive.cgi | 38 +++++++++++-------- html/cgi-bin/captive/logo.cgi | 13 +++++-- langs/de/cgi-bin/de.pl | 2 +- langs/en/cgi-bin/en.pl | 2 +- langs/es/cgi-bin/es.pl | 2 +- langs/fr/cgi-bin/fr.pl | 2 +- langs/tr/cgi-bin/tr.pl | 2 +- lfs/clamav | 9 ++--- lfs/dbus | 23 +++++------ lfs/kbd | 6 +-- lfs/liburcu | 6 +-- lfs/{perl-GD-Graph => perl-File-LibMagic} | 8 ++-- lfs/ppp | 6 +-- make.sh | 1 + 33 files changed, 131 insertions(+), 120 deletions(-) copy config/rootfiles/common/{perl-Text-CSV_XS => perl-File-LibMagic} (59%) copy config/rootfiles/{oldcore/112 => core/192}/filelists/kbd (100%) copy config/rootfiles/{oldcore/163 => core/192}/filelists/liburcu (100%) create mode 120000 config/rootfiles/core/192/filelists/perl-File-LibMagic copy config/rootfiles/{oldcore/125 => core/192}/filelists/ppp (100%) copy lfs/{perl-GD-Graph => perl-File-LibMagic} (91%)
Difference in files: diff --git a/config/rootfiles/common/kbd b/config/rootfiles/common/kbd index 98c677a6a9..9410706ff0 100644 --- a/config/rootfiles/common/kbd +++ b/config/rootfiles/common/kbd @@ -13,9 +13,6 @@ bin/setfont #lib/kbd/consolefonts/880.cp.gz #lib/kbd/consolefonts/928.cp.gz #lib/kbd/consolefonts/972.cp.gz -#lib/kbd/consolefonts/Agafari-12.psfu.gz -#lib/kbd/consolefonts/Agafari-14.psfu.gz -#lib/kbd/consolefonts/Agafari-16.psfu.gz #lib/kbd/consolefonts/Cyr_a8x14.psfu.gz #lib/kbd/consolefonts/Cyr_a8x16.psfu.gz #lib/kbd/consolefonts/Cyr_a8x8.psfu.gz @@ -695,18 +692,17 @@ usr/bin/unicode_stop #usr/share/locale/el/LC_MESSAGES/kbd.mo #usr/share/locale/eo/LC_MESSAGES/kbd.mo #usr/share/locale/es/LC_MESSAGES/kbd.mo -#usr/share/locale/fr/LC_MESSAGES/kbd.mo -#usr/share/locale/gr -#usr/share/locale/gr/LC_MESSAGES -#usr/share/locale/gr/LC_MESSAGES/kbd.mo +#usr/share/locale/hu/LC_MESSAGES/kbd.mo #usr/share/locale/id/LC_MESSAGES/kbd.mo #usr/share/locale/it/LC_MESSAGES/kbd.mo +#usr/share/locale/ka/LC_MESSAGES/kbd.mo #usr/share/locale/nl/LC_MESSAGES/kbd.mo #usr/share/locale/pl/LC_MESSAGES/kbd.mo #usr/share/locale/pt/LC_MESSAGES/kbd.mo #usr/share/locale/pt_BR/LC_MESSAGES/kbd.mo #usr/share/locale/ro/LC_MESSAGES/kbd.mo #usr/share/locale/ru/LC_MESSAGES/kbd.mo +#usr/share/locale/sq/LC_MESSAGES/kbd.mo #usr/share/locale/sr/LC_MESSAGES/kbd.mo #usr/share/locale/sv/LC_MESSAGES/kbd.mo #usr/share/locale/tr/LC_MESSAGES/kbd.mo diff --git a/config/rootfiles/common/liburcu b/config/rootfiles/common/liburcu index ae77325f25..d890c2ebd8 100644 --- a/config/rootfiles/common/liburcu +++ b/config/rootfiles/common/liburcu @@ -6,6 +6,7 @@ #usr/include/urcu-pointer.h #usr/include/urcu-qsbr.h #usr/include/urcu.h +#usr/include/urcu/annotate.h #usr/include/urcu/arch #usr/include/urcu/arch.h #usr/include/urcu/arch/aarch64.h @@ -43,7 +44,6 @@ #usr/include/urcu/map/urcu-mb.h #usr/include/urcu/map/urcu-memb.h #usr/include/urcu/map/urcu-qsbr.h -#usr/include/urcu/map/urcu-signal.h #usr/include/urcu/map/urcu.h #usr/include/urcu/pointer.h #usr/include/urcu/rcuhlist.h @@ -62,8 +62,6 @@ #usr/include/urcu/static/urcu-mb.h #usr/include/urcu/static/urcu-memb.h #usr/include/urcu/static/urcu-qsbr.h -#usr/include/urcu/static/urcu-signal-nr.h -#usr/include/urcu/static/urcu-signal.h #usr/include/urcu/static/urcu.h #usr/include/urcu/static/wfcqueue.h #usr/include/urcu/static/wfqueue.h @@ -75,7 +73,10 @@ #usr/include/urcu/uatomic.h #usr/include/urcu/uatomic/aarch64.h #usr/include/urcu/uatomic/alpha.h +#usr/include/urcu/uatomic/api.h #usr/include/urcu/uatomic/arm.h +#usr/include/urcu/uatomic/builtins-generic.h +#usr/include/urcu/uatomic/builtins.h #usr/include/urcu/uatomic/gcc.h #usr/include/urcu/uatomic/generic.h #usr/include/urcu/uatomic/hppa.h @@ -97,7 +98,6 @@ #usr/include/urcu/urcu-memb.h #usr/include/urcu/urcu-poll.h #usr/include/urcu/urcu-qsbr.h -#usr/include/urcu/urcu-signal.h #usr/include/urcu/urcu.h #usr/include/urcu/urcu_ref.h #usr/include/urcu/wfcqueue.h @@ -127,10 +127,6 @@ usr/lib/liburcu-memb.so.8.1.0 #usr/lib/liburcu-qsbr.so usr/lib/liburcu-qsbr.so.8 usr/lib/liburcu-qsbr.so.8.1.0 -#usr/lib/liburcu-signal.la -#usr/lib/liburcu-signal.so -usr/lib/liburcu-signal.so.8 -usr/lib/liburcu-signal.so.8.1.0 #usr/lib/liburcu.la #usr/lib/liburcu.so usr/lib/liburcu.so.8 @@ -140,10 +136,9 @@ usr/lib/liburcu.so.8.1.0 #usr/lib/pkgconfig/liburcu-mb.pc #usr/lib/pkgconfig/liburcu-memb.pc #usr/lib/pkgconfig/liburcu-qsbr.pc -#usr/lib/pkgconfig/liburcu-signal.pc #usr/lib/pkgconfig/liburcu.pc #usr/share/doc/userspace-rcu -#usr/share/doc/userspace-rcu/LICENSE +#usr/share/doc/userspace-rcu/LICENSE.md #usr/share/doc/userspace-rcu/README.md #usr/share/doc/userspace-rcu/cds-api.md #usr/share/doc/userspace-rcu/examples @@ -210,12 +205,10 @@ usr/lib/liburcu.so.8.1.0 #usr/share/doc/userspace-rcu/examples/urcu-flavors/Makefile.mb #usr/share/doc/userspace-rcu/examples/urcu-flavors/Makefile.membarrier #usr/share/doc/userspace-rcu/examples/urcu-flavors/Makefile.qsbr -#usr/share/doc/userspace-rcu/examples/urcu-flavors/Makefile.signal #usr/share/doc/userspace-rcu/examples/urcu-flavors/bp.c #usr/share/doc/userspace-rcu/examples/urcu-flavors/mb.c #usr/share/doc/userspace-rcu/examples/urcu-flavors/membarrier.c #usr/share/doc/userspace-rcu/examples/urcu-flavors/qsbr.c -#usr/share/doc/userspace-rcu/examples/urcu-flavors/signal.c #usr/share/doc/userspace-rcu/examples/wfcqueue #usr/share/doc/userspace-rcu/examples/wfcqueue/Makefile #usr/share/doc/userspace-rcu/examples/wfcqueue/Makefile.cds_wfcq_dequeue diff --git a/config/rootfiles/common/perl-File-LibMagic b/config/rootfiles/common/perl-File-LibMagic new file mode 100644 index 0000000000..f08929963c --- /dev/null +++ b/config/rootfiles/common/perl-File-LibMagic @@ -0,0 +1,10 @@ +#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/File +#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/File/LibMagic +usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/File/LibMagic.pm +usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/File/LibMagic/Constants.pm +#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/File +#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/File/LibMagic +#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/File/LibMagic/.packlist +usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/File/LibMagic/LibMagic.so +#usr/share/man/man3/File::LibMagic.3 +#usr/share/man/man3/File::LibMagic::Constants.3 diff --git a/config/rootfiles/common/ppp b/config/rootfiles/common/ppp index dc24e97910..fe2d0d2444 100644 --- a/config/rootfiles/common/ppp +++ b/config/rootfiles/common/ppp @@ -38,29 +38,27 @@ etc/ppp/standardloginscript #usr/include/pppd/upap.h #usr/lib/pkgconfig/pppd.pc usr/lib/pppd -usr/lib/pppd/2.5.1 -#usr/lib/pppd/2.5.1/minconn.la -usr/lib/pppd/2.5.1/minconn.so -#usr/lib/pppd/2.5.1/openl2tp.la -usr/lib/pppd/2.5.1/openl2tp.so -#usr/lib/pppd/2.5.1/passprompt.la -usr/lib/pppd/2.5.1/passprompt.so -#usr/lib/pppd/2.5.1/passwordfd.la -usr/lib/pppd/2.5.1/passwordfd.so -#usr/lib/pppd/2.5.1/pppoatm.la -usr/lib/pppd/2.5.1/pppoatm.so -#usr/lib/pppd/2.5.1/pppoe.la -usr/lib/pppd/2.5.1/pppoe.so -#usr/lib/pppd/2.5.1/pppol2tp.la -usr/lib/pppd/2.5.1/pppol2tp.so -#usr/lib/pppd/2.5.1/radattr.la -usr/lib/pppd/2.5.1/radattr.so -#usr/lib/pppd/2.5.1/radius.la -usr/lib/pppd/2.5.1/radius.so -#usr/lib/pppd/2.5.1/radrealms.la -usr/lib/pppd/2.5.1/radrealms.so -#usr/lib/pppd/2.5.1/winbind.la -usr/lib/pppd/2.5.1/winbind.so +usr/lib/pppd/2.5.2 +#usr/lib/pppd/2.5.2/minconn.la +usr/lib/pppd/2.5.2/minconn.so +#usr/lib/pppd/2.5.2/openl2tp.la +usr/lib/pppd/2.5.2/openl2tp.so +#usr/lib/pppd/2.5.2/passwordfd.la +usr/lib/pppd/2.5.2/passwordfd.so +#usr/lib/pppd/2.5.2/pppoatm.la +usr/lib/pppd/2.5.2/pppoatm.so +#usr/lib/pppd/2.5.2/pppoe.la +usr/lib/pppd/2.5.2/pppoe.so +#usr/lib/pppd/2.5.2/pppol2tp.la +usr/lib/pppd/2.5.2/pppol2tp.so +#usr/lib/pppd/2.5.2/radattr.la +usr/lib/pppd/2.5.2/radattr.so +#usr/lib/pppd/2.5.2/radius.la +usr/lib/pppd/2.5.2/radius.so +#usr/lib/pppd/2.5.2/radrealms.la +usr/lib/pppd/2.5.2/radrealms.so +#usr/lib/pppd/2.5.2/winbind.la +usr/lib/pppd/2.5.2/winbind.so usr/sbin/chat usr/sbin/pppd usr/sbin/pppdump diff --git a/config/rootfiles/core/192/filelists/files b/config/rootfiles/core/192/filelists/files index 7a8b24e62b..048da19182 100644 --- a/config/rootfiles/core/192/filelists/files +++ b/config/rootfiles/core/192/filelists/files @@ -1,2 +1,5 @@ +etc/unbound/root.hints +srv/web/ipfire/cgi-bin/captive/logo.cgi +srv/web/ipfire/cgi-bin/captive.cgi var/ipfire/backup/bin/backup.pl var/ipfire/graphs.pl diff --git a/config/rootfiles/core/192/filelists/kbd b/config/rootfiles/core/192/filelists/kbd new file mode 120000 index 0000000000..9b85839b1f --- /dev/null +++ b/config/rootfiles/core/192/filelists/kbd @@ -0,0 +1 @@ +../../../common/kbd \ No newline at end of file diff --git a/config/rootfiles/core/192/filelists/liburcu b/config/rootfiles/core/192/filelists/liburcu new file mode 120000 index 0000000000..d19012e047 --- /dev/null +++ b/config/rootfiles/core/192/filelists/liburcu @@ -0,0 +1 @@ +../../../common/liburcu \ No newline at end of file diff --git a/config/rootfiles/core/192/filelists/perl-File-LibMagic b/config/rootfiles/core/192/filelists/perl-File-LibMagic new file mode 120000 index 0000000000..fb300e825d --- /dev/null +++ b/config/rootfiles/core/192/filelists/perl-File-LibMagic @@ -0,0 +1 @@ +../../../common/perl-File-LibMagic \ No newline at end of file diff --git a/config/rootfiles/core/192/filelists/ppp b/config/rootfiles/core/192/filelists/ppp new file mode 120000 index 0000000000..4844a9b58c --- /dev/null +++ b/config/rootfiles/core/192/filelists/ppp @@ -0,0 +1 @@ +../../../common/ppp \ No newline at end of file diff --git a/config/rootfiles/core/192/update.sh b/config/rootfiles/core/192/update.sh index 2e874fd66f..7822bb24ca 100644 --- a/config/rootfiles/core/192/update.sh +++ b/config/rootfiles/core/192/update.sh @@ -85,6 +85,10 @@ rm -rvf \ /boot/dtb-* \ /lib/modules
+# remove old pppd libs +rm -rvf \ + /usr/lib/pppd + # Extract files extract_files
diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav index 0bf660202d..d5495e4b7b 100644 --- a/config/rootfiles/packages/clamav +++ b/config/rootfiles/packages/clamav @@ -172,6 +172,8 @@ usr/sbin/clamd #usr/share/doc/ClamAV/html/sitemap.xml #usr/share/doc/ClamAV/html/theme-dawn.js #usr/share/doc/ClamAV/html/theme-tomorrow_night.js +#usr/share/doc/ClamAV/html/toc.html +#usr/share/doc/ClamAV/html/toc.js #usr/share/doc/ClamAV/html/tomorrow-night.css #var/ipfire/clamav var/ipfire/clamav/clamd.conf diff --git a/config/rootfiles/packages/dbus b/config/rootfiles/packages/dbus index 2cf7fe37b5..e9a04cd573 100644 --- a/config/rootfiles/packages/dbus +++ b/config/rootfiles/packages/dbus @@ -37,10 +37,9 @@ usr/bin/dbus-uuidgen #usr/lib/dbus-1.0/include #usr/lib/dbus-1.0/include/dbus #usr/lib/dbus-1.0/include/dbus/dbus-arch-deps.h -#usr/lib/libdbus-1.la #usr/lib/libdbus-1.so usr/lib/libdbus-1.so.3 -usr/lib/libdbus-1.so.3.32.4 +usr/lib/libdbus-1.so.3.38.3 #usr/lib/pkgconfig/dbus-1.pc usr/libexec/dbus-daemon-launch-helper #usr/share/dbus-1 @@ -58,6 +57,7 @@ usr/share/dbus-1/system.d #usr/share/doc/dbus/examples/example-session-disable-stats.conf #usr/share/doc/dbus/examples/example-system-enable-stats.conf #usr/share/doc/dbus/examples/example-system-hardening-without-traditional-activation.conf +#usr/share/doc/dbus/index.html #usr/share/doc/dbus/system-activation.txt #usr/share/xml/dbus-1 #usr/share/xml/dbus-1/busconfig.dtd diff --git a/config/unbound/root.hints b/config/unbound/root.hints index 08c76a3724..abd2b4f8be 100644 --- a/config/unbound/root.hints +++ b/config/unbound/root.hints @@ -8,9 +8,9 @@ ; file /domain/named.cache ; on server FTP.INTERNIC.NET ; -OR- RS.INTERNIC.NET -; -; last update: July 03, 2019 -; related version of root zone: 2019070301 +; +; last update: December 18, 2024 +; related version of root zone: 2024121801 ; ; FORMERLY NS.INTERNIC.NET ; @@ -21,8 +21,8 @@ A.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:ba3e::2:30 ; FORMERLY NS1.ISI.EDU ; . 3600000 NS B.ROOT-SERVERS.NET. -B.ROOT-SERVERS.NET. 3600000 A 199.9.14.201 -B.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:200::b +B.ROOT-SERVERS.NET. 3600000 A 170.247.170.2 +B.ROOT-SERVERS.NET. 3600000 AAAA 2801:1b8:10::b ; ; FORMERLY C.PSI.NET ; diff --git a/doc/language_issues.en b/doc/language_issues.en index 3f1626b68d..a1730ac7b8 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -37,7 +37,7 @@ WARNING: untranslated string: Captive upload logo = Upload Logo WARNING: untranslated string: Captive upload logo recommendations = (PNG or JPEG, recommended 1280x720 pixels) WARNING: untranslated string: Captive valid for = Valid for WARNING: untranslated string: Captive vouchervalid = Allowed time for this coupon -WARNING: untranslated string: Captive wrong ext = Uploaded file has wrong filetype +WARNING: untranslated string: Captive wrong type = Uploaded file has wrong filetype WARNING: untranslated string: Choose Rule = Choose <u>one</u> of the following rules. WARNING: untranslated string: Class = Class WARNING: untranslated string: Class was deleted = with potential subclasses was deleted diff --git a/doc/language_issues.it b/doc/language_issues.it index 5870e2bc73..16371b566a 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -936,7 +936,7 @@ WARNING: untranslated string: Captive upload logo = Upload Logo WARNING: untranslated string: Captive upload logo recommendations = (PNG or JPEG, recommended 1280x720 pixels) WARNING: untranslated string: Captive valid for = Valid for WARNING: untranslated string: Captive vouchervalid = Allowed time for this coupon -WARNING: untranslated string: Captive wrong ext = Uploaded file has wrong filetype +WARNING: untranslated string: Captive wrong type = Uploaded file has wrong filetype WARNING: untranslated string: MTU settings = MTU settings: WARNING: untranslated string: Number of Countries for the pie chart = Number of Countries for the pie chart WARNING: untranslated string: access point name = Access Point Name diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 88493d1d95..f647d50a80 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -937,7 +937,7 @@ WARNING: untranslated string: Captive upload logo = Upload Logo WARNING: untranslated string: Captive upload logo recommendations = (PNG or JPEG, recommended 1280x720 pixels) WARNING: untranslated string: Captive valid for = Valid for WARNING: untranslated string: Captive vouchervalid = Allowed time for this coupon -WARNING: untranslated string: Captive wrong ext = Uploaded file has wrong filetype +WARNING: untranslated string: Captive wrong type = Uploaded file has wrong filetype WARNING: untranslated string: MTU settings = MTU settings: WARNING: untranslated string: Number of Countries for the pie chart = Number of Countries for the pie chart WARNING: untranslated string: access point name = Access Point Name diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 5f38061021..a3acc61af7 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -847,7 +847,7 @@ WARNING: untranslated string: Captive upload logo = Upload Logo WARNING: untranslated string: Captive upload logo recommendations = (PNG or JPEG, recommended 1280x720 pixels) WARNING: untranslated string: Captive valid for = Valid for WARNING: untranslated string: Captive vouchervalid = Allowed time for this coupon -WARNING: untranslated string: Captive wrong ext = Uploaded file has wrong filetype +WARNING: untranslated string: Captive wrong type = Uploaded file has wrong filetype WARNING: untranslated string: ConnSched dial = Connect WARNING: untranslated string: ConnSched hangup = Disconnect WARNING: untranslated string: ConnSched reboot = Reboot diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 8891ce20e2..e946c22df4 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -841,7 +841,7 @@ WARNING: untranslated string: Captive upload logo = Upload Logo WARNING: untranslated string: Captive upload logo recommendations = (PNG or JPEG, recommended 1280x720 pixels) WARNING: untranslated string: Captive valid for = Valid for WARNING: untranslated string: Captive vouchervalid = Allowed time for this coupon -WARNING: untranslated string: Captive wrong ext = Uploaded file has wrong filetype +WARNING: untranslated string: Captive wrong type = Uploaded file has wrong filetype WARNING: untranslated string: ConnSched dial = Connect WARNING: untranslated string: ConnSched hangup = Disconnect WARNING: untranslated string: ConnSched reboot = Reboot diff --git a/doc/language_missings b/doc/language_missings index 2a2333d948..92a78b090c 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -314,7 +314,7 @@ < Captive vouchervalid < Captive vout < Captive WiFi coupon -< Captive wrong ext +< Captive wrong type < check all < core update < cpu frequency @@ -858,7 +858,7 @@ < Captive vouchervalid < Captive vout < Captive WiFi coupon -< Captive wrong ext +< Captive wrong type < check all < cpu frequency < crypto error @@ -1441,7 +1441,7 @@ < Captive vouchervalid < Captive vout < Captive WiFi coupon -< Captive wrong ext +< Captive wrong type < ccd add < ccd choose net < ccd clientip @@ -2457,7 +2457,7 @@ < Captive vouchervalid < Captive vout < Captive WiFi coupon -< Captive wrong ext +< Captive wrong type < ccd add < ccd choose net < ccd clientip diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi index ce666381c1..6face0bda8 100644 --- a/html/cgi-bin/captive.cgi +++ b/html/cgi-bin/captive.cgi @@ -25,6 +25,8 @@ use HTML::Entities(); use File::Basename; use PDF::API2; use constant mm => 25.4 / 72; +use File::LibMagic; +use File::Copy;
# enable only the following on debugging purpose #use warnings; @@ -53,6 +55,7 @@ my $coupons = "${General::swroot}/captive/coupons"; my %couponhash = ();
my $logo = "${General::swroot}/captive/logo.dat"; +my $logotmp = "/tmp/logo.tmp";
my %settings=(); my %mainsettings; @@ -92,13 +95,25 @@ if ($cgiparams{'ACTION'} eq "export-coupons") { if ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) { my $file = $cgiparams{'logo'}; if ($file) { - # Check if the file extension is PNG/JPEG chomp $file; - - my ($name, $path, $ext) = fileparse($file, qr/.[^.]*$/); - if ($ext ne ".png" && $ext ne ".jpg" && $ext ne ".jpeg") { - $errormessage = $Lang::tr{'Captive wrong ext'}; + # Save logo to /tmp/ to carry out content type check + my ($filehandle) = CGI::upload("logo"); + open(FILE, ">$logotmp"); + binmode $filehandle; + while (<$filehandle>) { + print FILE; + } + close(FILE); + # Check if the file content type is PNG or JPEG + my $magic = File::LibMagic->new; + my $file_info = $magic->info_from_filename($logotmp); + my $file_mime_type = $file_info->{mime_type}; + if ($file_mime_type ne "image/png" && $file_mime_type ne "image/jpeg") { + $errormessage = $Lang::tr{'Captive wrong type'}." - ".$file_mime_type; + # Remove temporary logo file if there was an error. + unlink $logotmp; } + }
$settings{'ENABLE_GREEN'} = $cgiparams{'ENABLE_GREEN'}; @@ -111,17 +126,8 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) { if (!$errormessage){ #Check if we need to upload a new logo if ($file) { - # Save logo - my ($filehandle) = CGI::upload("logo"); - - # XXX check filesize - - open(FILE, ">$logo"); - binmode $filehandle; - while (<$filehandle>) { - print FILE; - } - close(FILE); + # Move uploaded logo file from /tmp/ + File::Copy::move $logotmp, $logo; }
&General::writehash("$settingsfile", %settings); diff --git a/html/cgi-bin/captive/logo.cgi b/html/cgi-bin/captive/logo.cgi index 8f292b1718..0b09476aa0 100644 --- a/html/cgi-bin/captive/logo.cgi +++ b/html/cgi-bin/captive/logo.cgi @@ -2,9 +2,9 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2016 Alexander Marx alexander.marx@ipfire.org # +# Copyright (C) 2016-2024 IPFire Team info@ipfire.org # # # -# This program is free software you can redistribute it and/or modify # +# 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 # # the Free Software Foundation, either version 3 of the License, or # # (at your option) any later version. # @@ -22,6 +22,7 @@ use strict; use CGI; use File::Copy; +use File::LibMagic;
# enable only the following on debugging purpose #use warnings; @@ -29,7 +30,11 @@ use File::Copy;
require '/var/ipfire/general-functions.pl';
+my $q = new CGI; +my $magic = File::LibMagic->new; + my $logo = "${General::swroot}/captive/logo.dat"; +my $file_info = $magic->info_from_filename($logo);
# Send 404 if logo was not uploaded and exit if (!-e $logo) { @@ -37,8 +42,8 @@ if (!-e $logo) { exit(0); }
-print "Content-Type: application/octet-stream\n\n"; - # Send image data +print $q->header(-type=>$file_info->{mime_type}); +binmode STDOUT; File::Copy::copy $logo, *STDOUT; exit(0); diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 2565505a5e..5f89c7010a 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -62,7 +62,7 @@ 'Captive voucher' => 'Gutschein', 'Captive vouchervalid' => 'Erlaubter Zeitraum für Gutschein', 'Captive vout' => 'Ausgegebene Gutscheine', -'Captive wrong ext' => 'Die hochgeladene Datei ist vom falschen Dateityp', +'Captive wrong type' => 'Die hochgeladene Datei ist vom falschen Dateityp', 'Choose Rule' => 'Wählen Sie <u>eine</u> der untenstehenden Regeln aus.', 'Class' => 'Klasse', 'Class was deleted' => 'wurde mit eventuell vorhandenen Unterklassen gelöscht', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 5c8da52be2..197f446334 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -61,7 +61,7 @@ 'Captive voucher' => 'Coupon', 'Captive vouchervalid' => 'Allowed time for this coupon', 'Captive vout' => 'Issued Vouchers', -'Captive wrong ext' => 'Uploaded file has wrong filetype', +'Captive wrong type' => 'Uploaded file has wrong filetype', 'Choose Rule' => 'Choose <u>one</u> of the following rules.', 'Class' => 'Class', 'Class was deleted' => 'with potential subclasses was deleted', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index 27b0e739e8..8a6322abe6 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -61,7 +61,7 @@ 'Captive voucher' => 'Cupón', 'Captive vouchervalid' => 'Tiempo permitido para este cupón', 'Captive vout' => 'Cupones emitidos', -'Captive wrong ext' => 'El archivo subido tiene un tipo de archivo incorrecto', +'Captive wrong type' => 'El archivo subido tiene un tipo de archivo incorrecto', 'Choose Rule' => 'Seleccione <u>una</u> de las siguientes reglas.', 'Class' => 'Clase', 'Class was deleted' => 'con subclases potenciales fué eliminado', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index eafeea7052..055def46e5 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -66,7 +66,7 @@ 'Captive voucher' => 'Coupon', 'Captive vouchervalid' => 'Délai d'expiration de ce coupon', 'Captive vout' => 'Reçus émis', -'Captive wrong ext' => 'Le fichier téléchargé a un mauvais type de fichier', +'Captive wrong type' => 'Le fichier téléchargé a un mauvais type de fichier', 'Choose Rule' => 'Choisissez <u>une</u> des règles suivantes.', 'Class' => 'Classe', 'Class was deleted' => 'Avec potentielles sous-classes effacées', diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl index b86097309d..624f6eec55 100644 --- a/langs/tr/cgi-bin/tr.pl +++ b/langs/tr/cgi-bin/tr.pl @@ -61,7 +61,7 @@ 'Captive voucher' => 'Kupon', 'Captive vouchervalid' => 'Bu kupon için izin verilen süre', 'Captive vout' => 'Verilen Kuponlar', -'Captive wrong ext' => 'Yüklenen dosya yanlış dosya türüne sahip', +'Captive wrong type' => 'Yüklenen dosya yanlış dosya türüne sahip', 'Choose Rule' => 'Aşağıdaki kurallardan <u>birini</u> seçin.', 'Class' => 'Sınıf', 'Class was deleted' => 'Potansiyel alt sınıfları ile silindi', diff --git a/lfs/clamav b/lfs/clamav index 72a3be7909..ba87dac3a0 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2024 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2025 IPFire Team info@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 # @@ -26,7 +26,7 @@ include Config
SUMMARY = Antivirus Toolkit
-VER = 1.4.1 +VER = 1.4.2
THISAPP = clamav-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = clamav -PAK_VER = 74 +PAK_VER = 75
DEPS =
@@ -50,7 +50,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 2cc31d5d4f33ddfffd01a46d88b09965ea8634fa711e5772a303d00c31efab2986727d6d26ca221f6518b80eb5ea3637c26dc0a2c32a493dd0a1cd43d2fd5d10 +$(DL_FILE)_BLAKE2 = 869f3375ff3da33c0a63607499d06b3312788cf8fdaa0f026553c0b12a23888b7f27a6eda9ffb0888c268faad6b552941cef0c3178ea86197eb92d4ce4f011e5
install : $(TARGET) @@ -101,7 +101,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) -DAPP_CONFIG_DIRECTORY=/var/ipfire/clamav \ -DCURSES_LIBRARY=/usr/lib/libncurses.so \ -DDATABASE_DIRECTORY=$(DATABASE_DIR) - cd $(DIR_APP)/build && ninja $(MAKETUNING) && ninja install
mkdir -pv $(DATABASE_DIR) diff --git a/lfs/dbus b/lfs/dbus index bd351a6f9c..6d07c335b8 100644 --- a/lfs/dbus +++ b/lfs/dbus @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2025 IPFire Team info@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 # @@ -26,14 +26,14 @@ include Config
SUMMARY = D-Bus Message Bus System
-VER = 1.14.10 +VER = 1.16.0 THISAPP = dbus-$(VER) DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = dbus -PAK_VER = 11 +PAK_VER = 12
DEPS =
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = f605b0810dcde6a0753384927131e7f4675be737ad7506a51261717c2622e74b99ac33cc2c199b98e5aa6b9d7c68ef692b8ee9f684f6fdab8d06c6fa861a6f6b +$(DL_FILE)_BLAKE2 = a5a3ebe777c1c0296ba7240f9ed29ad329a6578a05baf10a469ce8c7d243791d35aca42a70d04cdd88feea238d081c3c8b0db444df24abcf7ce5ffe9187a0440
install : $(TARGET)
@@ -81,13 +81,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_SRC)/dbus* cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install + cd $(DIR_APP) && meson setup \ + -D prefix=/usr \ + -D sysconfdir=/etc \ + -D localstatedir=/var \ + -D default_library=shared \ + builddir/ + cd $(DIR_APP) && ninja -C builddir/ $(MAKETUNING) + cd $(DIR_APP) && ninja -C builddir/ install
#install initscripts $(call INSTALL_INITSCRIPTS,$(SERVICES)) diff --git a/lfs/kbd b/lfs/kbd index 5b250482ef..86afd07667 100644 --- a/lfs/kbd +++ b/lfs/kbd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2024 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2025 IPFire Team info@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 = 2.6.4 +VER = 2.7.1
THISAPP = kbd-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -42,7 +42,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE) kbd-latarcyrheb-16-fixed.tar.bz2 = $(DL_FROM)/kbd-latarcyrheb-16-fixed.tar.bz2 kbd-latsun-fonts.tar.bz2 = $(DL_FROM)/kbd-latsun-fonts.tar.bz2
-$(DL_FILE)_BLAKE2 = 25e55be0210c206c1f5eb0d85045bb1cbb2442cf88fb7eb28f7bbb8dd0d86473f48444fd9d80dfc624ce7ba8b39bfe1152ee6cf1877fab444e09600e93dae0ee +$(DL_FILE)_BLAKE2 = c817f78a0a377df5fcf2a6ba1608504fa875762db5bda1f061493e68ee6f6ef1fa085c0e440d74daeb6ad990ac48956caf7ab7f2a523b0d3b2480e69a9d810f5 kbd-latarcyrheb-16-fixed.tar.bz2_BLAKE2 = d5c701333b9eae7e0c467aebee5b2217c3225dee615622f77e501569f1464a8c32380b2d4a522730db74a909e1ea746e660ea6849bbf48195af22bda73858d1b kbd-latsun-fonts.tar.bz2_BLAKE2 = c3def1192331a65f3edcf608ca164370d2db0c61444f71fc83bf35cb86d417ae92582180ace853a3cf93e569a83a42fca054fbadbf7f5986a1abd17e8bb6691f
diff --git a/lfs/liburcu b/lfs/liburcu index 09ea0956e3..e30924d60e 100644 --- a/lfs/liburcu +++ b/lfs/liburcu @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2024 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2025 IPFire Team info@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.14.1 +VER = 0.15.0
THISAPP = userspace-rcu-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -41,7 +41,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 6ae6a98020f731b5dc3bef5e7cf1a0b590087dbaff8836a4d2b694ad8d0d76b298261d99bea4281907cb516980b69c673d80baac17ae244e2f4fe690fc539293 +$(DL_FILE)_BLAKE2 = 3502cd0acd6e8e1370a2fd369207a305b3138b0db3186a37a9511bcf2f9ba362787274b030b0138111fe1d4805acd95bbae00c4d2332f1a0761f02bdc7f89e38
install : $(TARGET)
diff --git a/lfs/perl-File-LibMagic b/lfs/perl-File-LibMagic new file mode 100644 index 0000000000..f10a509fe4 --- /dev/null +++ b/lfs/perl-File-LibMagic @@ -0,0 +1,77 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2025 IPFire Team info@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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.23 + +THISAPP = File-LibMagic-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_BLAKE2 = a409cdfbb7ac448858202ad79ee7b5cceb7d0bd17e42de108818ca6b03e8f8688f15dd5b5b0adc8ccab1a97174b02ccd93d5660dce2c04f585449182bd25a2aa + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +b2 : $(subst %,%_BLAKE2,$(objects)) + +############################################################################### +# Downloading, checking, b2sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_BLAKE2,$(objects)) : + @$(B2SUM) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && perl Makefile.PL + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/ppp b/lfs/ppp index a83dd10c6a..dba82a0b9c 100644 --- a/lfs/ppp +++ b/lfs/ppp @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2024 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2025 IPFire Team info@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 = 2.5.1 +VER = 2.5.2
# Download source file from https://download.samba.org/pub/ppp/
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = e3ece873ea25bde5ddffd0da168ffe6ba890693f20fb9f1d6a48f365331abdb4cf517fd0b3004d26a0c778ad4d750e39e38486544e2771b23223469db13c239c +$(DL_FILE)_BLAKE2 = 5a79bfaf23c2f1cba7b2c4e8f27e6033aa7ee6e119b4d96dfd2870f91524052fe9ed16149e5f76cf93370159f491af828b4103eb04bd4f5dbbecca4a08af9d0d
install : $(TARGET)
diff --git a/make.sh b/make.sh index b40530c5cc..d446d4d972 100755 --- a/make.sh +++ b/make.sh @@ -1759,6 +1759,7 @@ build_system() { lfsmake2 perl-Net-Telnet lfsmake2 perl-Capture-Tiny lfsmake2 perl-Config-AutoConf + lfsmake2 perl-File-LibMagic lfsmake2 perl-Object-Tiny lfsmake2 perl-Archive-Peek-Libarchive lfsmake2 python3-inotify
hooks/post-receive -- IPFire 2.x development tree