Development March 2024

development@lists.ipfire.org

11 participants
54 discussions

[PATCH] Stop unbound-dhcp-leases-bridge from continually restarting unbound
by Nick Howitt 27 Apr '24

27 Apr '24

Hi all, **** This is a repost of an email incorrectly submitted. **** Please bear with me as I am new to IPFire and not at all used to this style of development, so any guidance would be appreciated. There is a bug, https://bugzilla.ipfire.org/show_bug.cgi?id=13254, where unbound-dhcp-leases-bridge restarts unbound a lot when it is totally unnecessary. It appears to be because when a lease is renewed, the script gets triggered, created a new /etc/unbound/dhcp-leases.conf then restarts Unbound to read the file. Generally this seems to be unnecessary as, with a renewed lease, the old and new /etc/unbound/dhcp-leases.conf files are the same. With 5 leases in that file (one for a machine not active) I am getting 3-4 restarts an hour of Unbound when I have a min/max lease time of 60/120min. Looking at the code, it is fairly easy to fix. The current code creates a temp file then copies it into place then restarts unbound. All I am doing is doing a file comparison before the copy and skipping the restart if the files are the same. There were a couple of gotchas because setting the file attributes and copying the file were done inside the "with" block for generating the temporary file. This meant a file comparison always returned False as the temp file was still open and so never the same is the old file. I moved those two statements outside the "with". This forced me to change the fchmod to chmod. It could be argued that the file copy should not be done if the files are not different, but it would take an extra "if" and you'd have to remember to delete the temp file. If required, I can make that change. Also, one small thing I noticed once is that the old and new dhcp-leases.conf files could occasionally contain the same leases but in a different order. I have been unable to reproduce, but to sidestep it, instead of stepping through the leases variable directly, I sort it and step through that. It should make the resulting file completely deterministic and make the file comparison more effective. My patch is: From 73873d4944944a2f02317a73074a6894726f36f7 Mon Sep 17 00:00:00 2001 From: Nick Howitt <nick(a)howitts.co.uk> Date: Sun, 24 Mar 2024 15:17:19 +0000 Subject: [PATCH] Stop unbound-dhcp-leases-bridge from restarting unbound every time it write dhcp-leases.conf as it is very often unchanged and does not require a restart. --- config/unbound/unbound-dhcp-leases-bridge | 28 +++++++++++++++-------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/config/unbound/unbound-dhcp-leases-bridge b/config/unbound/unbound-dhcp-leases-bridge index e9f022aff..d22772066 100644 --- a/config/unbound/unbound-dhcp-leases-bridge +++ b/config/unbound/unbound-dhcp-leases-bridge @@ -22,6 +22,7 @@ import argparse import datetime import daemon +import filecmp import functools import ipaddress import logging @@ -516,26 +517,35 @@ class UnboundConfigWriter(object): def update_dhcp_leases(self, leases): # Write out all leases - self.write_dhcp_leases(leases) + if self.write_dhcp_leases(leases): - log.debug("Reloading Unbound...") + log.debug("Reloading Unbound...") - # Reload the configuration without dropping the cache - self._control("reload_keep_cache") + # Reload the configuration without dropping the cache + self._control("reload_keep_cache") + + else: + + log.debug("Not reloading Unbound. Leases not changed.") def write_dhcp_leases(self, leases): log.debug("Writing DHCP leases...") with tempfile.NamedTemporaryFile(mode="w", delete=False) as f: - for l in leases: + for l in sorted(leases): for rr in l.rrset: f.write("local-data: \"%s\"\n" % " ".join(rr)) - # Make file readable for everyone - os.fchmod(f.fileno(), stat.S_IRUSR|stat.S_IWUSR|stat.S_IRGRP|stat.S_IROTH) + filecmp.clear_cache() + RequireUnboundReload = not filecmp.cmp(f.name, self.path, shallow=False) + + # Make file readable for everyone + os.chmod(f.name, stat.S_IRUSR|stat.S_IWUSR|stat.S_IRGRP|stat.S_IROTH) + + # Move the file to its destination + os.rename(f.name, self.path) - # Move the file to its destination - os.rename(f.name, self.path) + return RequireUnboundReload def _control(self, *args): command = ["unbound-control"] -- 2.43.0 I have this locally on a branch on my firewall. If it is OK, do I need some sort of rights to push my branch and then how I get it merged? Regards, Nick

