Development March 2023

development@lists.ipfire.org

11 participants
72 discussions

[PATCH] util-linux: Do no create /run/uuidd
by Stefan Schantl 17 Mar '23

17 Mar '23

The folder will be created by systemd and violates the FSH. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- util-linux/util-linux.nm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/util-linux/util-linux.nm b/util-linux/util-linux.nm index 684e57b0a..f5290c1c8 100644 --- a/util-linux/util-linux.nm +++ b/util-linux/util-linux.nm @@ -6,7 +6,7 @@ name = util-linux ver_maj = 2.38 version = %{ver_maj}.1 -release = 1 +release = 2 maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org> groups = System/Base @@ -70,7 +70,6 @@ build %{BUILDROOT}/var/lib/libuuid \ %{BUILDROOT}/var/lib/hwclock \ %{BUILDROOT}/usr/share/man/man8 \ - %{BUILDROOT}/run/uuidd \ %{BUILDROOT}/var/log touch %{BUILDROOT}/var/log/lastlog -- 2.30.2

1 0

[PATCH] systemd: Do not create /run/log/journal
by Stefan Schantl 17 Mar '23

17 Mar '23

This will be done by the corresponding tmpfiles configuration and violetes the FHS. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- systemd/systemd.nm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/systemd/systemd.nm b/systemd/systemd.nm index 9bcefa3a7..30d1e829f 100644 --- a/systemd/systemd.nm +++ b/systemd/systemd.nm @@ -5,7 +5,7 @@ name = systemd version = 252 -release = 2.1 +release = 3 maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org> groups = System/Base @@ -193,10 +193,6 @@ build # Don't let udev set up any networking rm -vf %{BUILDROOT}/usr/lib/udev/rules.d/80-net-setup-link.rules - # Create journald related folders. - mkdir -pv %{BUILDROOT}/run/log/journal - chown root:systemd-journal %{BUILDROOT}/run/log/journal - mkdir -pv %{BUILDROOT}/var/log/journal chown root:systemd-journal %{BUILDROOT}/var/log/journal -- 2.30.2

1 0

[PATCH] setup: Do not create /run/motd.d folder
by Stefan Schantl 17 Mar '23

17 Mar '23

This folder will be created from systemd by the corresponding tmpfiles script and fails our FHS checks. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- setup/setup.nm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup/setup.nm b/setup/setup.nm index 3b41b2d3f..cee66fab4 100644 --- a/setup/setup.nm +++ b/setup/setup.nm @@ -5,7 +5,7 @@ name = setup version = 3.0 -release = 17 +release = 18 arch = noarch groups = Base Build System/Base @@ -60,7 +60,6 @@ build # Create MOTD (message of the day) folder layout. mkdir -p %{BUILDROOT}/etc/motd.d - mkdir -p %{BUILDROOT}/run/motd.d mkdir -p %{BUILDROOT}/usr/lib/motd.d touch %{BUILDROOT}/usr/lib/motd -- 2.30.2

1 0

429 Too Many Request error from IPFire Community
by Adolf Belka 17 Mar '23

17 Mar '23

Hi Everyone, Just in case you aren't aware, the IPFire community is giving me a 429 Too Many Requests message most of the time. The IPFire Blog, Wiki, Bugzilla, Dev mailing list are all working fine. All menu items on the IPFire Blog are working except for Community. Community was working fine for me before I went for a walk with my dog. When I came back and I opened the IPFire Community on my android phone it said there was a new message in the forum so I clicked on it and that is when it came back with the 429 Too Many Requests message. Looking up the message the info on it said that I was overloading the IPFire Community server and so was being blocked. I don't believe I am sending too many, or if I am then I don't know what changed in the last 1.5 hours. Any suggestions on what my problem might be and how to resolve/stop it? Regards, Adolf. -- Sent from my laptop

2 2

Re: IPFire 2.27 - Core Update 174 is available for testing
by Adolf Belka 16 Mar '23

16 Mar '23

