[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 34345ff1ef4cf0124ecd90a7cd4a378cb36a6042
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 34345ff1ef4cf0124ecd90a7cd4a378cb36a6042 (commit) via c5487f807302f385a6408f82c33c897ea34d15bb (commit) via 4cdc4e405997d7d5672a8d3295bc61bff87b440a (commit) via 8a3a3856aca98f26ee9ee8532dda63590c910aa6 (commit) via 9149276b657acd6e9bbf7246ec94920450fa77ed (commit) via 5cfccb2c8c9d9217775b010a45800b3d859d12dc (commit) via e11fc5273be62e65689cda947af458e5dcc68160 (commit) via 03ed43bdd54700c02a4f4eedc34603aacbf8557c (commit) via eef8486bdfef989ef0834b7c90e5e8422f961130 (commit) via 9a40c7fb0dff208b624c1285dd3537caf88c6d7c (commit) from 1edc79f4ba32df639f0df140d3f9b9f690cd2861 (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 34345ff1ef4cf0124ecd90a7cd4a378cb36a6042 Author: Jon Murphy jon.murphy@ipfire.org Date: Sun Aug 20 12:29:17 2023 -0500
avahi-daemo: remove orange interface
- fix Bug 13202 - add non-default config file - enable mDNS reflector - remove IPv6
Signed-off-by: Jon Murphy jon.murphy@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit c5487f807302f385a6408f82c33c897ea34d15bb Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Aug 21 09:27:57 2023 +0000
core180: Ship vnstat
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 4cdc4e405997d7d5672a8d3295bc61bff87b440a Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sun Aug 20 19:15:23 2023 +0200
vnstat: Update to 2.11
For details see: https://humdi.net/vnstat/CHANGES
"2.11 / 19-Aug-2023
- Fixed - Database queries worked only if SQLite double-quoted string (DQS) feature (https://www.sqlite.org/quirks.html#dblquote) was enabled - Disabling data resolutions in data retention configuration didn't result in possibly existing database entries getting removed from the database - Disabling data resolutions in data retention configuration didn't result in the data resolution getting disabled but instead storing data forever - "expr: syntax error" during configure in BSD (pull request by namtsui) - Image output summary would show only "no data available" text in case of zero total traffic even when the historical data of no traffic could have been shown instead - Image output "-o -" content could get corrupted due to info, warning and error messages also using stdout, configuration file warnings being the most likely source, now uses stderr in image output - Configuration validation was too heavily limiting and enforcing image output 5 minute graph related configuration options for combinations that would have resulted in usable images - New - Database cleanup has been changed to interpret data retention configuration as number of entries to be kept instead of calendar time, this restores the behaviour to similar as it was up to version 1.18, the difference is visible only on systems that aren't powered all the time - Database is vacuumed during daemon startup and reload, behaviour is configurable using VacuumOnStartup and VacuumOnHUPSignal configuration options - Add configuration option InterfaceOrder for controlling the interface order in outputs with multiple interfaces - Used data retention configuration is made visible during daemon startup and after configuration reloads - Daemon will no longer start if all data resolutions have been disabled in the configuration file - SQLite version is visible in --version outputs - Notes - "Not enough data available yet." message has been replaced with "No data. Timestamp of last update is same YYYY-MM-DD HH:MM:SS as of database creation." to better explain the reason why there's nothing to show, this message is expected to disappear within configured SaveInterval if the interface is active"
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 8a3a3856aca98f26ee9ee8532dda63590c910aa6 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Aug 21 09:26:43 2023 +0000
core180: Ship index.cgi
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 9149276b657acd6e9bbf7246ec94920450fa77ed Author: Adolf Belka adolf.belka@ipfire.org Date: Sun Aug 20 16:11:02 2023 +0200
index.cgi: Add warning about reiserfs deprecation and removal if reiserfs used
- Reiserfs was stopped in IPFire in Core Update 167. It has been announced that reiserfs will be removed from the kernel in 2025. - This patch gives a warning about this deprecation and removal if reiserfs is used. The warning also requests that the user does a re-installation using either ext4 or xfs filesystems. - Tested out on a vm installation with reiserfs, ext4 and xfs. Messgae shown on system with reiserfs filesystem but nopt on the other two. - Warning message added into the English language file and ./make.sh lang run.
Tested-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 5cfccb2c8c9d9217775b010a45800b3d859d12dc Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Aug 21 09:25:07 2023 +0000
core180: Ship dhcpcd
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e11fc5273be62e65689cda947af458e5dcc68160 Author: Adolf Belka adolf.belka@ipfire.org Date: Sun Aug 20 16:11:01 2023 +0200
dhcpcd: Update to version 10.0.2
- Update from version 10.0.1 to 10.0.2 - Update of rootfile not required - Changelog 10.0.2 Major changes listed as:- chore: Link to GitHub for the updated commit log by @frazar in #203 Additional DHCP options by @rrobgill in #214 risc-v fix vendor error by @Im-0xea in #213 compat sync by @tobhe in #226 Commit list can be seen at https://github.com/NetworkConfiguration/dhcpcd/compare/v10.0.1...v10.0.2 This includes two bug fixes for two situations causing segfaults
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 03ed43bdd54700c02a4f4eedc34603aacbf8557c Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sat Aug 19 17:45:28 2023 +0200
clamav: Update to 1.1.1
For details see: https://blog.clamav.net/2023/07/2023-08-16-releases.html
Excerpts from changelog: "ClamAV 1.1.1 is a critical patch release with the following fixes:
CVE-2023-20197 Fixed a possible denial of service vulnerability in the HFS+ file parser. This issue affects versions 1.1.0, 1.0.1 through 1.0.0, 0.105.2 through 0.105.0, 0.104.4 through 0.104.0, and 0.103.8 through 0.103.0.
Fixed a build issue when using the Rust nightly toolchain, which was affecting the oss-fuzz build environment used for regression tests.
Fixed a build issue on Windows when using Rust version 1.70 or newer.
CMake build system improvement to support compiling with OpenSSL 3.x on macOS with the Xcode toolchain. The official ClamAV installers and packages are now built with OpenSSL 3.1.1 or newer.
Removed a warning message showing the HTTP response codes during the Freshclam database update process."
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit eef8486bdfef989ef0834b7c90e5e8422f961130 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Aug 21 09:23:14 2023 +0000
core180: Ship ppp
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 9a40c7fb0dff208b624c1285dd3537caf88c6d7c Author: Adolf Belka adolf.belka@ipfire.org Date: Fri Aug 18 20:46:45 2023 +0200
ppp: Bug#13164 - Update configure options to have correct directory for pid
- The original poster of the bug#13164 has already tested out ppp-2.5.0 in CU179 (master) and identified that the startup could not find the directory /usr/var/run/. This is due to the change in use of the prefix command in 2.5.0 vs 2.4.9 so --localstatedir set to /var. runstatedir is then set to localstatedir/run ie /var/run which is then correct for IPFire. - This fix needs to be implemented into CU179 so that the bug poster can test out the update - Updated rootfile to remove additional empty line
Fixes: Bug#13164 Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/avahi/avahi-daemon.conf | 69 ++++++++++++++++++++++ config/rootfiles/common/ppp | 1 - .../{oldcore/125 => core/180}/filelists/dhcpcd | 0 config/rootfiles/core/180/filelists/files | 1 + .../{oldcore/125 => core/180}/filelists/ppp | 0 .../{oldcore/111 => core/180}/filelists/vnstat | 0 config/rootfiles/core/180/update.sh | 1 + doc/language_issues.de | 2 + doc/language_issues.en | 2 + doc/language_issues.es | 2 + doc/language_issues.fr | 2 + doc/language_issues.it | 2 + doc/language_issues.nl | 2 + doc/language_issues.pl | 2 + doc/language_issues.ru | 2 + doc/language_issues.tr | 2 + doc/language_missings | 16 +++++ html/cgi-bin/index.cgi | 9 ++- langs/en/cgi-bin/en.pl | 2 + lfs/avahi | 9 ++- lfs/clamav | 6 +- lfs/dhcpcd | 6 +- lfs/ppp | 1 + lfs/vnstat | 6 +- ...-Allow-free-selection-of-MTU-by-the-user.patch} | 0 25 files changed, 131 insertions(+), 14 deletions(-) create mode 100644 config/avahi/avahi-daemon.conf copy config/rootfiles/{oldcore/125 => core/180}/filelists/dhcpcd (100%) copy config/rootfiles/{oldcore/125 => core/180}/filelists/ppp (100%) copy config/rootfiles/{oldcore/111 => core/180}/filelists/vnstat (100%) rename src/patches/{dhcpcd-10.0.1-Allow-free-selection-of-MTU-by-the-user.patch => dhcpcd-10.0.2-Allow-free-selection-of-MTU-by-the-user.patch} (100%)
Difference in files: diff --git a/config/avahi/avahi-daemon.conf b/config/avahi/avahi-daemon.conf new file mode 100644 index 000000000..7e2b951db --- /dev/null +++ b/config/avahi/avahi-daemon.conf @@ -0,0 +1,69 @@ +# This file is part of avahi. +# +# avahi is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# avahi 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 Lesser General Public +# License along with avahi; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA. + +# See avahi-daemon.conf(5) for more information on this configuration +# file! + +[server] +#host-name=foo +#domain-name=local +#browse-domains=0pointer.de, zeroconf.org +use-ipv4=yes +use-ipv6=no +#allow-interfaces=eth0 +deny-interfaces=orange0 +#check-response-ttl=no +#use-iff-running=no +#enable-dbus=yes +#disallow-other-stacks=no +#allow-point-to-point=no +#cache-entries-max=4096 +#clients-max=4096 +#objects-per-client-max=1024 +#entries-per-entry-group-max=32 +ratelimit-interval-usec=1000000 +ratelimit-burst=1000 + +[wide-area] +enable-wide-area=yes + +[publish] +#disable-publishing=no +#disable-user-service-publishing=no +#add-service-cookie=no +#publish-addresses=yes +publish-hinfo=no +publish-workstation=no +#publish-domain=yes +#publish-dns-servers=192.168.50.1, 192.168.50.2 +#publish-resolv-conf-dns-servers=yes +#publish-aaaa-on-ipv4=yes +#publish-a-on-ipv6=no + +[reflector] +enable-reflector=yes +#reflect-ipv=no +#reflect-filters=_airplay._tcp.local,_raop._tcp.local + +[rlimits] +#rlimit-as= +#rlimit-core=0 +#rlimit-data=8388608 +#rlimit-fsize=0 +#rlimit-nofile=768 +#rlimit-stack=8388608 +#rlimit-nproc=3 diff --git a/config/rootfiles/common/ppp b/config/rootfiles/common/ppp index 6098fa7c3..379c64af4 100644 --- a/config/rootfiles/common/ppp +++ b/config/rootfiles/common/ppp @@ -71,4 +71,3 @@ usr/sbin/pppstats #usr/share/man/man8/pppoe-discovery.8 #usr/share/man/man8/pppstats.8 var/log/connect-errors - diff --git a/config/rootfiles/core/180/filelists/dhcpcd b/config/rootfiles/core/180/filelists/dhcpcd new file mode 120000 index 000000000..1e799dabb --- /dev/null +++ b/config/rootfiles/core/180/filelists/dhcpcd @@ -0,0 +1 @@ +../../../common/dhcpcd \ No newline at end of file diff --git a/config/rootfiles/core/180/filelists/files b/config/rootfiles/core/180/filelists/files index e69de29bb..44081afc9 100644 --- a/config/rootfiles/core/180/filelists/files +++ b/config/rootfiles/core/180/filelists/files @@ -0,0 +1 @@ +srv/web/ipfire/cgi-bin/index.cgi diff --git a/config/rootfiles/core/180/filelists/ppp b/config/rootfiles/core/180/filelists/ppp new file mode 120000 index 000000000..4844a9b58 --- /dev/null +++ b/config/rootfiles/core/180/filelists/ppp @@ -0,0 +1 @@ +../../../common/ppp \ No newline at end of file diff --git a/config/rootfiles/core/180/filelists/vnstat b/config/rootfiles/core/180/filelists/vnstat new file mode 120000 index 000000000..2e2e6100b --- /dev/null +++ b/config/rootfiles/core/180/filelists/vnstat @@ -0,0 +1 @@ +../../../common/vnstat \ No newline at end of file diff --git a/config/rootfiles/core/180/update.sh b/config/rootfiles/core/180/update.sh index 06a087675..6574bf975 100644 --- a/config/rootfiles/core/180/update.sh +++ b/config/rootfiles/core/180/update.sh @@ -49,6 +49,7 @@ ldconfig
# Start services telinit u +/etc/rc.d/init.d/vnstat restart
# This update needs a reboot... #touch /var/run/need_reboot diff --git a/doc/language_issues.de b/doc/language_issues.de index 53e81a5d5..4fd5a0819 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -933,6 +933,8 @@ WARNING: untranslated string: netbios nameserver daemon = NetBIOS Nameserver Dae WARNING: untranslated string: no entries = No entries at the moment. WARNING: untranslated string: optional = Optional WARNING: untranslated string: pakfire invalid tree = Invalid repository selected +WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025. +WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date. WARNING: untranslated string: required = Required WARNING: untranslated string: route config changed = unknown string WARNING: untranslated string: routing config added = unknown string diff --git a/doc/language_issues.en b/doc/language_issues.en index 97166df4f..70eb9fbe8 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -1577,6 +1577,8 @@ WARNING: untranslated string: red1 = RED WARNING: untranslated string: references = References WARNING: untranslated string: refresh = Refresh WARNING: untranslated string: refresh index page while connected = Refresh index.cgi page while connected +WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025. +WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date. WARNING: untranslated string: release = Release WARNING: untranslated string: remark = Remark WARNING: untranslated string: remark title = Remark: diff --git a/doc/language_issues.es b/doc/language_issues.es index d755bea3e..45ffdf5d7 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -995,6 +995,8 @@ WARNING: untranslated string: no data = unknown string WARNING: untranslated string: openvpn cert expires soon = Expires Soon WARNING: untranslated string: openvpn cert has expired = Expired WARNING: untranslated string: pakfire ago = ago. +WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025. +WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date. WARNING: untranslated string: route config changed = unknown string WARNING: untranslated string: routing config added = unknown string WARNING: untranslated string: routing config changed = unknown string diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 0d664336a..cacfb1ec6 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -948,6 +948,8 @@ WARNING: untranslated string: guardian logtarget_syslog = unknown string WARNING: untranslated string: guardian no entries = unknown string WARNING: untranslated string: guardian service = unknown string WARNING: untranslated string: pakfire ago = ago. +WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025. +WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date. WARNING: untranslated string: route config changed = unknown string WARNING: untranslated string: routing config added = unknown string WARNING: untranslated string: routing config changed = unknown string diff --git a/doc/language_issues.it b/doc/language_issues.it index 447b71af0..68ff12c86 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -1215,6 +1215,8 @@ WARNING: untranslated string: rdns = rDNS WARNING: untranslated string: reboot fsck = Reboot & run ‘fsck’ WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing filesystem check WARNING: untranslated string: received = Received +WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025. +WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date. WARNING: untranslated string: release = Release WARNING: untranslated string: required = Required WARNING: untranslated string: required field = Required field diff --git a/doc/language_issues.nl b/doc/language_issues.nl index dcfb8f67f..ea0abc74c 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -1238,6 +1238,8 @@ WARNING: untranslated string: ptr = PTR WARNING: untranslated string: rdns = rDNS WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing filesystem check WARNING: untranslated string: received = Received +WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025. +WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date. WARNING: untranslated string: required = Required WARNING: untranslated string: required field = Required field WARNING: untranslated string: retbleed = Retbleed diff --git a/doc/language_issues.pl b/doc/language_issues.pl index faf686b86..893f73211 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -1418,6 +1418,8 @@ WARNING: untranslated string: reboot fsck = Reboot & run ‘fsck’ WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing filesystem check WARNING: untranslated string: received = Received WARNING: untranslated string: red1 = RED +WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025. +WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date. WARNING: untranslated string: release = Release WARNING: untranslated string: required = Required WARNING: untranslated string: required field = Required field diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 6db59db59..64c9b5095 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -1413,6 +1413,8 @@ WARNING: untranslated string: reboot fsck = Reboot & run ‘fsck’ WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing filesystem check WARNING: untranslated string: received = Received WARNING: untranslated string: red1 = RED +WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025. +WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date. WARNING: untranslated string: release = Release WARNING: untranslated string: required = Required WARNING: untranslated string: required field = Required field diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 7dfd3267d..eadbd33c7 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -1125,6 +1125,8 @@ WARNING: untranslated string: ptr = PTR WARNING: untranslated string: reboot fsck = Reboot & run ‘fsck’ WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing filesystem check WARNING: untranslated string: received = Received +WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025. +WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date. WARNING: untranslated string: release = Release WARNING: untranslated string: required = Required WARNING: untranslated string: retbleed = Retbleed diff --git a/doc/language_missings b/doc/language_missings index aa554c6e7..6eb960f62 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -73,6 +73,8 @@ < optional < quick control < random number generator daemon +< reiserfs warning1 +< reiserfs warning2 < required < samba server role member < samba server role standalone @@ -115,6 +117,8 @@ < invalid ip or hostname < openvpn cert expires soon < openvpn cert has expired +< reiserfs warning1 +< reiserfs warning2 < service boot setting unavailable < spec rstack overflow < transport mode does not support vti @@ -134,6 +138,8 @@ < extrahd not mounted < g.dtm < g.lite +< reiserfs warning1 +< reiserfs warning2 < spec rstack overflow < upload fcdsl.o ############################################################################ @@ -517,6 +523,8 @@ < reboot fsck < rebooting ipfire fsck < received +< reiserfs warning1 +< reiserfs warning2 < release < required < required field @@ -1056,6 +1064,8 @@ < rdns < rebooting ipfire fsck < received +< reiserfs warning1 +< reiserfs warning2 < required < required field < retbleed @@ -1934,6 +1944,8 @@ < rebooting ipfire fsck < received < red1 +< reiserfs warning1 +< reiserfs warning2 < release < required < required field @@ -2923,6 +2935,8 @@ < rebooting ipfire fsck < received < red1 +< reiserfs warning1 +< reiserfs warning2 < release < required < required field @@ -3392,6 +3406,8 @@ < reboot fsck < rebooting ipfire fsck < received +< reiserfs warning1 +< reiserfs warning2 < release < required < retbleed diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index 5c384fd49..c2c0962dc 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2014 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2023 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 # @@ -615,6 +615,13 @@ if ( -e "/var/run/need_reboot" ) { print "</div>"; }
+if ( `/bin/grep -c "reiserfs" /proc/self/mounts` > 0 ) { + print "<div style='text-align:center; color:blue;'>"; + print "<br/><br/>$Lang::tr{'reiserfs warning1'}"; + print "<br/>$Lang::tr{'reiserfs warning2'}"; + print "</div>"; +} + &Header::closebigbox(); &Header::closepage();
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 426c019b4..90d6f7739 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -2208,6 +2208,8 @@ 'refresh index page while connected' => 'Refresh index.cgi page while connected', 'refresh update list' => 'Refresh update list', 'registered user rules' => 'Talos VRT rules for registered users', +'reiserfs warning1' => 'Reiserfs is deprecated and scheduled to be removed from the kernel in 2025.', +'reiserfs warning2' => 'Ensure a fresh installation is made using either ext4 or xfs filesystems before that date.', 'release' => 'Release', 'released' => 'Released', 'reload' => 'reload', diff --git a/lfs/avahi b/lfs/avahi index 6564e6c38..fe5df10db 100644 --- a/lfs/avahi +++ b/lfs/avahi @@ -32,9 +32,9 @@ THISAPP = avahi-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) PROG = avahi -PAK_VER = 12 +PAK_VER = 13
DEPS = dbus libdaemon
@@ -101,8 +101,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install
+ # Add conf file to /etc/avahi directory + cp -vf $(DIR_CONF)/avahi/avahi-daemon.conf /etc/avahi + # Install configuration for samba - cp -avf $(DIR_SRC)/config/avahi/smb.service /etc/avahi/services/smb.service + cp -avf $(DIR_CONF)/avahi/smb.service /etc/avahi/services/smb.service
# Install initscript $(call INSTALL_INITSCRIPTS,$(SERVICES)) diff --git a/lfs/clamav b/lfs/clamav index c48c48834..88619afcb 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -26,7 +26,7 @@ include Config
SUMMARY = Antivirus Toolkit
-VER = 1.1.0 +VER = 1.1.1
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 = 67 +PAK_VER = 68
DEPS =
@@ -50,7 +50,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 6a30558b8e6d2f8d98eb0b990e58ec9a19d7f58b11863ec5dffe97f45c73c1ea8bb0360456193c76d178068ee5eb7f01fc44851eb7bf90d42ca9dd9431413a4f +$(DL_FILE)_BLAKE2 = 880318a2be3dcc8bc425cd6d7bbc4fb2b6dd28e9f491dcac382e8a9ff7c0229d846512127c6e10a1e1aa7daa5ac53a5284462e341f29725269f8862e73310caa
install : $(TARGET)
diff --git a/lfs/dhcpcd b/lfs/dhcpcd index 136494ed1..909de6e57 100644 --- a/lfs/dhcpcd +++ b/lfs/dhcpcd @@ -24,7 +24,7 @@
include Config
-VER = 10.0.1 +VER = 10.0.2
THISAPP = dhcpcd-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = f1e93285d040b98bede86bb2e87e372afc0d1d124e7a6580c23d8d228a34ee17001fc3c2d9091b16fb082fe2f2ad7ba50c0dd7b0db2b2237ab1cff9ca152100a +$(DL_FILE)_BLAKE2 = 999033b4c0bc46943332b0b7ed3f1869ad54e2c37346523a15fbd3d9f29db1e01c1ddd0a300826021d3e20493ea06358ef47ac6a02c50331ca0d90e31a123b85
install : $(TARGET)
@@ -70,7 +70,7 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcpcd-10.0.1-Allow-free-selection-of-MTU-by-the-user.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcpcd-10.0.2-Allow-free-selection-of-MTU-by-the-user.patch cd $(DIR_APP) && ./configure \ --prefix="" \ --sysconfdir=/var/ipfire/dhcpc \ diff --git a/lfs/ppp b/lfs/ppp index fc4528ece..a6bd633b4 100644 --- a/lfs/ppp +++ b/lfs/ppp @@ -82,6 +82,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --prefix=/usr \ --sysconfdir=/etc \ --with-logfile-dir=/var/log \ + --localstatedir=/var \ cc="gcc" \ cflags="$(CFLAGS)" cd $(DIR_APP) && make $(MAKETUNING) diff --git a/lfs/vnstat b/lfs/vnstat index c854ea090..ca61562c0 100644 --- a/lfs/vnstat +++ b/lfs/vnstat @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2023 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.10 +VER = 2.11
THISAPP = vnstat-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 82fcb54cf00a8122f31dc27f41f830ef68b92452bf7ae22bf2f1be13a1526bd12e8365002edef7766156f2df15472b189b3f219074532cb00a81156775b08997 +$(DL_FILE)_BLAKE2 = 6eeed45d628641c9d88cf33ae1fc14871109b1e9fd0ac4a46fe8e2c194bb4600878b69408ed177bcde38ca859d0a3165d0095cab9b0bb6c036f7788fbfcb47e6
install : $(TARGET)
diff --git a/src/patches/dhcpcd-10.0.1-Allow-free-selection-of-MTU-by-the-user.patch b/src/patches/dhcpcd-10.0.2-Allow-free-selection-of-MTU-by-the-user.patch similarity index 100% rename from src/patches/dhcpcd-10.0.1-Allow-free-selection-of-MTU-by-the-user.patch rename to src/patches/dhcpcd-10.0.2-Allow-free-selection-of-MTU-by-the-user.patch
hooks/post-receive -- IPFire 2.x development tree
-
Michael Tremer