Development June 2022

development@lists.ipfire.org

15 participants
66 discussions

[PATCH] squid: Update to 5.6
by Matthias Fischer 07 Jun '22

07 Jun '22

For details see: https://github.com/squid-cache/squid/commits/v5 Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/squid | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/squid b/lfs/squid index 7b77e568f..2a5317a43 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@ include Config -VER = 5.5 +VER = 5.6 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -46,7 +46,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = aef52ba0b47098f823d3f2bbe55e015c12b853bcc0a414bc94a4103009a05fee2c33263b8ade9b31cd22068e964d7f37fc0a497877d26ff836bc2193a6d0e8fc +$(DL_FILE)_BLAKE2 = 172dbbc255dfbe6246f7e9e333469a4d7a1dda722bb1d897886e1fc075106f223dff739510ade836df4fb147b45e3626ce1e1916eaa9d708d55265347d74e183 install : $(TARGET) -- 2.25.1

2 1

[PATCH 1/7] pakfire.cgi: Separate command processing and HTML generation
by Leo-Andres Hofmann 04 Jun '22

04 Jun '22

Move most of the command execution away from the HTML output. This makes it easier to modify or extend individual commands. Also load Pakfire settings earlier to ensure that they are available during command execution. Signed-off-by: Leo-Andres Hofmann <hofmann(a)leo-andres.de> --- html/cgi-bin/pakfire.cgi | 61 +++++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi index 65c67fb90..b908ec6a0 100644 --- a/html/cgi-bin/pakfire.cgi +++ b/html/cgi-bin/pakfire.cgi @@ -39,11 +39,12 @@ my %mainsettings = (); # Load general settings &General::readhash("${General::swroot}/main/settings", \%mainsettings); +&General::readhash("${General::swroot}/pakfire/settings", \%pakfiresettings); &General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", \%color); # Get CGI request data $cgiparams{'ACTION'} = ''; -$cgiparams{'VALID'} = ''; +$cgiparams{'FORCE'} = ''; $cgiparams{'INSPAKS'} = ''; $cgiparams{'DELPAKS'} = ''; @@ -94,6 +95,35 @@ if($cgiparams{'ACTION'} eq 'json-getstatus') { exit; } +### Process Pakfire install/update commands ### +if(($cgiparams{'ACTION'} ne '') && (! &_is_pakfire_busy())) { + if(($cgiparams{'ACTION'} eq 'install') && ($cgiparams{'FORCE'} eq 'on')) { + my @pkgs = split(/\|/, $cgiparams{'INSPAKS'}); + &General::system_background("/usr/local/bin/pakfire", "install", "--non-interactive", "--no-colors", @pkgs); + } elsif(($cgiparams{'ACTION'} eq 'remove') && ($cgiparams{'FORCE'} eq 'on')) { + my @pkgs = split(/\|/, $cgiparams{'DELPAKS'}); + &General::system_background("/usr/local/bin/pakfire", "remove", "--non-interactive", "--no-colors", @pkgs); + } elsif($cgiparams{'ACTION'} eq 'update') { + &General::system_background("/usr/local/bin/pakfire", "update", "--force", "--no-colors"); + } elsif($cgiparams{'ACTION'} eq 'upgrade') { + &General::system_background("/usr/local/bin/pakfire", "upgrade", "-y", "--no-colors"); + } elsif($cgiparams{'ACTION'} eq $Lang::tr{'save'}) { + $pakfiresettings{"TREE"} = $cgiparams{"TREE"}; + + # Check for valid input + if ($pakfiresettings{"TREE"} !~ m/^(stable|testing|unstable)$/) { + $errormessage .= $Lang::tr{'pakfire invalid tree'}; + } + + unless ($errormessage) { + &General::writehash("${General::swroot}/pakfire/settings", \%pakfiresettings); + + # Update lists + &General::system_background("/usr/local/bin/pakfire", "update", "--force", "--no-colors"); + } + } +} + ### Start pakfire page ### &Header::showhttpheaders(); @@ -185,9 +215,6 @@ END # Process Pakfire commands if (($cgiparams{'ACTION'} eq 'install') && (! &_is_pakfire_busy())) { my @pkgs = split(/\|/, $cgiparams{'INSPAKS'}); - if ("$cgiparams{'FORCE'}" eq "on") { - &General::system_background("/usr/local/bin/pakfire", "install", "--non-interactive", "--no-colors", @pkgs); - } else { &Header::openbox("100%", "center", $Lang::tr{'request'}); my @output = &General::system_output("/usr/local/bin/pakfire", "resolvedeps", "--no-colors", @pkgs); print <<END; @@ -222,12 +249,9 @@ END &Header::closebigbox(); &Header::closepage(); exit; - } + } elsif (($cgiparams{'ACTION'} eq 'remove') && (! &_is_pakfire_busy())) { my @pkgs = split(/\|/, $cgiparams{'DELPAKS'}); - if ("$cgiparams{'FORCE'}" eq "on") { - &General::system_background("/usr/local/bin/pakfire", "remove", "--non-interactive", "--no-colors", @pkgs); - } else { &Header::openbox("100%", "center", $Lang::tr{'request'}); my @output = &General::system_output("/usr/local/bin/pakfire", "resolvedeps", "--no-colors", @pkgs); print <<END; @@ -262,30 +286,9 @@ END &Header::closebigbox(); &Header::closepage(); exit; - } - -} elsif (($cgiparams{'ACTION'} eq 'update') && (! &_is_pakfire_busy())) { - &General::system_background("/usr/local/bin/pakfire", "update", "--force", "--no-colors"); -} elsif (($cgiparams{'ACTION'} eq 'upgrade') && (! &_is_pakfire_busy())) { - &General::system_background("/usr/local/bin/pakfire", "upgrade", "-y", "--no-colors"); -} elsif ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}") { - $pakfiresettings{"TREE"} = $cgiparams{"TREE"}; - - # Check for valid input - if ($pakfiresettings{"TREE"} !~ m/^(stable|testing|unstable)$/) { - $errormessage .= $Lang::tr{'pakfire invalid tree'}; - } - - unless ($errormessage) { - &General::writehash("${General::swroot}/pakfire/settings", \%pakfiresettings); - # Update lists - &General::system_background("/usr/local/bin/pakfire", "update", "--force", "--no-colors"); - } } -&General::readhash("${General::swroot}/pakfire/settings", \%pakfiresettings); - my %selected=(); my %checked=(); -- 2.27.0.windows.1

