Development October 2021

development@lists.ipfire.org

12 participants
59 discussions

[PATCH] avahi: Install backup definition - bug#12714
by Adolf Belka 30 Oct '21

30 Oct '21

- Addition of backup definition install into lfs file - Update of rootfile Fixes: 12714 Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/packages/avahi | 1 + lfs/avahi | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/config/rootfiles/packages/avahi b/config/rootfiles/packages/avahi index e6ab0c0ff..0a88be7f0 100644 --- a/config/rootfiles/packages/avahi +++ b/config/rootfiles/packages/avahi @@ -175,3 +175,4 @@ usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceTypeBrowser.xml #usr/share/man/man8/avahi-daemon.8 #usr/share/man/man8/avahi-dnsconfd.8 #usr/share/man/man8/avahi-dnsconfd.action.8 +var/ipfire/backup/addons/includes/avahi diff --git a/lfs/avahi b/lfs/avahi index ae166a88c..795ba4130 100644 --- a/lfs/avahi +++ b/lfs/avahi @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = avahi -PAK_VER = 8 +PAK_VER = 9 DEPS = dbus libdaemon @@ -102,6 +102,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # Install initscript $(call INSTALL_INITSCRIPT,avahi) - + + #install backup definition + install -v -m 644 ${DIR_SRC}/config/backup/includes/avahi \ + /var/ipfire/backup/addons/includes/avahi + @rm -rf $(DIR_APP) @$(POSTBUILD) -- 2.33.1

2 1

[PATCH] Core Update 161: fix typo (stronswan != strongswan)
by Peter Müller 26 Oct '21

26 Oct '21

Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- config/rootfiles/core/161/filelists/{stronswan => strongswan} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename config/rootfiles/core/161/filelists/{stronswan => strongswan} (100%) diff --git a/config/rootfiles/core/161/filelists/stronswan b/config/rootfiles/core/161/filelists/strongswan similarity index 100% rename from config/rootfiles/core/161/filelists/stronswan rename to config/rootfiles/core/161/filelists/strongswan -- 2.26.2

1 0

[PATCH] speed.cgi: reduce system load by copying two general-functions.
by Arne Fitzenreiter 25 Oct '21

25 Oct '21

include general-functions.pl load and initialize many subfunctions that are not needed by speed.cgi which was executed very ofthen. So this reduce the system load significant if webif was open in browser and ajax-speed display enabled. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> --- config/cfgroot/general-functions.pl | 2 ++ html/cgi-bin/speed.cgi | 46 +++++++++++++++++++++++++++-- 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index f72d6588c..c10a04faa 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -53,6 +53,7 @@ sub system_background($) { } # Returns the output of a shell command +# if you change this also check speed.cgi that include a local copy for systemload reasons sub system_output($) { my @command = @_; my $pid; @@ -1227,6 +1228,7 @@ sub firewall_reload() { } # Function which will return the used interface for the red network zone (red0, ppp0, etc). +# if you change this also check speed.cgi that include a local copy for systemload reasons sub get_red_interface() { open(IFACE, "${General::swroot}/red/iface") or die "Could not open /var/ipfire/red/iface"; diff --git a/html/cgi-bin/speed.cgi b/html/cgi-bin/speed.cgi index b550fda52..651c3c0b3 100644 --- a/html/cgi-bin/speed.cgi +++ b/html/cgi-bin/speed.cgi @@ -19,7 +19,47 @@ # # ############################################################################### -require '/var/ipfire/general-functions.pl'; +############################################################################### +# functions copied from general-functions.pl for speed improvement because # +# loading and initializing the whole general-functions.pl every second create # +# high system load # +###########################################OA################################## +# +# Returns the output of a shell command +sub General__system_output($) { + my @command = @_; + my $pid; + my @output = (); + + unless ($pid = open(OUTPUT, "-|")) { + open(STDERR, ">&STDOUT"); + exec { ${command[0]} } @command; + die "Could not execute @command: $!"; + } + + waitpid($pid, 0); + + while (<OUTPUT>) { + push(@output, $_); + } + + close(OUTPUT); + return @output; +} +# +# Function which will return the used interface for the red network zone (red0, ppp0, etc). +sub General__get_red_interface() { + + open(IFACE, "/var/ipfire/red/iface") or die "Could not open /var/ipfire/red/iface"; + + my $interface = <IFACE>; + close(IFACE); + chomp $interface; + + return $interface; +} +# +############################################################################### my $data_last = $ENV{'QUERY_STRING'}; my $rxb_last = 0; @@ -38,8 +78,8 @@ foreach $field (@fields) { } } -my $interface = &General::get_red_interface(); -my @data_now = &General::system_output("ip", "-s", "link", "show", "$interface"); +my $interface = &General__get_red_interface(); +my @data_now = &General__system_output("ip", "-s", "link", "show", "$interface"); my $lastline; my $rxb_now = 0; -- 2.25.1

3 4

Patchwork updates
by Adolf Belka 25 Oct '21

25 Oct '21