2 13

Heads up: Backdoor in upstream xz tarball, stable version of IPFire likely unaffected, testing version somewhat affected
by Peter Müller 08 Apr '24

08 Apr '24

Hello *, a quick heads-up on reports on the oss-security mailing list that indicate the upstream tarball of xz containing a backdoor since version 5.6.0, with the target objective appearing to constitute in backdooring SSH: https://openwall.com/lists/oss-security/2024/03/29/4 Please note that this is a developing situation, so take the assessments below with a pinch of salt. - The latest stable version of IPFire, IPFire 2.29 - Core Update 184, is NOT affected by the backdoor discussed in the oss-security post linked above. This is because it includes xz 5.4.6 (as mentioned in https://www.ipfire.org/blog/ipfire-2-29-core-update-184-released). Further, since IPFire does NOT patch OpenSSH in order to include lzma compression (which is a requirement for the unveiled backdoor to work), my understanding at this time is that OpenSSH on stable IPFire installations is not affected. This is further corroborated by the backdoor known so far only becoming active under certain build environment conditions that are not met by IPFire 2.x's build environment. However, it currently appears as if the xz developer has actively worked towards including a backdoor, rather than their account having been compromised. Therefore, it may be that there are other backdoors in the xz upstream tarball, and that they have been included in earlier versions. - Forthcoming Core Update 185 includes two patches that update xz to 5.6.0 and 5.6.1, respectively. These versions are known to include the aforementioned OpenSSH backdoor. The IPFire development team will discuss reversion of xz to a version not known to be affected thus far in the next few days. Currently, both Debian and Fedora opted to revert back to version 5.4.5, rather than 5.4.6 (which is what IPFire currently ships in stable Core Update 184, but is not known to include any malicious code, which only commenced in version 5.6.0). Again, since no custom patching of OpenSSH is in place, the unveiled SSH backdoor would not have been functional on IPFire installations. IPFire is currently unaware of the unveiled backdoor impacting any other service that is usually directly exposed on IPFire installations to the internet, such as OpenVPN or IPsec. For reference, CVE-2024-3094 has been assigned by Red Hat for this issue. Thanks, and best regards, Peter Müller

4 5

[PATCH] CONTRIBUTING.md: adjust links to new URLs
by Rico Hoppe 02 Apr '24

02 Apr '24

