From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.haj.ipfire.org (localhost [IPv6:::1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4gb1Fp4nJfz2xSM for ; Wed, 10 Jun 2026 09:49:18 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [IPv6:2001:678:b28::25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (secp384r1 raw public key) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R12" (not verified)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4gb1Fp4PJTz2xM3 for ; Wed, 10 Jun 2026 09:49:18 +0000 (UTC) Received: from people01.haj.ipfire.org (people01.haj.ipfire.org [172.28.1.161]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bit raw public key) server-digest SHA256 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "people01.haj.ipfire.org", Issuer "E8" (not verified)) by mail01.ipfire.org (Postfix) with ESMTPS id 4gb1Fn0S30z2Vw for ; Wed, 10 Jun 2026 09:49:17 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1781084957; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=f5GPfx4/tNr5qriSNAbDNqnAsuexc8krYuckEstBzQ4=; b=iXFgqefNkUOZkFLuP63zFy5OHFkb9hB9InYQabr/myxwv81j2+UBUkzy4eytVRqMcn8hrQ xiHUt/3S5K3Do+DA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1781084957; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=f5GPfx4/tNr5qriSNAbDNqnAsuexc8krYuckEstBzQ4=; b=KQTJLrGTdaW1I9Ulq5ybydUU+a4qjlsl8L2QOPE+rWVmI2mmZIJntclLmX0glur1f9i7Vh usxhMr9cPbYZqRbHs+m6BgHoIR5tOa94MVEIwsbcH7Za7oW5w/9byV7o9xufjYdpiDhqcF 00Q+k0vr2UHcjMe5daN3sPk1wl0pLeVfHMks/qbqgLEO+OFmLt4K3YTi6f8wObBUyAxur+ AjIK+wMSGG4gj/qfoX2ynScQ3LWKxQC/Xz4YmQsIkh0HYECBbHOvVErllNfoe+hbzojNG2 5jGedvegLm+HqK4vbaw6iX/c97FkzSN4z7KdMWe4WXFqF3hX3T9PFgbXTX8zvg== Received: by people01.haj.ipfire.org (Postfix, from userid 1000) id 4gb1Fm2PsLz2xX6; Wed, 10 Jun 2026 09:49:16 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. e18915cb2b611614afd362baefde3b4ac5b1eca2 X-Git-Refname: refs/heads/next X-Git-Reftype: branch X-Git-Oldrev: 8024c29cd7ddab79877a38e70dcb5bcb63938de3 X-Git-Newrev: e18915cb2b611614afd362baefde3b4ac5b1eca2 Message-Id: <4gb1Fm2PsLz2xX6@people01.haj.ipfire.org> Date: Wed, 10 Jun 2026 09:49:16 +0000 (UTC) From: Michael Tremer Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: 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 e18915cb2b611614afd362baefde3b4ac5b1eca2 (commit) via 3341186af833b84fa100a39479b39fac89c60c7c (commit) via ce351c6b488fdcd562d0665745cdc0cab66fb97c (commit) via 5d1f998983eb26aed83ac75c2892b18d2c4ee5a3 (commit) via 31d52aabde211aabb3ce376b87a0b397b3abe270 (commit) via 555552b51874ca9dc9ea262ecb0bb81f879bdbfc (commit) from 8024c29cd7ddab79877a38e70dcb5bcb63938de3 (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 e18915cb2b611614afd362baefde3b4ac5b1eca2 Author: Michael Tremer Date: Wed Jun 10 09:48:39 2026 +0000 core204: Ship apache Signed-off-by: Michael Tremer commit 3341186af833b84fa100a39479b39fac89c60c7c Author: Matthias Fischer Date: Tue Jun 9 22:39:46 2026 +0200 apache: Update to 2.4.68 For details see: https://dlcdn.apache.org/httpd/CHANGES_2.4.68 "Changes with Apache 2.4.68 *) SECURITY: CVE-2026-49975: mod_http2 denial of service (cve.mitre.org) Memory Allocation with Excessive Size Value vulnerability in Apache HTTP Server's mod_http leads to denial of service via malicious HTTP requests. This issue affects Apache HTTP Server: from 2.4.17 through 2.4.67. Credits: Quang Luong of Calif.IO in collaboration with OpenAI Codex *) SECURITY: CVE-2026-48913: mod_http2 memory corruption when file handles exhausted (cve.mitre.org) Use After Free vulnerability in Apache HTTP Server module mod_http2 when file handles are already exhausted. This issue affects Apache HTTP Server: from 2.4.55 through 2.4.67. Credits: Sam Lovejoy, IBM X-Force Offensive Research (XOR) *) SECURITY: CVE-2026-44631: Heap Underflow in `ap_regname` via Signed Char Overflow (cve.mitre.org) Buffer Underwrite vulnerability in Apache HTTP Server on crafted regular expressions in the configuration. This issue affects Apache HTTP Server: from 2.4.0 through 2.4.67. Users are recommended to upgrade to version 2.4.68, which fixes the issue. Credits: Zhenpeng (Leo) Lin at depthfirst *) SECURITY: CVE-2026-44186: Loop in `proxy_ftp_handler` in mod_proxy_ftp (cve.mitre.org) Loop with Unreachable Exit Condition ('Infinite Loop') vulnerability in the mod_proxy_ftp module in Apache HTTP Server with an attacker controlled backend FTP server. This issue affects undefined: from 2.4.0 through 2.4.67. Users are recommended to upgrade to version 2.4.68, which fixes the issue. Credits: Zhenpeng (Leo) Lin at depthfirst *) SECURITY: CVE-2026-44185: Stack Buffer Over-Read in mod_ssl OCSP `send_request` (cve.mitre.org) Buffer Over-read vulnerability in Apache HTTP Server via outbound OCSP requests to an attacker controlled OCSP server This issue affects Apache HTTP Server: from 2.4.0 through 2.4.67. Users are recommended to upgrade to version 2.4.68, which fixes the issue. Credits: Zhenpeng (Leo) Lin at depthfirst *) SECURITY: CVE-2026-44119: escalation of privilege through expressions in .htaccess in multiple modules (cve.mitre.org) Improper Privilege Management vulnerability in Apache HTTP Server 2.4.67 and earlier allows local .htaccess authors to read files with the privileges of the httpd user. This issue affects Apache HTTP Server: from through 2.4.67. Users are recommended to upgrade to version 2.4.68, which fixes the issue. Credits: Lucian Nitescu *) SECURITY: CVE-2026-43951: OOB Read in `merge_response_headers` can cause crash (cve.mitre.org) Out-of-bounds Read vulnerability in Apache HTTP Server with mod_headers and mod_mime and multiple response languages. This issue affects Apache HTTP Server: from 2.4.0 through 2.4.67. Credits: Zhenpeng (Leo) Lin at depthfirst *) SECURITY: CVE-2026-42536: mod_xml2enc heap overflow (cve.mitre.org) Heap-based Buffer Overflow vulnerability in Apache HTTP Server with mod_xml2enc, xml2StartParse, and untrusted content This issue affects Apache HTTP Server: from 2.4.0 through 2.4.67. Users are recommended to upgrade to version 2.4.68, which fixes the issue. Credits: Zhenpeng (Leo) Lin at depthfirst *) SECURITY: CVE-2026-42535: mod_dav_fs protected directory access (cve.mitre.org) A path handling issue in mod_dav_fs in Apache 2.4.67 and earlier allows a WebDAV content author to directly manipulate trusted DAV property databases, potentially causing child process crashes. Users are recommended to upgrade to version 2.4.68, which fixes this issue. Credits: Zhenpeng (Leo) Lin at depthfirst *) SECURITY: CVE-2026-34356: ProxyPassReverseCookieMap buffer overflow (cve.mitre.org) Heap-based Buffer Overflow vulnerability in Apache HTTP Server with malicious backend servers and ProxyPassReverseCookie* This issue affects Apache HTTP Server: from 2.4.0 through 2.4.67. Users are recommended to upgrade to version 2.4.68, which fixes the issue. Credits: Arkadi Vainbrand *) SECURITY: CVE-2026-34355: mod_proxy_html buffer overflow (cve.mitre.org) A buffer overflow in mod_proxy_html in Apache HTTP Server 2.4.67 and earlier allows an attack by an untrusted backend. Users are recommended to upgrade to version 2.4.68, which fixes this issue. Credits: Elhanan Haenel *) SECURITY: CVE-2026-29170: mod_proxy_ftp XSS (cve.mitre.org) A cross-site scripting vulnerability exists in mod_proxy_ftp's HTML directory list generation in Apache HTTP Server 2.4.67 and earlier when listing FTP directory contents either via forward or reverse proxy configuration. Users are recommended to upgrade to version 2.4.68, which fixes this issue. Credits: Pavel Kohout, Aisle Research, Aisle.com *) SECURITY: CVE-2026-29167: mod_ldap per-dir use-after-free (cve.mitre.org) Use After Free vulnerability in Apache HTTP Server with mod_ldap in per-directory configuration This issue affects Apache HTTP Server: from 2.4.0 through 2.4.67. Users are recommended to upgrade to version 2.4.68, which fixes the issue. Credits: Pavel Kohout, Aisle Research, Aisle.com *) mod_ssl, ab: Add support for OpenSSL 4.0. [Joe Orton] *) mod_ssl: Add SerialNumber as a recognized attribute type for SSL distinguished name variables. [Michael Osipov , Benjamin Demarteau ] *) mod_ssl: Set auth type to "ClientCert" when client certificate authentication has been performed. [Michael Osipov ] *) mod_include: Don't print any of if/elsif/else content when a conditional evaluation returns an error. [Eric Covener] *) mod_unixd: CoreDumpDirectory requires enabling tracing on FreeBSD 11+. PR 65819. [David CARLIER ] *) mod_file_cache: Fix crashes for mmap'ed files under threaded MPMs. PR 69901. barr.israel *) core: Add support for %{m}t in ErrorLogFormat to log milli-second time resolution (in addition to existing %{u}t for micro-seconds). [LuboÅ¡ Uhliarik ] *) mod_unixd: Drop test that effective user ID is zero in a chroot configuration. PR 69767. [Bastien Roucaries ] *) mod_proxy_balancer: Include nonce in XML output. PR 63074. Federico Mennite *) mod_http2: update to version 2.0.42 Fix excessive file description use for non-TLS frontend connections when sending files. Fixes [Stefan Eissing] *) mod_http2: update to version 2.0.41 Fix cookie header accounting against LimitRequestFields. [Stefan Eissing] *) mod_http2: update to version 2.0.40 Fix error handling on upload requests when server runs out of file handles that left beam bucket callbacks in place, potentially using no longer valid references. Only applies on platforms with pipes and file descriptor limits not healthy for a network server. [Stefan Eissing] *) mod_dav_fs: Return a 404 for DELETE if deletion fails because the resource no longer exists. PR 60746. [Joe Orton] *) mod_proxy_hcheck: Fix healthcheck disabled due to child restart while updating. [Yann Ylavic]" Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer commit ce351c6b488fdcd562d0665745cdc0cab66fb97c Author: Matthias Fischer Date: Tue Jun 9 22:42:05 2026 +0200 rsync: Update to 3.4.4 For details see: https://download.samba.org/pub/rsync/NEWS#3.4.4 "NEWS for rsync 3.4.4 (8 Jun 2026) Changes in this version: This is a conservative point release that backports regression fixes on top of 3.4.3. No new features are included. BUG FIXES: Honour a relative alt-basis directory (e.g. --link-dest=../sibling, --copy-dest, --compare-dest) on a daemon receiver running with use chroot = no. Such a path is re-anchored at the module root but was then rejected by the receiver's secure open; it now works where kernel-enforced confinement is available. See the PORTABILITY note below for the platform limitation. Fixes #915. sender: open a module-root-absolute path for a path = / module so a daemon serving the filesystem root can satisfy absolute request paths again. Fixes #897. flist: accept the missing-args mode-0 entry in recv_file_entry. Fixes #910. receiver: fix a false "failed verification -⁠-⁠ update discarded" when resuming a delta transfer with an absolute --partial-dir. receiver: fix a NULL dereference on the delta discard path. generator: cap the block s2length at the negotiated checksum length. main: fix --mkpath with --dry-run for a file-to-file copy. Fixes #880. daemon: un-backslash escaped option args. Fixes #829. token: drain the matched-block insert deflate. Fixes #951. Fix the "update skips a file of a different type" case and the daemon upload delete stats. alloc: revert "zero all new memory from allocations". Fixes #959. Always clear the stat buffer and validate nanoseconds before use. PORTABILITY / BUILD: The relative alt-basis fix for daemon receivers (#915) relies on kernel "stay below dirfd" path resolution -⁠-⁠ openat2(RESOLVE_BENEATH) on Linux 5.6+, or openat() with O_RESOLVE_BENEATH on FreeBSD 13+ and macOS 15+. On platforms that lack it (Solaris, OpenBSD, NetBSD, Cygwin and older Linux) secure_relative_open() deliberately rejects any path with a .. component, so relative alt-basis directories remain unavailable there -⁠-⁠ function traded for safety, matching the trade-off already documented for the #715 fix. Absolute alt-basis paths are unaffected on every platform. openat2 is now autodetected at configure time (HAVE_OPENAT2): the openat2(RESOLVE_BENEATH) resolver is compiled in only when both and the SYS_openat2 syscall number are present, fixing the build on older kernels/headers. Fixes #924, #905, #900, #904. Fall back to do_mknod() when mknodat() / mkfifoat() are unavailable. Fixes #896. Install generated manpages correctly in an out-of-tree build. DEVELOPER RELATED: Added a CI workflow that builds this stable branch and runs the v34-stable-testsuite regression suite against the built binary, giving regression coverage without importing the full master test suite into the stable branch. Added a check-progs target for fleettest and extended the build workflows to run on *-stable release branches." Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer commit 5d1f998983eb26aed83ac75c2892b18d2c4ee5a3 Author: Michael Tremer Date: Wed Jun 10 09:46:57 2026 +0000 make.sh: Silence the runtime output when setting the ccache size Signed-off-by: Michael Tremer commit 31d52aabde211aabb3ce376b87a0b397b3abe270 Author: Michael Tremer Date: Tue Jun 9 18:37:01 2026 +0000 make.sh: Remove the timer This seems to trigger a bug bash which causes the build process to hand for forever. Since most packages build fast enough, we will simply remove it and only print the total build time. Signed-off-by: Michael Tremer commit 555552b51874ca9dc9ea262ecb0bb81f879bdbfc Author: Michael Tremer Date: Tue Jun 9 18:31:38 2026 +0000 make.sh: Start Core Update 204 Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/apache2 | 22 ++++- config/rootfiles/core/{203 => 204}/exclude | 0 .../{oldcore/114 => core/204}/filelists/apache2 | 0 .../core/{203 => 204}/filelists/core-files | 0 .../{oldcore/163 => core/204/filelists}/files | 0 .../rootfiles/{oldcore/152 => core/204}/update.sh | 19 +++-- config/rootfiles/{core/203 => oldcore/204}/exclude | 0 .../203 => oldcore/204}/filelists/aarch64/boost | 0 .../203 => oldcore/204}/filelists/aarch64/grub | 0 .../204}/filelists/aarch64/util-linux | 0 .../{core/203 => oldcore/204}/filelists/bind | 0 .../203 => oldcore/204}/filelists/btrfs-progs | 0 .../{core/203 => oldcore/204}/filelists/collectd | 0 .../{core/203 => oldcore/204}/filelists/core-files | 0 .../{core/203 => oldcore/204}/filelists/coreutils | 0 .../{core/203 => oldcore/204}/filelists/dma | 0 .../{core/203 => oldcore/204}/filelists/e2fsprogs | 0 .../{core/203 => oldcore/204}/filelists/elfutils | 0 .../{core/203 => oldcore/204}/filelists/expat | 0 .../{core/203 => oldcore/204}/filelists/fcron | 0 .../{core/203 => oldcore/204}/filelists/files | 0 .../{core/203 => oldcore/204}/filelists/fontconfig | 0 .../{core/203 => oldcore/204}/filelists/gdb | 0 .../{core/203 => oldcore/204}/filelists/gnupg | 0 .../{core/203 => oldcore/204}/filelists/gnutls | 0 .../{core/203 => oldcore/204}/filelists/grub-btrfs | 0 .../{core/203 => oldcore/204}/filelists/iana-etc | 0 .../{core/203 => oldcore/204}/filelists/knot | 0 .../203 => oldcore/204}/filelists/knot-resolver | 0 .../{core/203 => oldcore/204}/filelists/krb5 | 0 .../{core/203 => oldcore/204}/filelists/less | 0 .../{core/203 => oldcore/204}/filelists/libedit | 0 .../{core/203 => oldcore/204}/filelists/libksba | 0 .../{core/203 => oldcore/204}/filelists/libloc | 0 .../203 => oldcore/204}/filelists/libunistring | 0 .../{core/203 => oldcore/204}/filelists/libusb | 0 .../203 => oldcore/204}/filelists/lua-cqueues | 0 .../{core/203 => oldcore/204}/filelists/lua-csv | 0 .../203 => oldcore/204}/filelists/lua-sqlite3 | 0 .../{core/203 => oldcore/204}/filelists/luajit | 0 .../{core/203 => oldcore/204}/filelists/luarocks | 0 .../{core/203 => oldcore/204}/filelists/lvm2 | 0 .../{core/203 => oldcore/204}/filelists/meson | 0 .../{core/203 => oldcore/204}/filelists/misc-progs | 0 .../{core/203 => oldcore/204}/filelists/nettle | 0 .../203 => oldcore/204}/filelists/nss-myhostname | 0 .../{core/203 => oldcore/204}/filelists/ntfs-3g | 0 .../{core/203 => oldcore/204}/filelists/openvpn | 0 .../{core/203 => oldcore/204}/filelists/pakfire | 0 .../203 => oldcore/204}/filelists/python3-Jinja2 | 0 .../204}/filelists/python3-MarkupSafe | 0 .../204}/filelists/python3-aiohappyeyeballs | 0 .../203 => oldcore/204}/filelists/python3-aiohttp | 0 .../204}/filelists/python3-aiosignal | 0 .../204}/filelists/python3-async-timeout | 0 .../203 => oldcore/204}/filelists/python3-attrs | 0 .../204}/filelists/python3-expandvars | 0 .../204}/filelists/python3-frozenlist | 0 .../203 => oldcore/204}/filelists/python3-idna | 0 .../204}/filelists/python3-multidict | 0 .../204}/filelists/python3-poetry-core | 0 .../204}/filelists/python3-propcache | 0 .../204}/filelists/python3-setuptools | 0 .../204}/filelists/python3-supervisor | 0 .../204}/filelists/python3-typing-extensions | 0 .../203 => oldcore/204}/filelists/python3-watchdog | 0 .../203 => oldcore/204}/filelists/python3-yaml | 0 .../203 => oldcore/204}/filelists/python3-yarl | 0 .../203 => oldcore/204}/filelists/riscv64/boost | 0 .../203 => oldcore/204}/filelists/riscv64/grub | 0 .../204}/filelists/riscv64/util-linux | 0 .../{core/203 => oldcore/204}/filelists/rrdtool | 0 .../{core/203 => oldcore/204}/filelists/sqlite | 0 .../{core/203 => oldcore/204}/filelists/squid | 0 .../{core/203 => oldcore/204}/filelists/strongswan | 0 .../{core/203 => oldcore/204}/filelists/vim | 0 .../204}/filelists/web-user-interface | 0 .../{core/203 => oldcore/204}/filelists/which | 0 .../203 => oldcore/204}/filelists/x86_64/boost | 0 .../203 => oldcore/204}/filelists/x86_64/grub | 0 .../204}/filelists/x86_64/intel-microcode | 0 .../204}/filelists/x86_64/util-linux | 0 .../{core/203 => oldcore/204}/filelists/xfsprogs | 0 .../{core/203 => oldcore/204}/filelists/zone-sync | 0 .../rootfiles/{core/203 => oldcore/204}/update.sh | 0 lfs/apache2 | 4 +- lfs/rsync | 6 +- make.sh | 93 ++-------------------- 88 files changed, 42 insertions(+), 102 deletions(-) copy config/rootfiles/core/{203 => 204}/exclude (100%) copy config/rootfiles/{oldcore/114 => core/204}/filelists/apache2 (100%) copy config/rootfiles/core/{203 => 204}/filelists/core-files (100%) copy config/rootfiles/{oldcore/163 => core/204/filelists}/files (100%) copy config/rootfiles/{oldcore/152 => core/204}/update.sh (90%) rename config/rootfiles/{core/203 => oldcore/204}/exclude (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/aarch64/boost (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/aarch64/grub (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/aarch64/util-linux (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/bind (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/btrfs-progs (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/collectd (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/core-files (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/coreutils (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/dma (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/e2fsprogs (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/elfutils (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/expat (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/fcron (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/files (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/fontconfig (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/gdb (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/gnupg (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/gnutls (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/grub-btrfs (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/iana-etc (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/knot (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/knot-resolver (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/krb5 (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/less (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/libedit (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/libksba (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/libloc (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/libunistring (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/libusb (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/lua-cqueues (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/lua-csv (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/lua-sqlite3 (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/luajit (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/luarocks (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/lvm2 (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/meson (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/misc-progs (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/nettle (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/nss-myhostname (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/ntfs-3g (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/openvpn (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/pakfire (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/python3-Jinja2 (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/python3-MarkupSafe (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/python3-aiohappyeyeballs (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/python3-aiohttp (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/python3-aiosignal (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/python3-async-timeout (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/python3-attrs (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/python3-expandvars (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/python3-frozenlist (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/python3-idna (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/python3-multidict (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/python3-poetry-core (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/python3-propcache (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/python3-setuptools (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/python3-supervisor (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/python3-typing-extensions (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/python3-watchdog (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/python3-yaml (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/python3-yarl (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/riscv64/boost (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/riscv64/grub (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/riscv64/util-linux (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/rrdtool (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/sqlite (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/squid (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/strongswan (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/vim (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/web-user-interface (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/which (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/x86_64/boost (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/x86_64/grub (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/x86_64/intel-microcode (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/x86_64/util-linux (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/xfsprogs (100%) rename config/rootfiles/{core/203 => oldcore/204}/filelists/zone-sync (100%) rename config/rootfiles/{core/203 => oldcore/204}/update.sh (100%) Difference in files: diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2 index 2f31ba756..9206fcffd 100644 --- a/config/rootfiles/common/apache2 +++ b/config/rootfiles/common/apache2 @@ -55,6 +55,7 @@ etc/httpd/conf/vhosts.d/ipfire-interface.conf #srv/web/ipfire/error/HTTP_BAD_GATEWAY.html.var #srv/web/ipfire/error/HTTP_BAD_REQUEST.html.var #srv/web/ipfire/error/HTTP_FORBIDDEN.html.var +#srv/web/ipfire/error/HTTP_GATEWAY_TIME_OUT.html.var #srv/web/ipfire/error/HTTP_GONE.html.var #srv/web/ipfire/error/HTTP_INTERNAL_SERVER_ERROR.html.var #srv/web/ipfire/error/HTTP_LENGTH_REQUIRED.html.var @@ -330,6 +331,7 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/bind.html.fr.utf8 #srv/web/ipfire/manual/bind.html.ja.utf8 #srv/web/ipfire/manual/bind.html.ko.euc-kr +#srv/web/ipfire/manual/bind.html.pt-br.utf8 #srv/web/ipfire/manual/bind.html.tr.utf8 #srv/web/ipfire/manual/caching.html #srv/web/ipfire/manual/caching.html.en @@ -420,6 +422,7 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/filter.html.fr.utf8 #srv/web/ipfire/manual/filter.html.ja.utf8 #srv/web/ipfire/manual/filter.html.ko.euc-kr +#srv/web/ipfire/manual/filter.html.pt-br.utf8 #srv/web/ipfire/manual/filter.html.tr.utf8 #srv/web/ipfire/manual/getting-started.html #srv/web/ipfire/manual/getting-started.html.en @@ -466,6 +469,7 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/howto/htaccess.html.ja.utf8 #srv/web/ipfire/manual/howto/htaccess.html.ko.euc-kr #srv/web/ipfire/manual/howto/htaccess.html.pt-br +#srv/web/ipfire/manual/howto/htaccess.html.pt-br.utf8 #srv/web/ipfire/manual/howto/http2.html #srv/web/ipfire/manual/howto/http2.html.en #srv/web/ipfire/manual/howto/http2.html.es @@ -511,24 +515,27 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/images/feather.gif #srv/web/ipfire/manual/images/feather.png #srv/web/ipfire/manual/images/filter_arch.png +#srv/web/ipfire/manual/images/filter_arch.pt-br.png #srv/web/ipfire/manual/images/filter_arch.tr.png #srv/web/ipfire/manual/images/home.gif #srv/web/ipfire/manual/images/index.gif #srv/web/ipfire/manual/images/left.gif #srv/web/ipfire/manual/images/mod_filter_new.gif #srv/web/ipfire/manual/images/mod_filter_new.png +#srv/web/ipfire/manual/images/mod_filter_new.pt-br.png #srv/web/ipfire/manual/images/mod_filter_new.tr.png #srv/web/ipfire/manual/images/mod_filter_old.gif #srv/web/ipfire/manual/images/mod_filter_old.png -#srv/web/ipfire/manual/images/mod_rewrite_fig1.gif #srv/web/ipfire/manual/images/mod_rewrite_fig1.png -#srv/web/ipfire/manual/images/mod_rewrite_fig2.gif +#srv/web/ipfire/manual/images/mod_rewrite_fig1.svg #srv/web/ipfire/manual/images/mod_rewrite_fig2.png +#srv/web/ipfire/manual/images/mod_rewrite_fig2.svg #srv/web/ipfire/manual/images/pixel.gif #srv/web/ipfire/manual/images/reverse-proxy-arch.png #srv/web/ipfire/manual/images/rewrite_backreferences.png +#srv/web/ipfire/manual/images/rewrite_backreferences.svg #srv/web/ipfire/manual/images/rewrite_process_uri.png -#srv/web/ipfire/manual/images/rewrite_rule_flow.png +#srv/web/ipfire/manual/images/rewrite_process_uri.svg #srv/web/ipfire/manual/images/right.gif #srv/web/ipfire/manual/images/ssl_intro_fig1.gif #srv/web/ipfire/manual/images/ssl_intro_fig1.png @@ -538,7 +545,9 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/images/ssl_intro_fig3.png #srv/web/ipfire/manual/images/sub.gif #srv/web/ipfire/manual/images/syntax_rewritecond.png +#srv/web/ipfire/manual/images/syntax_rewritecond.svg #srv/web/ipfire/manual/images/syntax_rewriterule.png +#srv/web/ipfire/manual/images/syntax_rewriterule.svg #srv/web/ipfire/manual/images/up.gif #srv/web/ipfire/manual/index.html #srv/web/ipfire/manual/index.html.da @@ -549,6 +558,7 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/index.html.ja.utf8 #srv/web/ipfire/manual/index.html.ko.euc-kr #srv/web/ipfire/manual/index.html.pt-br +#srv/web/ipfire/manual/index.html.pt-br.utf8 #srv/web/ipfire/manual/index.html.ru.utf8 #srv/web/ipfire/manual/index.html.tr.utf8 #srv/web/ipfire/manual/index.html.zh-cn.utf8 @@ -559,6 +569,7 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/install.html.fr.utf8 #srv/web/ipfire/manual/install.html.ja.utf8 #srv/web/ipfire/manual/install.html.ko.euc-kr +#srv/web/ipfire/manual/install.html.pt-br.utf8 #srv/web/ipfire/manual/install.html.tr.utf8 #srv/web/ipfire/manual/invoking.html #srv/web/ipfire/manual/invoking.html.de @@ -567,6 +578,7 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/invoking.html.fr.utf8 #srv/web/ipfire/manual/invoking.html.ja.utf8 #srv/web/ipfire/manual/invoking.html.ko.euc-kr +#srv/web/ipfire/manual/invoking.html.pt-br.utf8 #srv/web/ipfire/manual/invoking.html.tr.utf8 #srv/web/ipfire/manual/license.html #srv/web/ipfire/manual/license.html.en @@ -1179,16 +1191,19 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/new_features_2_0.html.ja.utf8 #srv/web/ipfire/manual/new_features_2_0.html.ko.euc-kr #srv/web/ipfire/manual/new_features_2_0.html.pt-br +#srv/web/ipfire/manual/new_features_2_0.html.pt-br.utf8 #srv/web/ipfire/manual/new_features_2_0.html.tr.utf8 #srv/web/ipfire/manual/new_features_2_2.html #srv/web/ipfire/manual/new_features_2_2.html.en #srv/web/ipfire/manual/new_features_2_2.html.fr.utf8 #srv/web/ipfire/manual/new_features_2_2.html.ko.euc-kr #srv/web/ipfire/manual/new_features_2_2.html.pt-br +#srv/web/ipfire/manual/new_features_2_2.html.pt-br.utf8 #srv/web/ipfire/manual/new_features_2_2.html.tr.utf8 #srv/web/ipfire/manual/new_features_2_4.html #srv/web/ipfire/manual/new_features_2_4.html.en #srv/web/ipfire/manual/new_features_2_4.html.fr.utf8 +#srv/web/ipfire/manual/new_features_2_4.html.pt-br.utf8 #srv/web/ipfire/manual/new_features_2_4.html.tr.utf8 #srv/web/ipfire/manual/platform #srv/web/ipfire/manual/platform/ebcdic.html @@ -1431,6 +1446,7 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/upgrading.html #srv/web/ipfire/manual/upgrading.html.en #srv/web/ipfire/manual/upgrading.html.fr.utf8 +#srv/web/ipfire/manual/upgrading.html.pt-br.utf8 #srv/web/ipfire/manual/urlmapping.html #srv/web/ipfire/manual/urlmapping.html.en #srv/web/ipfire/manual/urlmapping.html.fr.utf8 diff --git a/config/rootfiles/core/203/exclude b/config/rootfiles/core/204/exclude similarity index 100% rename from config/rootfiles/core/203/exclude rename to config/rootfiles/core/204/exclude diff --git a/config/rootfiles/core/204/filelists/apache2 b/config/rootfiles/core/204/filelists/apache2 new file mode 120000 index 000000000..eef95efa7 --- /dev/null +++ b/config/rootfiles/core/204/filelists/apache2 @@ -0,0 +1 @@ +../../../common/apache2 \ No newline at end of file diff --git a/config/rootfiles/core/203/filelists/core-files b/config/rootfiles/core/204/filelists/core-files similarity index 100% rename from config/rootfiles/core/203/filelists/core-files rename to config/rootfiles/core/204/filelists/core-files diff --git a/config/rootfiles/core/204/filelists/files b/config/rootfiles/core/204/filelists/files new file mode 100644 index 000000000..e69de29bb diff --git a/config/rootfiles/core/204/update.sh b/config/rootfiles/core/204/update.sh new file mode 100644 index 000000000..477237a04 --- /dev/null +++ b/config/rootfiles/core/204/update.sh @@ -0,0 +1,72 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2026 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=204 + +# Remove old core updates from pakfire cache to save space... +for (( i=1; i<=$core; i++ )); do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Stop services +/etc/init.d/apache stop + +# Remove files + +# Extract files +extract_files + +# update linker config +ldconfig + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Filesytem cleanup +/usr/local/bin/filesystem-cleanup + +# Apply SSH configuration +/usr/local/bin/sshctrl + +# Start services +/etc/init.d/apache start + +# This update needs a reboot... +touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile + +# Update grub config to display new core version +if [ -e /boot/grub/grub.cfg ]; then + /usr/bin/install-bootloader +fi + +sync + +# Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/oldcore/204/exclude b/config/rootfiles/oldcore/204/exclude new file mode 100644 index 000000000..996163701 --- /dev/null +++ b/config/rootfiles/oldcore/204/exclude @@ -0,0 +1,36 @@ +boot/config.txt +boot/grub/grub.cfg +boot/grub/grubenv +boot/uEnv.txt +etc/alternatives +etc/collectd.custom +etc/default/grub +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/snort/snort.conf +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/dma +var/ipfire/time +var/ipfire/firewall/locationblock +var/ipfire/fwhosts/customlocationgrp +var/ipfire/ovpn +var/ipfire/urlfilter/blacklist +var/ipfire/urlfilter/settings +var/lib/alternatives +var/lib/knot-resolver/leases.db +var/lib/location/database.db +var/lib/location/ipset +var/log/cache +var/log/dhcpcd.log +var/log/messages +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/203/filelists/aarch64/boost b/config/rootfiles/oldcore/204/filelists/aarch64/boost similarity index 100% rename from config/rootfiles/core/203/filelists/aarch64/boost rename to config/rootfiles/oldcore/204/filelists/aarch64/boost diff --git a/config/rootfiles/core/203/filelists/aarch64/grub b/config/rootfiles/oldcore/204/filelists/aarch64/grub similarity index 100% rename from config/rootfiles/core/203/filelists/aarch64/grub rename to config/rootfiles/oldcore/204/filelists/aarch64/grub diff --git a/config/rootfiles/core/203/filelists/aarch64/util-linux b/config/rootfiles/oldcore/204/filelists/aarch64/util-linux similarity index 100% rename from config/rootfiles/core/203/filelists/aarch64/util-linux rename to config/rootfiles/oldcore/204/filelists/aarch64/util-linux diff --git a/config/rootfiles/core/203/filelists/bind b/config/rootfiles/oldcore/204/filelists/bind similarity index 100% rename from config/rootfiles/core/203/filelists/bind rename to config/rootfiles/oldcore/204/filelists/bind diff --git a/config/rootfiles/core/203/filelists/btrfs-progs b/config/rootfiles/oldcore/204/filelists/btrfs-progs similarity index 100% rename from config/rootfiles/core/203/filelists/btrfs-progs rename to config/rootfiles/oldcore/204/filelists/btrfs-progs diff --git a/config/rootfiles/core/203/filelists/collectd b/config/rootfiles/oldcore/204/filelists/collectd similarity index 100% rename from config/rootfiles/core/203/filelists/collectd rename to config/rootfiles/oldcore/204/filelists/collectd diff --git a/config/rootfiles/oldcore/204/filelists/core-files b/config/rootfiles/oldcore/204/filelists/core-files new file mode 100644 index 000000000..0dec37e53 --- /dev/null +++ b/config/rootfiles/oldcore/204/filelists/core-files @@ -0,0 +1,5 @@ +etc/system-release +etc/issue +etc/os-release +srv/web/ipfire/cgi-bin/credits.cgi +var/ipfire/langs diff --git a/config/rootfiles/core/203/filelists/coreutils b/config/rootfiles/oldcore/204/filelists/coreutils similarity index 100% rename from config/rootfiles/core/203/filelists/coreutils rename to config/rootfiles/oldcore/204/filelists/coreutils diff --git a/config/rootfiles/core/203/filelists/dma b/config/rootfiles/oldcore/204/filelists/dma similarity index 100% rename from config/rootfiles/core/203/filelists/dma rename to config/rootfiles/oldcore/204/filelists/dma diff --git a/config/rootfiles/core/203/filelists/e2fsprogs b/config/rootfiles/oldcore/204/filelists/e2fsprogs similarity index 100% rename from config/rootfiles/core/203/filelists/e2fsprogs rename to config/rootfiles/oldcore/204/filelists/e2fsprogs diff --git a/config/rootfiles/core/203/filelists/elfutils b/config/rootfiles/oldcore/204/filelists/elfutils similarity index 100% rename from config/rootfiles/core/203/filelists/elfutils rename to config/rootfiles/oldcore/204/filelists/elfutils diff --git a/config/rootfiles/core/203/filelists/expat b/config/rootfiles/oldcore/204/filelists/expat similarity index 100% rename from config/rootfiles/core/203/filelists/expat rename to config/rootfiles/oldcore/204/filelists/expat diff --git a/config/rootfiles/core/203/filelists/fcron b/config/rootfiles/oldcore/204/filelists/fcron similarity index 100% rename from config/rootfiles/core/203/filelists/fcron rename to config/rootfiles/oldcore/204/filelists/fcron diff --git a/config/rootfiles/core/203/filelists/files b/config/rootfiles/oldcore/204/filelists/files similarity index 100% rename from config/rootfiles/core/203/filelists/files rename to config/rootfiles/oldcore/204/filelists/files diff --git a/config/rootfiles/core/203/filelists/fontconfig b/config/rootfiles/oldcore/204/filelists/fontconfig similarity index 100% rename from config/rootfiles/core/203/filelists/fontconfig rename to config/rootfiles/oldcore/204/filelists/fontconfig diff --git a/config/rootfiles/core/203/filelists/gdb b/config/rootfiles/oldcore/204/filelists/gdb similarity index 100% rename from config/rootfiles/core/203/filelists/gdb rename to config/rootfiles/oldcore/204/filelists/gdb diff --git a/config/rootfiles/core/203/filelists/gnupg b/config/rootfiles/oldcore/204/filelists/gnupg similarity index 100% rename from config/rootfiles/core/203/filelists/gnupg rename to config/rootfiles/oldcore/204/filelists/gnupg diff --git a/config/rootfiles/core/203/filelists/gnutls b/config/rootfiles/oldcore/204/filelists/gnutls similarity index 100% rename from config/rootfiles/core/203/filelists/gnutls rename to config/rootfiles/oldcore/204/filelists/gnutls diff --git a/config/rootfiles/core/203/filelists/grub-btrfs b/config/rootfiles/oldcore/204/filelists/grub-btrfs similarity index 100% rename from config/rootfiles/core/203/filelists/grub-btrfs rename to config/rootfiles/oldcore/204/filelists/grub-btrfs diff --git a/config/rootfiles/core/203/filelists/iana-etc b/config/rootfiles/oldcore/204/filelists/iana-etc similarity index 100% rename from config/rootfiles/core/203/filelists/iana-etc rename to config/rootfiles/oldcore/204/filelists/iana-etc diff --git a/config/rootfiles/core/203/filelists/knot b/config/rootfiles/oldcore/204/filelists/knot similarity index 100% rename from config/rootfiles/core/203/filelists/knot rename to config/rootfiles/oldcore/204/filelists/knot diff --git a/config/rootfiles/core/203/filelists/knot-resolver b/config/rootfiles/oldcore/204/filelists/knot-resolver similarity index 100% rename from config/rootfiles/core/203/filelists/knot-resolver rename to config/rootfiles/oldcore/204/filelists/knot-resolver diff --git a/config/rootfiles/core/203/filelists/krb5 b/config/rootfiles/oldcore/204/filelists/krb5 similarity index 100% rename from config/rootfiles/core/203/filelists/krb5 rename to config/rootfiles/oldcore/204/filelists/krb5 diff --git a/config/rootfiles/core/203/filelists/less b/config/rootfiles/oldcore/204/filelists/less similarity index 100% rename from config/rootfiles/core/203/filelists/less rename to config/rootfiles/oldcore/204/filelists/less diff --git a/config/rootfiles/core/203/filelists/libedit b/config/rootfiles/oldcore/204/filelists/libedit similarity index 100% rename from config/rootfiles/core/203/filelists/libedit rename to config/rootfiles/oldcore/204/filelists/libedit diff --git a/config/rootfiles/core/203/filelists/libksba b/config/rootfiles/oldcore/204/filelists/libksba similarity index 100% rename from config/rootfiles/core/203/filelists/libksba rename to config/rootfiles/oldcore/204/filelists/libksba diff --git a/config/rootfiles/core/203/filelists/libloc b/config/rootfiles/oldcore/204/filelists/libloc similarity index 100% rename from config/rootfiles/core/203/filelists/libloc rename to config/rootfiles/oldcore/204/filelists/libloc diff --git a/config/rootfiles/core/203/filelists/libunistring b/config/rootfiles/oldcore/204/filelists/libunistring similarity index 100% rename from config/rootfiles/core/203/filelists/libunistring rename to config/rootfiles/oldcore/204/filelists/libunistring diff --git a/config/rootfiles/core/203/filelists/libusb b/config/rootfiles/oldcore/204/filelists/libusb similarity index 100% rename from config/rootfiles/core/203/filelists/libusb rename to config/rootfiles/oldcore/204/filelists/libusb diff --git a/config/rootfiles/core/203/filelists/lua-cqueues b/config/rootfiles/oldcore/204/filelists/lua-cqueues similarity index 100% rename from config/rootfiles/core/203/filelists/lua-cqueues rename to config/rootfiles/oldcore/204/filelists/lua-cqueues diff --git a/config/rootfiles/core/203/filelists/lua-csv b/config/rootfiles/oldcore/204/filelists/lua-csv similarity index 100% rename from config/rootfiles/core/203/filelists/lua-csv rename to config/rootfiles/oldcore/204/filelists/lua-csv diff --git a/config/rootfiles/core/203/filelists/lua-sqlite3 b/config/rootfiles/oldcore/204/filelists/lua-sqlite3 similarity index 100% rename from config/rootfiles/core/203/filelists/lua-sqlite3 rename to config/rootfiles/oldcore/204/filelists/lua-sqlite3 diff --git a/config/rootfiles/core/203/filelists/luajit b/config/rootfiles/oldcore/204/filelists/luajit similarity index 100% rename from config/rootfiles/core/203/filelists/luajit rename to config/rootfiles/oldcore/204/filelists/luajit diff --git a/config/rootfiles/core/203/filelists/luarocks b/config/rootfiles/oldcore/204/filelists/luarocks similarity index 100% rename from config/rootfiles/core/203/filelists/luarocks rename to config/rootfiles/oldcore/204/filelists/luarocks diff --git a/config/rootfiles/core/203/filelists/lvm2 b/config/rootfiles/oldcore/204/filelists/lvm2 similarity index 100% rename from config/rootfiles/core/203/filelists/lvm2 rename to config/rootfiles/oldcore/204/filelists/lvm2 diff --git a/config/rootfiles/core/203/filelists/meson b/config/rootfiles/oldcore/204/filelists/meson similarity index 100% rename from config/rootfiles/core/203/filelists/meson rename to config/rootfiles/oldcore/204/filelists/meson diff --git a/config/rootfiles/core/203/filelists/misc-progs b/config/rootfiles/oldcore/204/filelists/misc-progs similarity index 100% rename from config/rootfiles/core/203/filelists/misc-progs rename to config/rootfiles/oldcore/204/filelists/misc-progs diff --git a/config/rootfiles/core/203/filelists/nettle b/config/rootfiles/oldcore/204/filelists/nettle similarity index 100% rename from config/rootfiles/core/203/filelists/nettle rename to config/rootfiles/oldcore/204/filelists/nettle diff --git a/config/rootfiles/core/203/filelists/nss-myhostname b/config/rootfiles/oldcore/204/filelists/nss-myhostname similarity index 100% rename from config/rootfiles/core/203/filelists/nss-myhostname rename to config/rootfiles/oldcore/204/filelists/nss-myhostname diff --git a/config/rootfiles/core/203/filelists/ntfs-3g b/config/rootfiles/oldcore/204/filelists/ntfs-3g similarity index 100% rename from config/rootfiles/core/203/filelists/ntfs-3g rename to config/rootfiles/oldcore/204/filelists/ntfs-3g diff --git a/config/rootfiles/core/203/filelists/openvpn b/config/rootfiles/oldcore/204/filelists/openvpn similarity index 100% rename from config/rootfiles/core/203/filelists/openvpn rename to config/rootfiles/oldcore/204/filelists/openvpn diff --git a/config/rootfiles/core/203/filelists/pakfire b/config/rootfiles/oldcore/204/filelists/pakfire similarity index 100% rename from config/rootfiles/core/203/filelists/pakfire rename to config/rootfiles/oldcore/204/filelists/pakfire diff --git a/config/rootfiles/core/203/filelists/python3-Jinja2 b/config/rootfiles/oldcore/204/filelists/python3-Jinja2 similarity index 100% rename from config/rootfiles/core/203/filelists/python3-Jinja2 rename to config/rootfiles/oldcore/204/filelists/python3-Jinja2 diff --git a/config/rootfiles/core/203/filelists/python3-MarkupSafe b/config/rootfiles/oldcore/204/filelists/python3-MarkupSafe similarity index 100% rename from config/rootfiles/core/203/filelists/python3-MarkupSafe rename to config/rootfiles/oldcore/204/filelists/python3-MarkupSafe diff --git a/config/rootfiles/core/203/filelists/python3-aiohappyeyeballs b/config/rootfiles/oldcore/204/filelists/python3-aiohappyeyeballs similarity index 100% rename from config/rootfiles/core/203/filelists/python3-aiohappyeyeballs rename to config/rootfiles/oldcore/204/filelists/python3-aiohappyeyeballs diff --git a/config/rootfiles/core/203/filelists/python3-aiohttp b/config/rootfiles/oldcore/204/filelists/python3-aiohttp similarity index 100% rename from config/rootfiles/core/203/filelists/python3-aiohttp rename to config/rootfiles/oldcore/204/filelists/python3-aiohttp diff --git a/config/rootfiles/core/203/filelists/python3-aiosignal b/config/rootfiles/oldcore/204/filelists/python3-aiosignal similarity index 100% rename from config/rootfiles/core/203/filelists/python3-aiosignal rename to config/rootfiles/oldcore/204/filelists/python3-aiosignal diff --git a/config/rootfiles/core/203/filelists/python3-async-timeout b/config/rootfiles/oldcore/204/filelists/python3-async-timeout similarity index 100% rename from config/rootfiles/core/203/filelists/python3-async-timeout rename to config/rootfiles/oldcore/204/filelists/python3-async-timeout diff --git a/config/rootfiles/core/203/filelists/python3-attrs b/config/rootfiles/oldcore/204/filelists/python3-attrs similarity index 100% rename from config/rootfiles/core/203/filelists/python3-attrs rename to config/rootfiles/oldcore/204/filelists/python3-attrs diff --git a/config/rootfiles/core/203/filelists/python3-expandvars b/config/rootfiles/oldcore/204/filelists/python3-expandvars similarity index 100% rename from config/rootfiles/core/203/filelists/python3-expandvars rename to config/rootfiles/oldcore/204/filelists/python3-expandvars diff --git a/config/rootfiles/core/203/filelists/python3-frozenlist b/config/rootfiles/oldcore/204/filelists/python3-frozenlist similarity index 100% rename from config/rootfiles/core/203/filelists/python3-frozenlist rename to config/rootfiles/oldcore/204/filelists/python3-frozenlist diff --git a/config/rootfiles/core/203/filelists/python3-idna b/config/rootfiles/oldcore/204/filelists/python3-idna similarity index 100% rename from config/rootfiles/core/203/filelists/python3-idna rename to config/rootfiles/oldcore/204/filelists/python3-idna diff --git a/config/rootfiles/core/203/filelists/python3-multidict b/config/rootfiles/oldcore/204/filelists/python3-multidict similarity index 100% rename from config/rootfiles/core/203/filelists/python3-multidict rename to config/rootfiles/oldcore/204/filelists/python3-multidict diff --git a/config/rootfiles/core/203/filelists/python3-poetry-core b/config/rootfiles/oldcore/204/filelists/python3-poetry-core similarity index 100% rename from config/rootfiles/core/203/filelists/python3-poetry-core rename to config/rootfiles/oldcore/204/filelists/python3-poetry-core diff --git a/config/rootfiles/core/203/filelists/python3-propcache b/config/rootfiles/oldcore/204/filelists/python3-propcache similarity index 100% rename from config/rootfiles/core/203/filelists/python3-propcache rename to config/rootfiles/oldcore/204/filelists/python3-propcache diff --git a/config/rootfiles/core/203/filelists/python3-setuptools b/config/rootfiles/oldcore/204/filelists/python3-setuptools similarity index 100% rename from config/rootfiles/core/203/filelists/python3-setuptools rename to config/rootfiles/oldcore/204/filelists/python3-setuptools diff --git a/config/rootfiles/core/203/filelists/python3-supervisor b/config/rootfiles/oldcore/204/filelists/python3-supervisor similarity index 100% rename from config/rootfiles/core/203/filelists/python3-supervisor rename to config/rootfiles/oldcore/204/filelists/python3-supervisor diff --git a/config/rootfiles/core/203/filelists/python3-typing-extensions b/config/rootfiles/oldcore/204/filelists/python3-typing-extensions similarity index 100% rename from config/rootfiles/core/203/filelists/python3-typing-extensions rename to config/rootfiles/oldcore/204/filelists/python3-typing-extensions diff --git a/config/rootfiles/core/203/filelists/python3-watchdog b/config/rootfiles/oldcore/204/filelists/python3-watchdog similarity index 100% rename from config/rootfiles/core/203/filelists/python3-watchdog rename to config/rootfiles/oldcore/204/filelists/python3-watchdog diff --git a/config/rootfiles/core/203/filelists/python3-yaml b/config/rootfiles/oldcore/204/filelists/python3-yaml similarity index 100% rename from config/rootfiles/core/203/filelists/python3-yaml rename to config/rootfiles/oldcore/204/filelists/python3-yaml diff --git a/config/rootfiles/core/203/filelists/python3-yarl b/config/rootfiles/oldcore/204/filelists/python3-yarl similarity index 100% rename from config/rootfiles/core/203/filelists/python3-yarl rename to config/rootfiles/oldcore/204/filelists/python3-yarl diff --git a/config/rootfiles/core/203/filelists/riscv64/boost b/config/rootfiles/oldcore/204/filelists/riscv64/boost similarity index 100% rename from config/rootfiles/core/203/filelists/riscv64/boost rename to config/rootfiles/oldcore/204/filelists/riscv64/boost diff --git a/config/rootfiles/core/203/filelists/riscv64/grub b/config/rootfiles/oldcore/204/filelists/riscv64/grub similarity index 100% rename from config/rootfiles/core/203/filelists/riscv64/grub rename to config/rootfiles/oldcore/204/filelists/riscv64/grub diff --git a/config/rootfiles/core/203/filelists/riscv64/util-linux b/config/rootfiles/oldcore/204/filelists/riscv64/util-linux similarity index 100% rename from config/rootfiles/core/203/filelists/riscv64/util-linux rename to config/rootfiles/oldcore/204/filelists/riscv64/util-linux diff --git a/config/rootfiles/core/203/filelists/rrdtool b/config/rootfiles/oldcore/204/filelists/rrdtool similarity index 100% rename from config/rootfiles/core/203/filelists/rrdtool rename to config/rootfiles/oldcore/204/filelists/rrdtool diff --git a/config/rootfiles/core/203/filelists/sqlite b/config/rootfiles/oldcore/204/filelists/sqlite similarity index 100% rename from config/rootfiles/core/203/filelists/sqlite rename to config/rootfiles/oldcore/204/filelists/sqlite diff --git a/config/rootfiles/core/203/filelists/squid b/config/rootfiles/oldcore/204/filelists/squid similarity index 100% rename from config/rootfiles/core/203/filelists/squid rename to config/rootfiles/oldcore/204/filelists/squid diff --git a/config/rootfiles/core/203/filelists/strongswan b/config/rootfiles/oldcore/204/filelists/strongswan similarity index 100% rename from config/rootfiles/core/203/filelists/strongswan rename to config/rootfiles/oldcore/204/filelists/strongswan diff --git a/config/rootfiles/core/203/filelists/vim b/config/rootfiles/oldcore/204/filelists/vim similarity index 100% rename from config/rootfiles/core/203/filelists/vim rename to config/rootfiles/oldcore/204/filelists/vim diff --git a/config/rootfiles/core/203/filelists/web-user-interface b/config/rootfiles/oldcore/204/filelists/web-user-interface similarity index 100% rename from config/rootfiles/core/203/filelists/web-user-interface rename to config/rootfiles/oldcore/204/filelists/web-user-interface diff --git a/config/rootfiles/core/203/filelists/which b/config/rootfiles/oldcore/204/filelists/which similarity index 100% rename from config/rootfiles/core/203/filelists/which rename to config/rootfiles/oldcore/204/filelists/which diff --git a/config/rootfiles/core/203/filelists/x86_64/boost b/config/rootfiles/oldcore/204/filelists/x86_64/boost similarity index 100% rename from config/rootfiles/core/203/filelists/x86_64/boost rename to config/rootfiles/oldcore/204/filelists/x86_64/boost diff --git a/config/rootfiles/core/203/filelists/x86_64/grub b/config/rootfiles/oldcore/204/filelists/x86_64/grub similarity index 100% rename from config/rootfiles/core/203/filelists/x86_64/grub rename to config/rootfiles/oldcore/204/filelists/x86_64/grub diff --git a/config/rootfiles/core/203/filelists/x86_64/intel-microcode b/config/rootfiles/oldcore/204/filelists/x86_64/intel-microcode similarity index 100% rename from config/rootfiles/core/203/filelists/x86_64/intel-microcode rename to config/rootfiles/oldcore/204/filelists/x86_64/intel-microcode diff --git a/config/rootfiles/core/203/filelists/x86_64/util-linux b/config/rootfiles/oldcore/204/filelists/x86_64/util-linux similarity index 100% rename from config/rootfiles/core/203/filelists/x86_64/util-linux rename to config/rootfiles/oldcore/204/filelists/x86_64/util-linux diff --git a/config/rootfiles/core/203/filelists/xfsprogs b/config/rootfiles/oldcore/204/filelists/xfsprogs similarity index 100% rename from config/rootfiles/core/203/filelists/xfsprogs rename to config/rootfiles/oldcore/204/filelists/xfsprogs diff --git a/config/rootfiles/core/203/filelists/zone-sync b/config/rootfiles/oldcore/204/filelists/zone-sync similarity index 100% rename from config/rootfiles/core/203/filelists/zone-sync rename to config/rootfiles/oldcore/204/filelists/zone-sync diff --git a/config/rootfiles/core/203/update.sh b/config/rootfiles/oldcore/204/update.sh similarity index 100% rename from config/rootfiles/core/203/update.sh rename to config/rootfiles/oldcore/204/update.sh diff --git a/lfs/apache2 b/lfs/apache2 index a0c8bcaaa..3f9759d10 100644 --- a/lfs/apache2 +++ b/lfs/apache2 @@ -25,7 +25,7 @@ include Config -VER = 2.4.67 +VER = 2.4.68 THISAPP = httpd-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = c7f389588b8081080bf81b2f2ffcc585742811a5c7ddc3b63838bb8aad61586e7b8e8854cdb20b56963cc70a952124849b499a7affbf2bad44162f236bb5fbed +$(DL_FILE)_BLAKE2 = 5c2d4b21915db3ca62ee374e89bb04dcec21a6f2f1334f6306db079de03a974709ef71f3728c56e020c844e331b800306fcf5a865dcd2e02576d41ae6cac6b70 install : $(TARGET) diff --git a/lfs/rsync b/lfs/rsync index 2787e91a0..8ba4e11a0 100644 --- a/lfs/rsync +++ b/lfs/rsync @@ -26,7 +26,7 @@ include Config SUMMARY = Versatile tool for fast incremental file transfer -VER = 3.4.3 +VER = 3.4.4 THISAPP = rsync-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = rsync -PAK_VER = 23 +PAK_VER = 24 DEPS = libxxhash @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 0bafded6a76a2cedcc6b1f37610c785fa05e62955a43ecb85b8522183a902be3b86157eccbf502116177be0efe19f3051d93cdca5e5734f4a3fbc8bca9878a4f +$(DL_FILE)_BLAKE2 = f4eec8d1077e1cc7eec8cd39dcac4643f7608231f5aa6390cb53104efa1602873a333d9e6cba5d1bb2aeff6c3bf9bccd80370a2105a9cc982b49aae9f39f3bde install : $(TARGET) diff --git a/make.sh b/make.sh index 29f6c92c9..4b70e15ad 100755 --- a/make.sh +++ b/make.sh @@ -23,7 +23,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name # If you update the version don't forget to update backupiso and add it to core update VERSION="2.29" # Version number -CORE="203" # Core Level (Filename) +CORE="204" # Core Level (Filename) SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir @@ -265,54 +265,6 @@ print_build_summary() { print_status DONE } -# Launches a timer process as a co-process -launch_timer() { - # Do nothing if the timer is already running - if [ -n "${TIMER_PID}" ]; then - return 0 - fi - - # Don't launch the timer when we are not on a terminal - if ! is_terminal; then - return 0 - fi - - # Launch the co-process - coproc TIMER { "${0}" "__timer" "$$"; } - - # Register the signal handlers - trap "__timer_event" SIGUSR1 - trap "terminate_timer" EXIT -} - -# Terminates a previously launched timer -terminate_timer() { - if [ -n "${TIMER_PID}" ]; then - kill -TERM "${TIMER_PID}" - fi -} - -# The timer main loop -__timer() { - local pid="${1}" - - # Send SIGUSR1 to the main process once a second - # If the parent process has gone away, we will terminate. - while sleep 1; do - if ! kill -USR1 "${pid}" &>/dev/null; then - break - fi - done - - return 0 -} - -# Called when the timer triggers -# This function does nothing, but is needed interrupt the wait call -__timer_event() { - return 0 -} - exiterror() { # Dump logfile if [ -n "${LOGFILE}" ] && [ -e "${LOGFILE}" ]; then @@ -533,7 +485,7 @@ prepareenv() { esac # Setup ccache cache size - execute --chroot ccache --max-size="${CCACHE_CACHE_SIZE}" + execute --chroot ccache --max-size="${CCACHE_CACHE_SIZE}" >/dev/null 2>&1 } entershell() { @@ -574,7 +526,6 @@ execute() { local chroot="false" local command=() local interactive="false" - local timer local network="false" # Collect environment variables @@ -734,10 +685,6 @@ execute() { ) ;; - --timer=*) - timer="${1#--timer=}" - ;; - -*) echo "Unknown argument: ${1}" >&2 return 2 @@ -850,11 +797,6 @@ execute() { ;; false) - # Launch the timer if needed - if [ -n "${timer}" ]; then - launch_timer - fi - # Dispatch the command to the background { "${execute[@]}" >> "${LOGFILE}" 2>&1