Hi Peter, When I did my change to having the common css variables in header.pl I had missed that colors.txt is not referenced in header.pl so in the dhcp.cgi and updatexlrator.cgi pages the tables show up without the alternate colour bands. I did test my original patches abut obviously my brain ignored my eyes and did not see they were missing. I found the problem when I upgraded to CU174 Testing. I have submitted a patch to fix my error. Regards, Adolf. On 16/03/2023 07:30, IPFire Project wrote: > IPFire Logo > > there is a new post from Michael Tremer on the IPFire Blog: > > *IPFire 2.27 - Core Update 174 is available for testing* > > The next Core Update is ready for testing: IPFire 2.27 - Core Update 174. It is a traditional spring clean release which updates major parts of the core system and comes with a large number of bug fixes throughout. > > Click Here To Read More <https://blog.ipfire.org/post/ipfire-2-27-core-update-174-is-available-for-t…> > > The IPFire Project > Don't like these emails? Unsubscribe <https://people.ipfire.org/unsubscribe>. >

1 0

[PATCH] kernel: Use our LDFLAGS for gcc plugins
by Stefan Schantl 15 Mar '23

15 Mar '23

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- kernel/kernel.nm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/kernel/kernel.nm b/kernel/kernel.nm index 62c23132b..9b340f8b3 100644 --- a/kernel/kernel.nm +++ b/kernel/kernel.nm @@ -5,7 +5,7 @@ name = kernel version = 6.2 -release = 1.2 +release = 2 thisapp = linux-%{version} maintainer = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> @@ -75,7 +75,9 @@ build sed -e "/^COLORIZE_PLUGIN_CFLAGS/d" \ -i Makefile - sed -e "s/\$(HOST_LFS_CFLAGS)/& -fPIC/g" -i Makefile + # Use our linker flags while building the compiler plugins. + sed -i '/^plugin_ldflags\s\+=/ s/$/ %{LDFLAGS}/' \ + scripts/gcc-plugins/Makefile # Get rid of unwanted files resulting from patch fuzz. find . $ -name "*.orig" -o -name "*~" $ -exec rm -f {} \; >/dev/null -- 2.30.2

1 0

[PATCH] ddns: Update to 015
by Stefan Schantl 15 Mar '23

15 Mar '23

This version contains the recent patched changes and brings support for a new ddns provider (godaddy). Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- lfs/ddns | 8 ++--- .../ddns-014-freednsafraid-fix-typo.patch | 21 ----------- ...eption-when-host-is-not-dual-stacked.patch | 35 ------------------- 3 files changed, 2 insertions(+), 62 deletions(-) delete mode 100644 src/patches/ddns-014-freednsafraid-fix-typo.patch delete mode 100644 src/patches/ddns-system-Catch-exception-when-host-is-not-dual-stacked.patch diff --git a/lfs/ddns b/lfs/ddns index 274c12cb9..eb67b107d 100644 --- a/lfs/ddns +++ b/lfs/ddns @@ -24,7 +24,7 @@ include Config -VER = 014 +VER = 015 THISAPP = ddns-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 007bf9f062bc0dc5c8c7ea946dcfabd03faff5f5c1791e9141f01a7d80bbc899b3565bf5e69f44f66ebe39b3ab02b95e3f6e25daa145272cef6ce4bd7f2bd82c +$(DL_FILE)_BLAKE2 = 94f4b7a2ebe85fb1eab98e814cdcf13e9accdab02527eb54460eb7d31533d4752649734d426ef630ba0470181b21ce9ae4ffdbc869a1af9e2dddc336e6bfb0c2 install : $(TARGET) @@ -71,10 +71,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - # Apply upstream patches. - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-014-freednsafraid-fix-typo.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-system-Catch-exception-when-host-is-not-dual-stacked.patch - cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh cd $(DIR_APP) && ./configure \ --prefix=/usr \ diff --git a/src/patches/ddns-014-freednsafraid-fix-typo.patch b/src/patches/ddns-014-freednsafraid-fix-typo.patch deleted file mode 100644 index 4982d52f4..000000000 --- a/src/patches/ddns-014-freednsafraid-fix-typo.patch +++ /dev/null @@ -1,21 +0,0 @@ -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. diff --git a/src/patches/ddns-system-Catch-exception-when-host-is-not-dual-stacked.patch b/src/patches/ddns-system-Catch-exception-when-host-is-not-dual-stacked.patch deleted file mode 100644 index f75471d97..000000000 --- a/src/patches/ddns-system-Catch-exception-when-host-is-not-dual-stacked.patch +++ /dev/null @@ -1,35 +0,0 @@ -From de57b2caf44bf10de72e42a20abf690eca50d512 Mon Sep 17 00:00:00 2001 -From: Michael Tremer <michael.tremer(a)ipfire.org> -Date: Mon, 4 Apr 2022 10:33:46 +0100 -Subject: [PATCH] system: Catch exception when host is not dual-stacked - -This problem seems to have been introduced with an upgrade to Python -3.10. - -Reported-by: Adrian Zaugg <ipfire.org(a)mailgurgler.com> -Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ---- - src/ddns/system.py | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/ddns/system.py b/src/ddns/system.py -index 73a27a5..48c9a8f 100644 ---- a/src/ddns/system.py -+++ b/src/ddns/system.py -@@ -226,8 +226,12 @@ class DDNSSystem(object): - if e.reason.errno == -2: - raise DDNSResolveError - -+ # Cannot assign requested address -+ elif e.reason.errno == 99: -+ raise DDNSNetworkUnreachableError -+ - # Network Unreachable (e.g. no IPv6 access) -- if e.reason.errno == 101: -+ elif e.reason.errno == 101: - raise DDNSNetworkUnreachableError - - # Connection Refused --- -2.30.2 - -- 2.30.2