- change wiki to documentation - fix bugzilla link Signed-off-by: Rico Hoppe <rico.hoppe(a)ipfire.org> --- doc/CONTRIBUTING.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/CONTRIBUTING.md b/doc/CONTRIBUTING.md index 3680130b1..5f177ea53 100644 --- a/doc/CONTRIBUTING.md +++ b/doc/CONTRIBUTING.md @@ -3,13 +3,13 @@ You can help in numerous ways. This document should give you an overview of what is possible and how you can get involved. It will **not** give you all information you need to successfully contribute to avoid content duplication between this -document and our [wiki](https://wiki.ipfire.org/). Instead, it should guide you +document and our [documentation](https://ipfire.org/docs). Instead, it should guide you to the right places to look for further information. ## Development -All information is available in the [development section](https://wiki.ipfire.org/devel) -of our wiki. The following is a very short overview of the most important topics. +All information is available in the [development section](https://www.ipfire.org/docs/devel) +of our documentation. The following is a very short overview of the most important topics. ### Contact @@ -25,13 +25,13 @@ to the internet community. ### How to build the distribution? In order to contribute, you certainly need to build the distribution at some point. -See [here](https://wiki.ipfire.org/devel/ipfire-2-x/build-howto) for a long guide +See [here](https://www.ipfire.org/docs/devel/ipfire-2-x/build-howto) for a long guide how to do that. ### Reporting bugs -We have a bug tracker located [here](https://wiki.ipfire.org/devel/bugzilla). Further -information can be found in our [wiki](https://wiki.ipfire.org/devel/bugzilla). We do +We have a bug tracker located [here](https://bugzilla.ipfire.org/). Further +information can be found in our [documentation](https://www.ipfire.org/docs/devel/bugzilla). We do **not** use GitHub for tracking bugs. ### Contribute changes to the source code @@ -39,7 +39,7 @@ information can be found in our [wiki](https://wiki.ipfire.org/devel/bugzilla). Unfortunately, we do not accept GitHub pull requests. Instead, we are working with patches which are sent to our mailing list `<development(a)lists.ipfire.org>`. This process might be a bit tricky in the beginning. That's why you can find more information how to do -this [here](https://wiki.ipfire.org/devel/submit-patches). +this [here](https://www.ipfire.org/docs/devel/submit-patches). -- 2.39.2

2 1

[PATCH] xz: Revert back to version 5.4.5 due to backdoor issue
by Adolf Belka 30 Mar '24

30 Mar '24

- xz version 5.6.0 and 5.6.1 discovered to have been backdoored by what looks to have been one of the xz devs. - IPFire looks not to be affected by the problem as we don't patch openssh to be linked with liblzma - However due to question marks about what else might be in these 5.6.x versions it is better to revert back to a version that did not have the build-to-host.m4 file with the code that modifies the build if it meets certain criteria. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/common/xz | 34 +++++++++++++++++++++++----------- lfs/xz | 6 ++++-- 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/config/rootfiles/common/xz b/config/rootfiles/common/xz index 73c0e4d24..f3818a083 100644 --- a/config/rootfiles/common/xz +++ b/config/rootfiles/common/xz @@ -41,18 +41,17 @@ usr/bin/xzmore #usr/lib/liblzma.la #usr/lib/liblzma.so usr/lib/liblzma.so.5 -usr/lib/liblzma.so.5.6.1 +usr/lib/liblzma.so.5.4.5 #usr/lib/pkgconfig/liblzma.pc #usr/share/doc/xz #usr/share/doc/xz/AUTHORS #usr/share/doc/xz/COPYING -#usr/share/doc/xz/COPYING.0BSD #usr/share/doc/xz/COPYING.GPLv2 #usr/share/doc/xz/NEWS #usr/share/doc/xz/README #usr/share/doc/xz/THANKS +#usr/share/doc/xz/TODO #usr/share/doc/xz/api -#usr/share/doc/xz/api/COPYING.CC-BY-SA-4.0 #usr/share/doc/xz/api/annotated.html #usr/share/doc/xz/api/base_8h.html #usr/share/doc/xz/api/bc_s.png @@ -121,15 +120,16 @@ usr/lib/liblzma.so.5.6.1 #usr/share/doc/xz/api/tabs.css #usr/share/doc/xz/api/version_8h.html #usr/share/doc/xz/api/vli_8h.html -#usr/share/doc/xz/api/xz-logo.png #usr/share/doc/xz/examples #usr/share/doc/xz/examples/00_README.txt #usr/share/doc/xz/examples/01_compress_easy.c #usr/share/doc/xz/examples/02_decompress.c #usr/share/doc/xz/examples/03_compress_custom.c #usr/share/doc/xz/examples/04_compress_easy_mt.c -#usr/share/doc/xz/examples/11_file_info.c #usr/share/doc/xz/examples/Makefile +#usr/share/doc/xz/examples_old +#usr/share/doc/xz/examples_old/xz_pipe_comp.c +#usr/share/doc/xz/examples_old/xz_pipe_decomp.c #usr/share/doc/xz/faq.txt #usr/share/doc/xz/history.txt #usr/share/doc/xz/lzma-file-format.txt @@ -168,7 +168,6 @@ usr/lib/liblzma.so.5.6.1 #usr/share/man/de/man1/lzless.1 #usr/share/man/de/man1/lzma.1 #usr/share/man/de/man1/lzmadec.1 -#usr/share/man/de/man1/lzmainfo.1 #usr/share/man/de/man1/lzmore.1 #usr/share/man/de/man1/unlzma.1 #usr/share/man/de/man1/unxz.1 @@ -185,16 +184,21 @@ usr/lib/liblzma.so.5.6.1 #usr/share/man/fr #usr/share/man/fr/man1 #usr/share/man/fr/man1/lzcat.1 +#usr/share/man/fr/man1/lzcmp.1 +#usr/share/man/fr/man1/lzdiff.1 #usr/share/man/fr/man1/lzless.1 #usr/share/man/fr/man1/lzma.1 #usr/share/man/fr/man1/lzmadec.1 -#usr/share/man/fr/man1/lzmainfo.1 +#usr/share/man/fr/man1/lzmore.1 #usr/share/man/fr/man1/unlzma.1 #usr/share/man/fr/man1/unxz.1 #usr/share/man/fr/man1/xz.1 #usr/share/man/fr/man1/xzcat.1 +#usr/share/man/fr/man1/xzcmp.1 #usr/share/man/fr/man1/xzdec.1 +#usr/share/man/fr/man1/xzdiff.1 #usr/share/man/fr/man1/xzless.1 +#usr/share/man/fr/man1/xzmore.1 #usr/share/man/ko #usr/share/man/ko/man1 #usr/share/man/ko/man1/lzcat.1 @@ -206,7 +210,6 @@ usr/lib/liblzma.so.5.6.1 #usr/share/man/ko/man1/lzless.1 #usr/share/man/ko/man1/lzma.1 #usr/share/man/ko/man1/lzmadec.1 -#usr/share/man/ko/man1/lzmainfo.1 #usr/share/man/ko/man1/lzmore.1 #usr/share/man/ko/man1/unlzma.1 #usr/share/man/ko/man1/unxz.1 @@ -246,16 +249,27 @@ usr/lib/liblzma.so.5.6.1 #usr/share/man/pt_BR #usr/share/man/pt_BR/man1 #usr/share/man/pt_BR/man1/lzcat.1 +#usr/share/man/pt_BR/man1/lzcmp.1 +#usr/share/man/pt_BR/man1/lzdiff.1 +#usr/share/man/pt_BR/man1/lzegrep.1 +#usr/share/man/pt_BR/man1/lzfgrep.1 +#usr/share/man/pt_BR/man1/lzgrep.1 #usr/share/man/pt_BR/man1/lzless.1 #usr/share/man/pt_BR/man1/lzma.1 #usr/share/man/pt_BR/man1/lzmadec.1 -#usr/share/man/pt_BR/man1/lzmainfo.1 +#usr/share/man/pt_BR/man1/lzmore.1 #usr/share/man/pt_BR/man1/unlzma.1 #usr/share/man/pt_BR/man1/unxz.1 #usr/share/man/pt_BR/man1/xz.1 #usr/share/man/pt_BR/man1/xzcat.1 +#usr/share/man/pt_BR/man1/xzcmp.1 #usr/share/man/pt_BR/man1/xzdec.1 +#usr/share/man/pt_BR/man1/xzdiff.1 +#usr/share/man/pt_BR/man1/xzegrep.1 +#usr/share/man/pt_BR/man1/xzfgrep.1 +#usr/share/man/pt_BR/man1/xzgrep.1 #usr/share/man/pt_BR/man1/xzless.1 +#usr/share/man/pt_BR/man1/xzmore.1 #usr/share/man/ro #usr/share/man/ro/man1 #usr/share/man/ro/man1/lzcat.1 @@ -267,7 +281,6 @@ usr/lib/liblzma.so.5.6.1 #usr/share/man/ro/man1/lzless.1 #usr/share/man/ro/man1/lzma.1 #usr/share/man/ro/man1/lzmadec.1 -#usr/share/man/ro/man1/lzmainfo.1 #usr/share/man/ro/man1/lzmore.1 #usr/share/man/ro/man1/unlzma.1 #usr/share/man/ro/man1/unxz.1 @@ -292,7 +305,6 @@ usr/lib/liblzma.so.5.6.1 #usr/share/man/uk/man1/lzless.1 #usr/share/man/uk/man1/lzma.1 #usr/share/man/uk/man1/lzmadec.1 -#usr/share/man/uk/man1/lzmainfo.1 #usr/share/man/uk/man1/lzmore.1 #usr/share/man/uk/man1/unlzma.1 #usr/share/man/uk/man1/unxz.1 diff --git a/lfs/xz b/lfs/xz index cbec430d4..982392aa0 100644 --- a/lfs/xz +++ b/lfs/xz @@ -24,7 +24,7 @@ include Config -VER = 5.6.1 +VER = 5.4.5 THISAPP = xz-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 3a1cf93d7223eb57e78eabe828a3d623acac5824ada299470e3126692ef89d1648293aef32468d70a5289611969d5299180c1b373dfbda002a49f3afc729d925 +$(DL_FILE)_BLAKE2 = 08d9afebd927ea5d155515a4c9eedda4d1a249f2b1ab6ada11f50e5b7a3c90b389b32378ab1c0872c7f4627de8dff37149d85e49f7f4d30614add37320ec4f3e install : $(TARGET) @@ -80,3 +80,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD) + + -- 2.44.0

2 3

Mailing lists related urls not working
by Adolf Belka 30 Mar '24

30 Mar '24

Hi All, The mail server is working okay because I have received ipfire.org mails but if you try and access the mailing lists or the mailing list archives you get a Oops, something went wrong 503 Service unavailable message. That has been occurring this morning and is still doing it just now when I tested it. Regards Adolf -- Sent from my laptop

3 2

[PATCH 1/5] perl-Capture-Tiny: New package
by Stefan Schantl 30 Mar '24

30 Mar '24

This is only a build dependency for perl-Config-AutoConf and will not be installed on a system Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- config/rootfiles/common/perl-Capture-Tiny | 6 ++ lfs/perl-Capture-Tiny | 77 +++++++++++++++++++++++ make.sh | 1 + 3 files changed, 84 insertions(+) create mode 100644 config/rootfiles/common/perl-Capture-Tiny create mode 100644 lfs/perl-Capture-Tiny diff --git a/config/rootfiles/common/perl-Capture-Tiny b/config/rootfiles/common/perl-Capture-Tiny new file mode 100644 index 000000000..4fb874d29 --- /dev/null +++ b/config/rootfiles/common/perl-Capture-Tiny @@ -0,0 +1,6 @@ +#usr/lib/perl5/site_perl/5.36.0/Capture +#usr/lib/perl5/site_perl/5.36.0/Capture/Tiny.pm +#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Capture +#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Capture/Tiny +#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Capture/Tiny/.packlist +#usr/share/man/man3/Capture::Tiny.3 diff --git a/lfs/perl-Capture-Tiny b/lfs/perl-Capture-Tiny new file mode 100644 index 000000000..bb6b45e82 --- /dev/null +++ b/lfs/perl-Capture-Tiny @@ -0,0 +1,77 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# 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 = 0.48 + +THISAPP = Capture-Tiny-$(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 = e6de05459478131c5129dd5ffc84744e2d3440c2e31545ed101c2986b2bc970106f126286dea50350f4b5ea330ffac423693d755e29850883bdc215437bf7488 + +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) $(EXTRA_MAKE) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index e025f260f..ea0185e15 100755 --- a/make.sh +++ b/make.sh @@ -1377,6 +1377,7 @@ buildipfire() { lfsmake2 perl-Crypt-PasswdMD5 lfsmake2 perl-Net-Telnet lfsmake2 perl-JSON + lfsmake2 perl-Capture-Tiny lfsmake2 python3-inotify lfsmake2 python3-docutils lfsmake2 python3-daemon -- 2.39.2

1 4

[PATCH 1/5] functions.network: Add proper Exit Codes
by Jonatan Schlag 28 Mar '24

28 Mar '24

This ist borrowed from here: https://git.ipfire.org/?p=network.git;a=blob_plain;f=src/functions/function… and can be extended later on. Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- src/initscripts/networking/functions.network | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/initscripts/networking/functions.network b/src/initscripts/networking/functions.network index 4c7ad51d4..dedbb6f7f 100644 --- a/src/initscripts/networking/functions.network +++ b/src/initscripts/networking/functions.network @@ -22,6 +22,10 @@ . /etc/sysconfig/rc . $rc_functions +# Proper error codes +EXIT_TRUE=0 +EXIT_FALSE=1 + eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) eval $(/usr/local/bin/readhash /var/ipfire/dns/settings) -- 2.39.2

2 19

[PATCH 1/3] protobuf-c: Ship libraries
by Michael Tremer 28 Mar '24

28 Mar '24

FRR links against this and fails to start without. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> --- config/rootfiles/common/protobuf-c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/rootfiles/common/protobuf-c b/config/rootfiles/common/protobuf-c index 56e6a2362..aed0319db 100644 --- a/config/rootfiles/common/protobuf-c +++ b/config/rootfiles/common/protobuf-c @@ -8,6 +8,6 @@ #usr/lib/libprotobuf-c.a #usr/lib/libprotobuf-c.la #usr/lib/libprotobuf-c.so -#usr/lib/libprotobuf-c.so.1 -#usr/lib/libprotobuf-c.so.1.0.0 +usr/lib/libprotobuf-c.so.1 +usr/lib/libprotobuf-c.so.1.0.0 #usr/lib/pkgconfig/libprotobuf-c.pc -- 2.39.2

1 2

[PATCH 1/2] README.md: update text & adjust links to new URLs
by Rico Hoppe 28 Mar '24

28 Mar '24

- links for: about, documentation, help - wording: wiki to documentation Signed-off-by: Rico Hoppe <rico.hoppe(a)ipfire.org> --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index df3d35717..5e88d31dd 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ IPFire is a hardened, versatile, state-of-the-art Open Source firewall based on Linux. Its ease of use, high performance in any scenario and extensibility make -it usable for everyone. For a full list of features have a look [here](https://www.ipfire.org/features). +it usable for everyone. For a full list of features have a look [here](https://www.ipfire.org/about). This repository contains the source code of IPFire 2.x which is used to build the whole distribution from scratch, since IPFire is not based on any other @@ -16,13 +16,13 @@ Just head over to https://www.ipfire.org/download # How do I use this software? -We have a long and detailed wiki located [here](https://wiki.ipfire.org/) which +We have a long and detailed documentation located [here](https://ipfire.org/docs) which should answers most of your questions. # But I have some questions left. Where can I get support? You can ask your question at our community located [here](https://community.ipfire.org/). -A complete list of our support channels can be found [here](https://www.ipfire.org/support). +A complete list of our support channels can be found [here](https://www.ipfire.org/help). # How can I contribute? -- 2.39.2

2 3

[PATCH 1/2] inotify-tools: New package
by Stefan Schantl 28 Mar '24

28 Mar '24

This package is required for the grub-btrfs daemon Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- config/rootfiles/common/inotify-tools | 19 ++++++ lfs/inotify-tools | 83 +++++++++++++++++++++++++++ make.sh | 1 + 3 files changed, 103 insertions(+) create mode 100644 config/rootfiles/common/inotify-tools create mode 100644 lfs/inotify-tools diff --git a/config/rootfiles/common/inotify-tools b/config/rootfiles/common/inotify-tools new file mode 100644 index 000000000..f99d64c01 --- /dev/null +++ b/config/rootfiles/common/inotify-tools @@ -0,0 +1,19 @@ +usr/bin/fsnotifywait +usr/bin/fsnotifywatch +usr/bin/inotifywait +usr/bin/inotifywatch +#usr/include/inotifytools +#usr/include/inotifytools/fanotify-dfid-name.h +#usr/include/inotifytools/fanotify.h +#usr/include/inotifytools/inotify-nosys.h +#usr/include/inotifytools/inotify.h +#usr/include/inotifytools/inotifytools.h +#usr/lib/libinotifytools.a +#usr/lib/libinotifytools.la +#usr/lib/libinotifytools.so +usr/lib/libinotifytools.so.0 +usr/lib/libinotifytools.so.0.4.1 +#usr/share/man/man1/fsnotifywait.1 +#usr/share/man/man1/fsnotifywatch.1 +#usr/share/man/man1/inotifywait.1 +#usr/share/man/man1/inotifywatch.1 diff --git a/lfs/inotify-tools b/lfs/inotify-tools new file mode 100644 index 000000000..bb70fbfc6 --- /dev/null +++ b/lfs/inotify-tools @@ -0,0 +1,83 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# 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 = 4.23.9.0 + +THISAPP = inotify-tools-$(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 = eddb0e44721cd8674f2309046998de16a030ed9ad84c49bc5950b9362055db9242dc0de1c615c3bd6c1f2835c83fc55446c9f8e6da52a98870c53f4e6cfa31f9 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +b2 : $(subst %,%_BLAKE2,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# 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 axf $(DIR_DL)/$(DL_FILE) + $(UPDATE_AUTOMAKE) + cd $(DIR_APP) && ./autogen.sh + cd $(DIR_APP) && ./configure \ + --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 3c0b9ef27..1834b927a 100755 --- a/make.sh +++ b/make.sh @@ -1713,6 +1713,7 @@ buildipfire() { lfsmake2 mympd lfsmake2 wsdd lfsmake2 btrfs-progs + lfsmake2 inotify-tools # Kernelbuild ... current we have no platform that need # multi kernel builds so KCFG is empty -- 2.39.2

2 11

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development March 2024