Hi everyone, I now have access to patchwork and I have been updating the status of my old patches to superseded or dropped or rejected as appropriate. I also see quite a few patches that are still marked as new but they have been merged or even released in a final Core Update. I just want to check that it is okay if I update those patches to either staged or accepted or if that type of status change should not be done by myself. Regards, Adolf.

2 1

[PATCH] backup definitions: housekeeping to remove orphaned definitions
by Adolf Belka 25 Oct '21

25 Oct '21

- check_mk_agent, client175 & lcr are addons that have been removed so the backup definitions are no longer required. - dma is not a package but a core program and has its config backup requirements built into the core backup include file so the addon backup definition is not used or needed. - No issues found in the build after these files were removed. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/backup/includes/check_mk_agent | 1 - config/backup/includes/client175 | 2 -- config/backup/includes/dma | 5 ----- config/backup/includes/lcr | 6 ------ 4 files changed, 14 deletions(-) delete mode 100644 config/backup/includes/check_mk_agent delete mode 100644 config/backup/includes/client175 delete mode 100644 config/backup/includes/dma delete mode 100644 config/backup/includes/lcr diff --git a/config/backup/includes/check_mk_agent b/config/backup/includes/check_mk_agent deleted file mode 100644 index ca710461b..000000000 --- a/config/backup/includes/check_mk_agent +++ /dev/null @@ -1 +0,0 @@ -/etc/check_mk/ diff --git a/config/backup/includes/client175 b/config/backup/includes/client175 deleted file mode 100644 index 6cde8e8ca..000000000 --- a/config/backup/includes/client175 +++ /dev/null @@ -1,2 +0,0 @@ -/src/client175/site.conf -/var/ipfire/mpfire/*.m3u diff --git a/config/backup/includes/dma b/config/backup/includes/dma deleted file mode 100644 index 7c7520551..000000000 --- a/config/backup/includes/dma +++ /dev/null @@ -1,5 +0,0 @@ -/var/ipfire/dma -/var/ipfire/dma/dma.conf -/var/ipfire/dma/auth.conf -/var/ipfire/dma/mail.conf -/var/spool/dma diff --git a/config/backup/includes/lcr b/config/backup/includes/lcr deleted file mode 100644 index 618f4c784..000000000 --- a/config/backup/includes/lcr +++ /dev/null @@ -1,6 +0,0 @@ -/var/ipfire/lcr/extensions -/var/ipfire/lcr/directory.list -/var/ipfire/lcr/interface.conf -/var/ipfire/lcr/options.conf -/var/ipfire/lcr/routing.conf -/var/log/lcr -- 2.33.1

3 2

How to enforce re-creation of configuration files generated by CGIs?
by Peter Müller 25 Oct '21

25 Oct '21

Hello development folks, while I do not think the changes related to Squid and Tor in Core Update 161 require it, I just wondered myself how to enforce recreation of the corresponding configuration files? Both of them are generated by CGIs ({proxy,tor}.cgi), and faking a POST request on the command line seemed to be the wrong way to me. :-) Am I missing something? Is there a better/ideal way for doing this? Thanks for enlightening me, and best regards, Peter Müller (lacking coffee)

2 1

IPFire community forum giving 503 error
by Adolf Belka 25 Oct '21

25 Oct '21

Hi All, Trying to access the IPFire community forum comes back with a 503 service unavailable message. IPFire People and Wiki are working fine as is the webmail. Regards, Adolf.

2 1

[PATCH] ddns: Add upstream patch to fix a typo for FreeDNSAfraid.org provider
by Stefan Schantl 23 Oct '21

23 Oct '21

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- lfs/ddns | 2 +- .../ddns-014-freednsafraid-fix-typo.patch | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 src/patches/ddns-014-freednsafraid-fix-typo.patch diff --git a/lfs/ddns b/lfs/ddns index b1d0f2dbb..873f927af 100644 --- a/lfs/ddns +++ b/lfs/ddns @@ -72,7 +72,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) # Apply upstream patches. - # No upstream patches at the moment. + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-014-freednsafraid-fix-typo.patch cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh cd $(DIR_APP) && ./configure \ diff --git a/src/patches/ddns-014-freednsafraid-fix-typo.patch b/src/patches/ddns-014-freednsafraid-fix-typo.patch new file mode 100644 index 000000000..4982d52f4 --- /dev/null +++ b/src/patches/ddns-014-freednsafraid-fix-typo.patch @@ -0,0 +1,21 @@ +commit 3a162595b9b44a4cbf08a3db14a4d2ebfeeb5583 +Author: Stefan Schantl <stefan.schantl(a)ipfire.org> +Date: Sat Oct 23 21:11:27 2021 +0200 + + FreeDNSAfraid.org: Fix typo in checking if the IP has been changed. + + Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> + +diff --git a/src/ddns/providers.py b/src/ddns/providers.py +index 4f27af9..5b2a82d 100644 +--- a/src/ddns/providers.py ++++ b/src/ddns/providers.py +@@ -1204,7 +1204,7 @@ class DDNSProviderFreeDNSAfraidOrg(DDNSProvider): + output = response.read().decode() + + # Handle success messages. +- if output.startswith("Updated") or output.startswith("No IP changed detected"): ++ if output.startswith("Updated") or output.startswith("No IP change detected"): + return + + # Handle error codes. -- 2.30.2

2 1

lynis-3.0.6.tar.gz file on source.ipfire.org differs from Lynis upstream
by Peter Müller 23 Oct '21

23 Oct '21

Hello Marcel, trying to update Lynis to 3.0.6 (from 3.0.3), I just noticed there already a lynis-3.0.6.tar.gz file on https://source.ipfire.org/ with a different MD5 checksum and file size than the .tar.gz provided by Lynis upstream (hosted on GitHub): > pmueller@people01:/pub/sources/source-2.x$ ls -lah lynis-3.0.6.tar.gz > -rw-r--r-- 1 mlorenz people 329K Aug 1 11:45 lynis-3.0.6.tar.gz > pmueller@people01:/pub/sources/source-2.x$ md5sum lynis-3.0.6.tar.gz > 23cc369984d564e4a8232473b1ace137 lynis-3.0.6.tar.gz Fetching the upstream's URL (https://github.com/CISOfy/lynis/archive/refs/tags/3.0.6.tar.gz) via three different Tor circuits, using exit nodes in three different countries, always return a file having these characteristics: > $ ls -lah lynis-3.0.6.tar.gz > -rw-r--r-- 1 pmu users 335K 4. Sep 10:56 lynis-3.0.6.tar.gz > $ md5sum lynis-3.0.6.tar.gz > c5429c532653a762a55a994d565372aa lynis-3.0.6.tar.gz Oddly enough, searching VirusTotal for 23cc369984d564e4a8232473b1ace137 gains a hit (https://www.virustotal.com/gui/file/3005346e90339c18a4c626169c6f1d9fb8643bb…), while a search for c5429c532653a762a55a994d565372aa returns nothing. Looking at the contents of both .tar.gz's, your version is missing these files: > ~/.github > ~/.gitignore > ~/plugins/plugin_pam_phase1 > ~/plugins/plugin_systemd_phase1 > ~/README.md > ~/.travis.yml Unfortunately, the maintainer of Lynis does not seem to provide a GPG signature or any other method to verify the integrity of a downloaded source code. Therefore: Where did you fetch the lynis-3.0.6.tar.gz file currently present on IPFire's source code server from? GitHub? Thanks, and best regards, Peter Müller

3 8

[PATCH] libffi: Update to version 3.4.2
by Adolf Belka 23 Oct '21

23 Oct '21

- Update from 3.3 to 3.4.2 - Update rootfile - No dependency issues due to so bump - Changelog 3.4.2 Jun-28-21 Add static trampoline support for Linux on x86_64 and ARM64. Add support for Alibaba's CSKY architecture. Add support for Kalray's KVX architecture. Add support for Intel Control-flow Enforcement Technology (CET). Add support for ARM Pointer Authentication (PA). Fix 32-bit PPC regression. Fix MIPS soft-float problem. Enable tmpdir override with the $LIBFFI_TMPDIR environment variable. Enable compatibility with MSVC runtime stack checking. Reject float and small integer argument in ffi_prep_cif_var(). Callers must promote these types themselves. 3.3 Nov-23-19 Add RISC-V support. New API in support of GO closures. Add IEEE754 binary128 long double support for 64-bit Power Default to Microsoft's 64-bit long double ABI with Visual C++. GNU compiler uses 80 bits (128 in memory) FFI_GNUW64 ABI. Add Windows on ARM64 (WOA) support. Add Windows 32-bit ARM support. Raw java (gcj) API deprecated. Add pre-built PDF documentation to source distribution. Many new test cases and bug fixes. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/common/libffi | 4 ++-- lfs/libffi | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/common/libffi b/config/rootfiles/common/libffi index e71caf1a2..7b5ed1248 100644 --- a/config/rootfiles/common/libffi +++ b/config/rootfiles/common/libffi @@ -3,8 +3,8 @@ #usr/lib/libffi.a #usr/lib/libffi.la #usr/lib/libffi.so -usr/lib/libffi.so.7 -usr/lib/libffi.so.7.1.0 +usr/lib/libffi.so.8 +usr/lib/libffi.so.8.1.0 #usr/lib/pkgconfig/libffi.pc #usr/share/info/libffi.info #usr/share/man/man3/ffi.3 diff --git a/lfs/libffi b/lfs/libffi index 1678505b6..8574ca067 100644 --- a/lfs/libffi +++ b/lfs/libffi @@ -24,7 +24,7 @@ include Config -VER = 3.3 +VER = 3.4.2 THISAPP = libffi-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 6313289e32f1d38a9df4770b014a2ca7 +$(DL_FILE)_MD5 = 294b921e6cf9ab0fbaea4b639f8fdbe8 install : $(TARGET) -- 2.33.1

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development October 2021