1 0

[PATCH] graphs.pl: Make canvas fixed size and limit cpufreq color index
by Leo-Andres Hofmann 14 Mar '23

14 Mar '23

This fixes an issue where systems with many CPU cores run out of usable graph colors and canvas area. It also unifies the canvas size for all graphs. Discussion: https://community.ipfire.org/t/cpu-freq-graph-not-working-with-i5-1235u/9396 Fixes: #12890 Signed-off-by: Leo-Andres Hofmann <hofmann(a)leo-andres.de> --- config/cfgroot/graphs.pl | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index 3368e5aad..cefe0b90d 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -30,8 +30,11 @@ require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl"; -# Graph image size in pixel -our %image_size = ('width' => 910, 'height' => 300); +# Approximate size of the final graph image including canvas and labeling (in pixels, mainly used for placeholders) +our %image_size = ('width' => 900, 'height' => 300); + +# Size of the actual data area within the image, without labeling (in pixels) +our %canvas_size = ('width' => 800, 'height' => 190); # List of all available time ranges our @time_ranges = ("hour", "day", "week", "month", "year"); @@ -48,15 +51,12 @@ my @GRAPH_ARGS = ( # For a more 'organic' look "--slope-mode", - # HxW define the size of the output image - "--full-size-mode", - # Watermark "-W www.ipfire.org", - # Default size - "-w $image_size{'width'}", - "-h $image_size{'height'}", + # Canvas width/height + "-w $canvas_size{'width'}", + "-h $canvas_size{'height'}", # Use alternative grid "--alt-y-grid", @@ -1090,18 +1090,19 @@ sub updatecpufreqgraph { "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, "--color=BACK".$color{"color21"}, - "COMMENT:".sprintf("%-10s",$Lang::tr{'caption'}), + "COMMENT:".sprintf("%-15s",$Lang::tr{'caption'}), "COMMENT:".sprintf("%15s",$Lang::tr{'maximal'}), "COMMENT:".sprintf("%15s",$Lang::tr{'average'}), "COMMENT:".sprintf("%15s",$Lang::tr{'minimal'}), "COMMENT:".sprintf("%15s",$Lang::tr{'current'})."\\j" ); + my $j = 11; for(my $i = 0; $i < $cpucount; $i++) { - my $j=$i+1; + $j++; $j = 1 if $j > 20; push(@command,"DEF:cpu".$i."_=".$mainsettings{'RRDLOG'}."/collectd/localhost/cpufreq/cpufreq-".$i.".rrd:value:AVERAGE" ,"CDEF:cpu".$i."=cpu".$i."_,1000000,/" - ,"LINE1:cpu".$i.$color{"color1$j"}."A0:cpu ".$i." " + ,"LINE1:cpu".$i.$color{"color$j"}."A0:cpu ".$i." " ,"GPRINT:cpu".$i.":MAX:%3.0lf Mhz" ,"GPRINT:cpu".$i.":AVERAGE:%3.0lf Mhz" ,"GPRINT:cpu".$i.":MIN:%3.0lf Mhz" -- 2.37.1.windows.1