5 17

Hostile Networks
by Rob Brewer 04 Jun '22

04 Jun '22

Hi All, Is it possible to list the 'Hostile Networks' from the core 167 database? Running 'location list-countries' fails to find 'XD' and attempting to list the networks with 'location list-networks-by-cc XD' gives the error "Could not create country" ? Rob

2 4

Feedback on problems with Core Update 168 Testing
by Adolf Belka 04 Jun '22

04 Jun '22

Hi All, I have tried to update my Core Update 167 vm machine three times now (using a clone) and have had several problems so I thought I would outline what has happened for further thoughts. Normally my updates go without any real problems. This is the first time where this is not the case. First try:- After running the update, which went quite quickly, the bottom of the screen had Core Update 167 Development Build: master/c22d834c I couldn't remember if this is what is expected or not for Testing releases. Rebooted the vm and on booting a large number of error messages scrolled across the console screen. My Virtualbox terminal for IPFire has no scroll capability so I can only write on things I saw as they flew past or what was on the screen when it stopped. Lots of ipset restore error but went by too fast to get more detail. Tried to access via the WUI and no access. Tried via SSH and no access. Checked the red0 directory and there were no files present. Tried restarting red0 and got the following message starting DUID 00:04:70:........ red0: interface not found So I ran ip address show and it came up with only the lo interface. No red0, green0, blue0 or orange0. Looked in bootlog and this was filled with around 4000 lines all the same Loading of module with unavailable key is rejected Second try:- This time running the update took over 10 mins. Noticed on the pakfire screen that it first ran a Core Update 167 upgrade then it ran the Core Update 168. My IPFire vm was definitely on Core Update 167. /opt/pakfire/db/core/mine contained 167 beforehand. Before doing the reboot I accessed via ssh and saw that in the /var/log/pakfire/ directory the update-core-upgrade-167 file has been updated as well as there being a 168. Both files had the same last modified date/time. Rebooted. This time everything came back up okay but the bottom of the screen now just said Core Update 167 and there was no update-core-upgrade-168 file in the pakfire directory and the 167 version was back to its date of Apr 28 Repository was set back to Stable. Changed again to Testing and it said again that there was an update from 167 to 168. Before running the pakfire directory had the following -rw-r--r-- 1 root root 1.8K Mar 31 23:26 update-core-upgrade-166.log -rw-r--r-- 1 root root 323K Apr 28 09:47 update-core-upgrade-167.log After running it had -rw-r--r-- 1 root root 1.8K Mar 31 23:26 update-core-upgrade-166.log -rw-r--r-- 1 root root 604K May 11 13:24 update-core-upgrade-167.log -rw-r--r-- 1 root root 175 May 11 13:24 update-core-upgrade-168.log back to Core Update 167 Development Build: master/c22d834c at bottom of screen. Rebooted. All interfaces present. Pakfire under System Status: says Core-Update-Level: 168 and the bottom of the screen showed Core Update 167 Development Build: master/c22d834c /opt/pakfire/db/core/mine has 168 in it I checked the WIO wio.pl file that had a bug fix and it was as expected for CU168. Third try:- -rw-r--r-- 1 root root 323K Apr 28 09:47 update-core-upgrade-167.log Selected Testing and ran update from 167 to 168 which occurred very quickly. -rw-r--r-- 1 root root 604K May 11 14:00 update-core-upgrade-167.log -rw-r--r-- 1 root root 63K May 11 14:01 update-core-upgrade-168.log Here is the log file info for pakfire from messages.1.gz and messages which shows it downloading and upgrading CU167 first then doing CU168 as far as I can tell. May 11 13:59:30 ipfire pakfire: PAKFIRE INFO: IPFire Pakfire 2.27.1-x86_64 started! May 11 13:59:30 ipfire pakfire: CORE INFO: core-list.db is 27 seconds old. - DEBUG: noforce May 11 13:59:30 ipfire pakfire: CORE UPGR: Upgrading from release 166 to 168 May 11 13:59:30 ipfire pakfire: DOWNLOAD STARTED: paks/core-upgrade-2.27-167.ipfire May 11 13:59:30 ipfire pakfire: MIRROR INFO: 2 servers found in list May 11 13:59:30 ipfire pakfire: DOWNLOAD INFO: Host: ipfire.earl-net.com (HTTPS) - File: pakfire2/2.27.1-x86_64/paks/core-upgrade-2.27-167.ipfire May 11 13:59:30 ipfire pakfire: DOWNLOAD INFO: pakfire2/2.27.1-x86_64/paks/core-upgrade-2.27-167.ipfire has size of 71914825 bytes May 11 13:59:32 ipfire pakfire: DOWNLOAD INFO: HTTP-Status-Code: 200 - 200 OK May 11 13:59:32 ipfire pakfire: DOWNLOAD INFO: File received. Start checking signature... May 11 13:59:32 ipfire pakfire: DOWNLOAD INFO: Signature of core-upgrade-2.27-167.ipfire is fine. May 11 13:59:32 ipfire pakfire: DOWNLOAD FINISHED: pakfire2/2.27.1-x86_64/paks/core-upgrade-2.27-167.ipfire May 11 13:59:32 ipfire pakfire: DOWNLOAD STARTED: meta/meta-core-upgrade-168 May 11 13:59:32 ipfire pakfire: MIRROR INFO: 2 servers found in list May 11 13:59:32 ipfire pakfire: DOWNLOAD INFO: Host: mirror1.ipfire.org (HTTPS) - File: pakfire2/2.27.1-x86_64/meta/meta-core-upgrade-168 May 11 13:59:32 ipfire pakfire: DOWNLOAD INFO: pakfire2/2.27.1-x86_64/meta/meta-core-upgrade-168 has size of 1804 bytes May 11 13:59:33 ipfire pakfire: DOWNLOAD INFO: HTTP-Status-Code: 200 - 200 OK May 11 13:59:33 ipfire pakfire: DOWNLOAD INFO: File received. Start checking signature... May 11 13:59:33 ipfire pakfire: DOWNLOAD INFO: Signature of meta-core-upgrade-168 is fine. May 11 13:59:33 ipfire pakfire: DOWNLOAD FINISHED: pakfire2/2.27.1-x86_64/meta/meta-core-upgrade-168 May 11 13:59:33 ipfire pakfire: DOWNLOAD STARTED: paks/core-upgrade-2.27-168.ipfire May 11 13:59:33 ipfire pakfire: MIRROR INFO: 2 servers found in list May 11 13:59:33 ipfire pakfire: DOWNLOAD INFO: Host: ipfire.earl-net.com (HTTPS) - File: pakfire2/2.27.1-x86_64/paks/core-upgrade-2.27-168.ipfire May 11 13:59:33 ipfire pakfire: DOWNLOAD INFO: pakfire2/2.27.1-x86_64/paks/core-upgrade-2.27-168.ipfire has size of 34355484 bytes May 11 13:59:34 ipfire pakfire: DOWNLOAD INFO: HTTP-Status-Code: 200 - 200 OK May 11 13:59:34 ipfire pakfire: DOWNLOAD INFO: File received. Start checking signature... May 11 13:59:34 ipfire pakfire: DOWNLOAD INFO: Signature of core-upgrade-2.27-168.ipfire is fine. May 11 13:59:34 ipfire pakfire: DOWNLOAD FINISHED: pakfire2/2.27.1-x86_64/paks/core-upgrade-2.27-168.ipfire May 11 13:59:34 ipfire pakfire: PAKFIRE UPGR: core-upgrade-167: Decrypting... May 11 13:59:34 ipfire pakfire: CLEANUP: tmp May 11 13:59:34 ipfire pakfire: DECRYPT STARTED: core-upgrade-167 May 11 13:59:35 ipfire pakfire: DECRYPT FINISHED: core-upgrade-167 - Status: 0 May 11 13:59:35 ipfire pakfire: PAKFIRE UPGR: core-upgrade-167: Upgrading files and running post-upgrading scripts... May 11 14:00:31 ipfire pakfire: CLEANUP: tmp May 11 14:00:31 ipfire pakfire: PAKFIRE UPGR: core-upgrade-167: Finished. May 11 14:00:31 ipfire pakfire: PAKFIRE UPGR: core-upgrade-168: Decrypting... May 11 14:00:31 ipfire pakfire: CLEANUP: tmp May 11 14:00:31 ipfire pakfire: DECRYPT STARTED: core-upgrade-168 May 11 14:00:32 ipfire pakfire: DECRYPT FINISHED: core-upgrade-168 - Status: 0 May 11 14:00:32 ipfire pakfire: PAKFIRE UPGR: core-upgrade-168: Upgrading files and running post-upgrading scripts... May 11 14:01:10 ipfire pakfire: CLEANUP: tmp May 11 14:01:10 ipfire pakfire: PAKFIRE UPGR: core-upgrade-168: Finished. May 11 14:01:10 ipfire pakfire: CORE INFO: core-list.db is 127 seconds old. - DEBUG: noforce May 11 14:01:10 ipfire pakfire: PAKFIRE RESV: wio: Resolving dependencies... May 11 14:01:10 ipfire pakfire: PAKFIRE UPGR: We are going to install all packages listed above. May 11 14:01:10 ipfire pakfire: DOWNLOAD STARTED: paks/wio-1.3.2-15.ipfire May 11 14:01:10 ipfire pakfire: MIRROR INFO: 2 servers found in list May 11 14:01:10 ipfire pakfire: DOWNLOAD INFO: Host: mirror1.ipfire.org (HTTPS) - File: pakfire2/2.27.1-x86_64/paks/wio-1.3.2-15.ipfire May 11 14:01:10 ipfire pakfire: DOWNLOAD INFO: pakfire2/2.27.1-x86_64/paks/wio-1.3.2-15.ipfire has size of 47216 bytes May 11 14:01:10 ipfire pakfire: DOWNLOAD INFO: HTTP-Status-Code: 200 - 200 OK May 11 14:01:10 ipfire pakfire: DOWNLOAD INFO: File received. Start checking signature... May 11 14:01:10 ipfire pakfire: DOWNLOAD INFO: Signature of wio-1.3.2-15.ipfire is fine. May 11 14:01:10 ipfire pakfire: DOWNLOAD FINISHED: pakfire2/2.27.1-x86_64/paks/wio-1.3.2-15.ipfire May 11 14:01:10 ipfire pakfire: PAKFIRE UPGR: wio: Decrypting... May 11 14:01:10 ipfire pakfire: CLEANUP: tmp May 11 14:01:10 ipfire pakfire: DECRYPT STARTED: wio May 11 14:01:10 ipfire pakfire: DECRYPT FINISHED: wio - Status: 0 May 11 14:01:10 ipfire pakfire: PAKFIRE UPGR: wio: Upgrading files and running post-upgrading scripts... May 11 14:01:11 ipfire pakfire: CLEANUP: tmp May 11 14:01:11 ipfire pakfire: PAKFIRE UPGR: wio: Finished. May 11 14:01:11 ipfire pakfire: PAKFIRE INFO: Pakfire has finished. Closing. Rebooted Lots of ipset restore error but went by too fast to get more detail. Several repeats of the following two lines on the console screen:- iptables v1.8.7 (legacy): can't initialize iptables table `filter' : Table does not exist (do you need to insmod?) Perhaps iptables or your kernel needs to be upgraded. Only lo interface present. All other interfaces red0, green0, blue0, orange0 not present. I have given up at this point. I have kept the clones of all three attempts so if you need any additional info from logs or files just let me know. If this is something obviously wrong that I am doing, please let me know. If not then I will probably raise a bug on this. Regards, Adolf.

6 36

[PATCH] tmux: Update to 3.3
by Matthias Fischer 04 Jun '22

04 Jun '22

For details see: https://raw.githubusercontent.com/tmux/tmux/3.3/CHANGES Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/tmux | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lfs/tmux b/lfs/tmux index e10ec5a5a..3e0b22fef 100644 --- a/lfs/tmux +++ b/lfs/tmux @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2022 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 # @@ -26,7 +26,7 @@ include Config SUMMARY = Terminal multiplexer -VER = 3.2a +VER = 3.3 THISAPP = tmux-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tmux -PAK_VER = 9 +PAK_VER = 10 DEPS = @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 94527d4d1016caddab170b5bbfd181514768474898314241fb65a53a1f5ae94863bacedf90a7543690c115d15295960dfab4d5ba2ce31cd105585a73fb9b82d1 +$(DL_FILE)_BLAKE2 = 7e5b66d6d294c580d86f4f8729f867277e00f401dfa2a4b4c5dd5bd08c1e9884122340cbebfb37f56c67c65e940667f5b79b638f20f05282c434f7b3641ad003 install : $(TARGET) -- 2.25.1

2 1

[PATCH] unbound: Update to 1.16.0
by Matthias Fischer 04 Jun '22

04 Jun '22

For details see: https://nlnetlabs.nl/projects/unbound/download/#unbound-1-16-0 Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/common/unbound | 2 +- lfs/unbound | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/common/unbound b/config/rootfiles/common/unbound index abf2c158c..cb9145516 100644 --- a/config/rootfiles/common/unbound +++ b/config/rootfiles/common/unbound @@ -11,7 +11,7 @@ etc/unbound/unbound.conf #usr/lib/libunbound.la #usr/lib/libunbound.so usr/lib/libunbound.so.8 -usr/lib/libunbound.so.8.1.14 +usr/lib/libunbound.so.8.1.16 #usr/lib/pkgconfig/libunbound.pc usr/sbin/unbound usr/sbin/unbound-anchor diff --git a/lfs/unbound b/lfs/unbound index adde6581e..938d3b46e 100644 --- a/lfs/unbound +++ b/lfs/unbound @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2022 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 # @@ -24,7 +24,7 @@ include Config -VER = 1.14.0 +VER = 1.16.0 THISAPP = unbound-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = ceccfbcbc16370153005f32d19be44bd41a4ac935cb7b9a90128d604c9874b06cc7de8b92dc34585d7957f0ad90ce2f441c2ed092c9307bcf4335f8d99eb8bd3 +$(DL_FILE)_BLAKE2 = 62d002e66a24d60a973c620855d9d33e2833f78bf45d9176081646683fe6f371564a40fb637e4b276c556e3b46eb57ff49ee6a7300e9a9e24cb09f4b8dd31695 install : $(TARGET) -- 2.25.1

2 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development June 2022