2 2

[PATCH] graphviz: Proper harden some binaries
by Stefan Schantl 13 Mar '23

13 Mar '23

Use some additional compiler flags, to proper harden them. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- graphviz/graphviz.nm | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/graphviz/graphviz.nm b/graphviz/graphviz.nm index 625c554b2..c5147c5f5 100644 --- a/graphviz/graphviz.nm +++ b/graphviz/graphviz.nm @@ -5,7 +5,7 @@ name = graphviz version = 7.0.4 -release = 1 +release = 2 groups = Development/Tools url = https://gitlab.com/graphviz/graphviz @@ -42,6 +42,32 @@ build ./autogen.sh end + configure_options += \ + --enable-debug + + configure_cmds + # Add some additional C compiler flags to proper harden liblab_gamut. + sed -i '/^CFLAGS =/ s/$/ -fno-builtin-exit -D__noreturn__=/' \ + lib/edgepaint/Makefile + + # Add some additional C and C++ compiler flags to proper harden + # the "dot" binaries. + sed -i '/^CFLAGS =/ s/$/ -fno-builtin-exit -D__noreturn__=/' \ + cmd/dot/Makefile + sed -i '/^CXXFLAGS =/ s/$/ -fno-builtin-exit -D__noreturn__=/' \ + cmd/dot/Makefile + + # Add some additional C compiler flags to proper harden the + # "gvpr" binaries. + sed -i '/^CFLAGS =/ s/$/ -fno-builtin-exit -D__noreturn__=/' \ + cmd/gvpr/Makefile + + # Add some additional C compiler flags to proper harden the + # tools. + sed -i '/^CFLAGS =/ s/$/ -fno-builtin-exit -D__noreturn__=/' \ + cmd/tools/Makefile + end + test make check end -- 2.30.2

1 0

Testing 'rules.pl'
by Matthias Fischer 13 Mar '23

13 Mar '23

Hi, Being curious, I tested https://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff;h=1b70ead36dfaf654167… on Core 173 today => "firewall: Silence warnings if blocklist logging is not set". Bug-Reference: #12979. But when I try to restart the firewall, I get: ... root@ipfire: /usr/lib/firewall # /etc/init.d/firewall restart Setting up firewall syntax error at /usr/lib/firewall/rules.pl line 764, near ") &&" Global symbol "$blocklist" requires explicit package name (did you forget to declare "my $blocklist"?) at /usr/lib/firewall/rules.pl line 770. Global symbol "$blocklist" requires explicit package name (did you forget to declare "my $blocklist"?) at /usr/lib/firewall/rules.pl line 773. Global symbol "$blocklist" requires explicit package name (did you forget to declare "my $blocklist"?) at /usr/lib/firewall/rules.pl line 773. Global symbol "$blocklist" requires explicit package name (did you forget to declare "my $blocklist"?) at /usr/lib/firewall/rules.pl line 774. Global symbol "$blocklist" requires explicit package name (did you forget to declare "my $blocklist"?) at /usr/lib/firewall/rules.pl line 774. syntax error at /usr/lib/firewall/rules.pl line 777, near "} else" Global symbol "$blocklist" requires explicit package name (did you forget to declare "my $blocklist"?) at /usr/lib/firewall/rules.pl line 784. syntax error at /usr/lib/firewall/rules.pl line 785, near "}" Can't redeclare "my" in "my" at /usr/lib/firewall/rules.pl line 792, near "my" /usr/lib/firewall/rules.pl has too many errors. ... The old version of 'rules.pl' is working without problems. Am I doing something wrong or is there anything still missing!? Best, Matthias

2 2

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development March 2023