]> git.ipfire.org Git - people/stevee/ipfire-2.x.git/log
people/stevee/ipfire-2.x.git
2 years agoipblocklist: Add support for 3CORESec lists. fw-grp-as-sets_old
Stefan Schantl [Sat, 22 Apr 2023 07:50:14 +0000 (09:50 +0200)] 
ipblocklist: Add support for 3CORESec lists.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agoipblocklist: Add support for Etnetera Aggressive Blocklist
Stefan Schantl [Sat, 22 Apr 2023 07:48:37 +0000 (09:48 +0200)] 
ipblocklist: Add support for Etnetera Aggressive Blocklist

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agorules.pl: Call the customsrvgrp loader in case a set should be loaded.
Stefan Schantl [Sat, 22 Apr 2023 07:45:27 +0000 (09:45 +0200)] 
rules.pl: Call the customsrvgrp loader in case a set should be loaded.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agorules.pl: Add load_customsrvgrp() function.
Stefan Schantl [Sat, 22 Apr 2023 07:44:34 +0000 (09:44 +0200)] 
rules.pl: Add load_customsrvgrp() function.

This is the set loader function to deal with custom service groups.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agofirewall-lib.pl: Use an ipset set if a service group contains more than
Stefan Schantl [Sat, 22 Apr 2023 07:41:38 +0000 (09:41 +0200)] 
firewall-lib.pl: Use an ipset set if a service group contains more than
15 ports.

The iptables multiport only supports up to 15 ports (ranges costs more).
To avoid this kind of limitation, now an ipset set will be used which
could handle up to 65k ports at once.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agofirewall-lib.pl: Add get_custom_srvgrp_ports() function
Stefan Schantl [Sat, 22 Apr 2023 07:38:48 +0000 (09:38 +0200)] 
firewall-lib.pl: Add get_custom_srvgrp_ports() function

This function can be used to get all service port numbers which are
attached to a custom service group by it's name.

You also have to choose if you want to get the ports for TCP or UDP
services.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agoipset-functions.pl: Proper map add_to_set() to the correct add function
Stefan Schantl [Sat, 22 Apr 2023 07:32:09 +0000 (09:32 +0200)] 
ipset-functions.pl: Proper map add_to_set() to the correct add function

Use a hash to map to the correct function to call for adding elements,
to a set, based on the given and detected data.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agoipset-functions.pl: Improve hashtype detection
Stefan Schantl [Sat, 22 Apr 2023 07:30:14 +0000 (09:30 +0200)] 
ipset-functions.pl: Improve hashtype detection

Cleanup code and allow to detect hashtypes of bitmap:port.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agoperl-IPSet: Update to latest development snapshot
Stefan Schantl [Sat, 22 Apr 2023 07:28:13 +0000 (09:28 +0200)] 
perl-IPSet: Update to latest development snapshot

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agoconfigroot: Fix typo
Stefan Schantl [Sat, 22 Apr 2023 07:27:00 +0000 (09:27 +0200)] 
configroot: Fix typo

It is called ipset-functions.pl not ipsec-functions.pl.

May the second one comes any days in future - who knows....

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agomake.sh: Fix typo
Stefan Schantl [Sat, 22 Apr 2023 07:25:57 +0000 (09:25 +0200)] 
make.sh: Fix typo

The correct name of the lfs file to call is perl-IPSet.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agorules.pl: Register load_customgrp() function for custom groups
Stefan Schantl [Sun, 16 Apr 2023 14:22:38 +0000 (16:22 +0200)] 
rules.pl: Register load_customgrp() function for custom groups

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agorules.pl: Add load_customgrp() function.
Stefan Schantl [Sun, 16 Apr 2023 14:21:20 +0000 (16:21 +0200)] 
rules.pl: Add load_customgrp() function.

This function is used to perfom as loader for custom
host/newtworks groups.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agofirewall-lib.pl: Return custom host/neworks groups as sets to match
Stefan Schantl [Sun, 16 Apr 2023 14:18:59 +0000 (16:18 +0200)] 
firewall-lib.pl: Return custom host/neworks groups as sets to match
against

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agofirewall-lib.pl: Add get_custom_group_addresses() function
Stefan Schantl [Sun, 16 Apr 2023 14:17:11 +0000 (16:17 +0200)] 
firewall-lib.pl: Add get_custom_group_addresses() function

This function is used to get the host/nework address of
each element of a given custom group name.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agofirewall-lib.pl: Introduce get_custom_groups() function.
Stefan Schantl [Sun, 16 Apr 2023 14:14:38 +0000 (16:14 +0200)] 
firewall-lib.pl: Introduce get_custom_groups() function.

This function is used to get a list of all created custom
host/nework groups.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agoMerge branch 'ipblocklist-rework' into fw-grp-as-sets
Stefan Schantl [Sun, 16 Apr 2023 14:11:16 +0000 (16:11 +0200)] 
Merge branch 'ipblocklist-rework' into fw-grp-as-sets

2 years agorules.pl: Drop obsolete dummy/workaround code ipblocklist-rework
Stefan Schantl [Sat, 15 Apr 2023 13:18:08 +0000 (15:18 +0200)] 
rules.pl: Drop obsolete dummy/workaround code

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agorules.pl: Use new load_set() function to load a given set name
Stefan Schantl [Sat, 15 Apr 2023 13:17:21 +0000 (15:17 +0200)] 
rules.pl: Use new load_set() function to load a given set name

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agorules.pl: Introduce set_loader mechanism
Stefan Schantl [Sat, 15 Apr 2023 13:13:57 +0000 (15:13 +0200)] 
rules.pl: Introduce set_loader mechanism

This introduces a mechanism where each setname and the function
which is used to proper load this set are stored in a hash.

The load_set function will use this information to call the correct
function.

To register a set loader the register_set_loader function can be used by
specifying the function name and an array of affected set names.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agoipblocklist: Adjust indention in sources file
Stefan Schantl [Fri, 14 Apr 2023 20:11:58 +0000 (22:11 +0200)] 
ipblocklist: Adjust indention in sources file

This makes the file and it's data better human read-able.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agoupdate-location-database: Export as list into new directory
Stefan Schantl [Fri, 14 Apr 2023 18:57:29 +0000 (20:57 +0200)] 
update-location-database: Export as list into new directory

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agolibloc: Export networks as plain list
Stefan Schantl [Fri, 14 Apr 2023 18:52:39 +0000 (20:52 +0200)] 
libloc: Export networks as plain list

Also change the export directory to /var/lib/location/export

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agorules.pl: Drop old ipset related code
Stefan Schantl [Fri, 14 Apr 2023 18:46:23 +0000 (20:46 +0200)] 
rules.pl: Drop old ipset related code

This code is not longer used and safely can be dropped

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agorules.pl: Use load_location function to load a location set
Stefan Schantl [Fri, 14 Apr 2023 18:45:28 +0000 (20:45 +0200)] 
rules.pl: Use load_location function to load a location set

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agoRevert "rules.pl: Use ipset_exists() function to avoid loading the same set"
Stefan Schantl [Fri, 14 Apr 2023 18:26:10 +0000 (20:26 +0200)] 
Revert "rules.pl: Use ipset_exists() function to avoid loading the same set"

We need this to avoid from loading the same set multiple times during
one run but update allready loaded sets.

This reverts commit 6dfa1854fb9ce74c0449b90f8475ac0fa9d87e2e.

2 years agolocation-functions.pl: Introduce load_location() function.
Stefan Schantl [Fri, 14 Apr 2023 18:24:03 +0000 (20:24 +0200)] 
location-functions.pl: Introduce load_location() function.

This function uses the ipset-functions library to create/update
a location list.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agoipblocklist-functions.pl: Use ipset_load_set function from
Stefan Schantl [Fri, 14 Apr 2023 17:38:09 +0000 (19:38 +0200)] 
ipblocklist-functions.pl: Use ipset_load_set function from
ipset-functions library

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agoipset-functions.pl: Add ipset_load_set function.
Stefan Schantl [Fri, 14 Apr 2023 17:36:41 +0000 (19:36 +0200)] 
ipset-functions.pl: Add ipset_load_set function.

This function can be used to load/update a given set and
it's data.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agoipset-functions.pl: Drop debug output from clenup_ipsets() function
Stefan Schantl [Fri, 14 Apr 2023 17:14:59 +0000 (19:14 +0200)] 
ipset-functions.pl: Drop debug output from clenup_ipsets() function

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agorules.pl: Drop old code to load a blocklist
Stefan Schantl [Fri, 14 Apr 2023 17:09:46 +0000 (19:09 +0200)] 
rules.pl: Drop old code to load a blocklist

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agorules.pl: Use ipset_exists() function to avoid loading the same set
Stefan Schantl [Fri, 14 Apr 2023 16:46:19 +0000 (18:46 +0200)] 
rules.pl: Use ipset_exists() function to avoid loading the same set
multiple times.

Asking the kernel if a set is allready loaded/know is much smarter.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agorules.pl: Avoid creating iptables rules if the corresponding blocklist is not loaded
Stefan Schantl [Fri, 14 Apr 2023 16:32:54 +0000 (18:32 +0200)] 
rules.pl: Avoid creating iptables rules if the corresponding blocklist is not loaded

In case a blocklist is empty after de-duplication of the entries, it
would not be loaded. In such a case we also can skip creating any
iptables rules for this list.

This avoids us checking against an empty list and therefore saves a few cpu cycles.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agorules.pl: Use load_blocklists() function to load all
Stefan Schantl [Fri, 14 Apr 2023 16:31:59 +0000 (18:31 +0200)] 
rules.pl: Use load_blocklists() function to load all
enabled blocklists.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agofirewall: Use cleanup_ipsets() function from ipset-functions library
Stefan Schantl [Fri, 14 Apr 2023 16:28:04 +0000 (18:28 +0200)] 
firewall: Use cleanup_ipsets() function from ipset-functions library

Asking the kernel for all known sets and unloading unused ones is a much
smarter approach than the old one.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agoipblocklist-functions.pl: Fix regex in downloader
Stefan Schantl [Fri, 14 Apr 2023 16:20:01 +0000 (18:20 +0200)] 
ipblocklist-functions.pl: Fix regex in downloader

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agoipblocklist.cgi: Adjust code to work with latest ipblocklist-functions.pl
Stefan Schantl [Fri, 14 Apr 2023 16:16:44 +0000 (18:16 +0200)] 
ipblocklist.cgi: Adjust code to work with latest ipblocklist-functions.pl
changes

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agoupdate-ipblocklists: Adjust code to work with latest
Stefan Schantl [Fri, 14 Apr 2023 16:15:22 +0000 (18:15 +0200)] 
update-ipblocklists: Adjust code to work with latest
ipblocklist-function.pl changes

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agoipblocklist-functions.pl: Fix return codes of the downloader
Stefan Schantl [Fri, 14 Apr 2023 16:14:43 +0000 (18:14 +0200)] 
ipblocklist-functions.pl: Fix return codes of the downloader

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agoipblocklist-functions.pl: Drop _calculate_hashsize() function.
Stefan Schantl [Fri, 14 Apr 2023 16:01:53 +0000 (18:01 +0200)] 
ipblocklist-functions.pl: Drop _calculate_hashsize() function.

This function is part of the ipset-functions library and is not
longer required here.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agoipblocklist-functions.pl: Add load_blocklist function.
Stefan Schantl [Fri, 14 Apr 2023 16:00:35 +0000 (18:00 +0200)] 
ipblocklist-functions.pl: Add load_blocklist function.

This function uses the ipset-functions library and the perl ipset
bindings to load or update a given blocklist into the kernel.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agoipblocklist-functions.pl: Introduce load_blocklists() function
Stefan Schantl [Fri, 14 Apr 2023 15:56:34 +0000 (17:56 +0200)] 
ipblocklist-functions.pl: Introduce load_blocklists() function

This function is responsible for loading the enabled blocklists.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agoipblocklist-functions.pl: Adjust return codes of the download function
Stefan Schantl [Fri, 14 Apr 2023 15:36:42 +0000 (17:36 +0200)] 
ipblocklist-functions.pl: Adjust return codes of the download function

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agoipblocklist-functions.pl: Add function to get all enabled blocklists
Stefan Schantl [Fri, 14 Apr 2023 15:35:48 +0000 (17:35 +0200)] 
ipblocklist-functions.pl: Add function to get all enabled blocklists

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agoipblocklist-functions.pl: Download and store blocklist only as plain
Stefan Schantl [Fri, 14 Apr 2023 15:31:56 +0000 (17:31 +0200)] 
ipblocklist-functions.pl: Download and store blocklist only as plain
file in cache directory

Do not longer convert into ipset compatible format - only parse and
store the file.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agoipblocklist-functions.pl: Switch to get_cached_blocklist_file()
Stefan Schantl [Fri, 14 Apr 2023 15:25:46 +0000 (17:25 +0200)] 
ipblocklist-functions.pl: Switch to get_cached_blocklist_file()

Replace the get_ipset_db_file() function to get_cache_blocklist_file().

This function will return the filename of the cached blocklist file
in "/var/cache/ipblocklist/".

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agoipblocklist-functions.pl: Use download function from
Stefan Schantl [Fri, 14 Apr 2023 15:12:54 +0000 (17:12 +0200)] 
ipblocklist-functions.pl: Use download function from
general-functions.pl

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agoipblocklist-functions.pl: Use strict
Stefan Schantl [Fri, 14 Apr 2023 15:12:31 +0000 (17:12 +0200)] 
ipblocklist-functions.pl: Use strict

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agoMerge branch 'perl-ipset' into ipblocklist-rework
Stefan Schantl [Fri, 14 Apr 2023 14:52:30 +0000 (16:52 +0200)] 
Merge branch 'perl-ipset' into ipblocklist-rework

2 years agoipset-functions.pl: Introduce new functions library. perl-ipset
Stefan Schantl [Fri, 14 Apr 2023 14:41:07 +0000 (16:41 +0200)] 
ipset-functions.pl: Introduce new functions library.

This library uses the perl-IPset bindings and contains a lot of
additional functions to deal with ipsets within perl.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agoperl-IPSet: New package
Stefan Schantl [Fri, 14 Apr 2023 14:35:46 +0000 (16:35 +0200)] 
perl-IPSet: New package

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agoMerge branch 'general-downloader' into ipblocklist-rework
Stefan Schantl [Fri, 14 Apr 2023 14:33:39 +0000 (16:33 +0200)] 
Merge branch 'general-downloader' into ipblocklist-rework

2 years agoids-functions.pl: Use new general downloader function. general-downloader
Stefan Schantl [Thu, 4 Aug 2022 18:04:45 +0000 (20:04 +0200)] 
ids-functions.pl: Use new general downloader function.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agogeneral-functions.pl: Use new downloader for FetchPublicIp function.
Stefan Schantl [Thu, 4 Aug 2022 18:00:21 +0000 (20:00 +0200)] 
general-functions.pl: Use new downloader for FetchPublicIp function.

This helps to drop the Net::SSLeay module and to remove a lot of legacy
code.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agogeneral-functions.pl: Add LWP-based flexible downloader function.
Stefan Schantl [Thu, 4 Aug 2022 17:56:54 +0000 (19:56 +0200)] 
general-functions.pl: Add LWP-based flexible downloader function.

This function can be used to grab content and/or store it into files.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agoUpdate french translations
Stéphane Pautrel [Sat, 18 Mar 2023 13:10:42 +0000 (14:10 +0100)] 
Update french translations

Signed-off-by: Stéphane Pautrel <stephane.pautrel@acb78.com>
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agoMerge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
Stefan Schantl [Fri, 14 Apr 2023 12:58:01 +0000 (14:58 +0200)] 
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x

2 years agoCore Update 174: Ship parse-func.pl
Peter Müller [Fri, 7 Apr 2023 14:37:05 +0000 (14:37 +0000)] 
Core Update 174: Ship parse-func.pl

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2 years agoparse-func.pl: Adjust regular expression to changed 'tc' output
Peter Müller [Fri, 7 Apr 2023 14:35:11 +0000 (14:35 +0000)] 
parse-func.pl: Adjust regular expression to changed 'tc' output

It is not clear at all why they choose to change the tool's output this
way in upstream commit 010a8388aea11e767ba3a2506728b9ad9760df0e, but
we'll have to make do with this.

Fixes: #13075
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2 years agoDo not mark migrate.pl as executable in Git
Peter Müller [Tue, 4 Apr 2023 21:12:39 +0000 (21:12 +0000)] 
Do not mark migrate.pl as executable in Git

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2 years agoovpnmain.cgi: Do not determine certificate expiry status for N2N connections
Peter Müller [Tue, 4 Apr 2023 20:25:55 +0000 (20:25 +0000)] 
ovpnmain.cgi: Do not determine certificate expiry status for N2N connections

https://wiki.ipfire.org/devel/telco/2023-04-03

Fixes: #13066
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2 years agoRevert "e2fsprogs: Update to version 1.47.0"
Peter Müller [Tue, 4 Apr 2023 20:04:11 +0000 (20:04 +0000)] 
Revert "e2fsprogs: Update to version 1.47.0"

This reverts commit 1f3f26702144ef600eb7937c4ab78e4833e6636f.

Symlink will remain in place to ensure the reverted version is always
shipped to our users, including those that have installed Core Update
174 (testing).

Fixes: #13073
Reported-by: Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2 years agoCore Update 174: Ship ipblocklist-related changes
Peter Müller [Tue, 4 Apr 2023 20:02:58 +0000 (20:02 +0000)] 
Core Update 174: Ship ipblocklist-related changes

https://wiki.ipfire.org/devel/telco/2023-04-03

Cc: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2 years agoupdate-ipblocklists: Fix loading new blocklists after update
Stefan Schantl [Tue, 28 Mar 2023 16:05:42 +0000 (18:05 +0200)] 
update-ipblocklists: Fix loading new blocklists after update

* The script needs to run with root permissions in order to
  do the ipset operations. So remove code to drop the permissions
  on startup.

* Adjust execute calls to use the proper functions from
  general functions.

* Add some code to set the correct ownership (nobody:nobody) for
  changed files during script runtime.

Fixes #13072.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agoheader.pl: Add reference to colors.txt into header.pl
Adolf Belka [Thu, 16 Mar 2023 10:34:03 +0000 (11:34 +0100)] 
header.pl: Add reference to colors.txt into header.pl

- With change of common css entries into header.pl with commit
   https://git.ipfire.org/?p=ipfire-2.x.git;a=commit;h=b52a84ddc77f9db7e4ad7b129f21fbf528c6f990
   I had missed that color20 and color22 etc, that come from colors.txt, are not known in
   header.pl so that the alternate colours in tables were missing. Even though I tested the
   previous commit I obviously did not look well enough because I missed that the tables
   had no alternate colours. I just found it now when looking at Core Update 174 Testing.
- Confirmed by copying this version of header.pl into my CU174 Testing system and the
   alternate colour rows came back again as they should be. I am sure now that they are
   correct.

Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Reviewed-by: Bernhard Bitsch <bbitsch@ipfire.org>
Tested-by: Bernhard Bitsch <bbitsch@ipfire.org>
2 years agographs.pl: Make canvas fixed size and limit cpufreq color index
Leo-Andres Hofmann [Mon, 13 Mar 2023 07:35:44 +0000 (08:35 +0100)] 
graphs.pl: Make canvas fixed size and limit cpufreq color index

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@leo-andres.de>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agoCore Update 174: Ship graphs.pl and getrrdimage.cgi
Peter Müller [Mon, 13 Mar 2023 21:38:50 +0000 (21:38 +0000)] 
Core Update 174: Ship graphs.pl and getrrdimage.cgi

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2 years agoDrop support for entropy graph
Leo-Andres Hofmann [Mon, 13 Mar 2023 07:29:17 +0000 (08:29 +0100)] 
Drop support for entropy graph

Entropy data isn't collected anymore. See 8000bc0 for reference.

Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
2 years agohaproxy: Update to 2.7.4
Peter Müller [Mon, 13 Mar 2023 21:36:01 +0000 (21:36 +0000)] 
haproxy: Update to 2.7.4

https://www.mail-archive.com/haproxy@formilux.org/msg43229.html

Reported-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2 years agoCore Update 174: Ship wireless-regdb
Peter Müller [Sun, 12 Mar 2023 20:46:51 +0000 (20:46 +0000)] 
Core Update 174: Ship wireless-regdb

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2 years agowireless-regdb: Update to 2023-02-13
Peter Müller [Sun, 12 Mar 2023 20:46:03 +0000 (20:46 +0000)] 
wireless-regdb: Update to 2023-02-13

Please refer to
https://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git/log/
for the list of commits since August 2022.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2 years agoLanguage files: Fixes bug#12701 - Line removed from proxy.cgi no longer needed in...
Adolf Belka [Sun, 12 Mar 2023 12:48:11 +0000 (13:48 +0100)] 
Language files: Fixes bug#12701 - Line removed from proxy.cgi no longer needed in lang files

- v2 version that has only the removed line in the language files diffs
- Line removed from de, en, es & fr
- No translations had been done for the other languages for that line.

Fixes: Bug#12701
Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
2 years agorules.pl: Proposed patch - Fix for missing bracket
Matthias Fischer [Sun, 12 Mar 2023 13:28:00 +0000 (14:28 +0100)] 
rules.pl: Proposed patch - Fix for missing bracket

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Reviewed-by: Bernhard Bitsch <bbitsch@ipfire.org>
2 years agoRun ./make.sh lang
Peter Müller [Sat, 11 Mar 2023 17:06:41 +0000 (17:06 +0000)] 
Run ./make.sh lang

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2 years agoRun ./make.sh update-contributors
Peter Müller [Sat, 11 Mar 2023 17:06:16 +0000 (17:06 +0000)] 
Run ./make.sh update-contributors

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2 years agolinux-firmware: Do not ship the qca/ directory
Peter Müller [Sat, 11 Mar 2023 17:04:18 +0000 (17:04 +0000)] 
linux-firmware: Do not ship the qca/ directory

It only contains firmware files for some Qualcomm Bluetooth devices, for
which there is no use on IPFire, since we disabled Bluetooth support in
the kernel a long time ago due to security reasons.

To save some space (~ 1.9 MByte), do not ship these files, and delete
them on existing IPFire installations as well.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2 years agoCore Update 174: Ship relevant changes of linux-firmware
Peter Müller [Sat, 11 Mar 2023 17:01:14 +0000 (17:01 +0000)] 
Core Update 174: Ship relevant changes of linux-firmware

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2 years agolinux-firmware: Update to version 20230210
Adolf Belka [Tue, 7 Mar 2023 22:01:25 +0000 (23:01 +0100)] 
linux-firmware: Update to version 20230210

- Update from version 20221214 to 20230210
- Update of rootfile
- Changelog
   For changes see the commits in the git repo
   https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/log/

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
2 years agoCore Update 174: Ship proxy.cgi
Peter Müller [Sat, 11 Mar 2023 16:36:08 +0000 (16:36 +0000)] 
Core Update 174: Ship proxy.cgi

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2 years agoprocy.cgi: Fix bug#12701 - remove advproxy wpad notice line
Adolf Belka [Tue, 14 Feb 2023 13:08:46 +0000 (14:08 +0100)] 
procy.cgi: Fix bug#12701 - remove advproxy wpad notice line

- This line is no longer needed with the help button at the top of each WUI page that was
   implemented by @Leo
- Sorry for long time for me to get around to finalising this patch but it is done now.

Fixes: bug#12701
Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
2 years agoupdatexlrator.cgi: Update to naming of variables in css section
Adolf Belka [Mon, 6 Mar 2023 17:04:24 +0000 (18:04 +0100)] 
updatexlrator.cgi: Update to naming of variables in css section

- This updates the updatexlrator.cgi page to the same central use of extraHead from
   header.pl and simplifying of css variables where appropriate.
- The variables for the percentage bar will also be able to be used in other cgi pages
   with a percent bar.

Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
2 years agodhcp.cgi: Update to naming of variables in css section
Adolf Belka [Mon, 6 Mar 2023 17:04:23 +0000 (18:04 +0100)] 
dhcp.cgi: Update to naming of variables in css section

- After looking at other .cgi files I realised that I had named the variables based on
   their dhcp usage only. However colouryellow or color20 etc can be used not only in a
   row but also in a cell or a column. Rather than ending up with multiple copies of the
   same colour for rows, cells, columns etc I have simplified the variable names to just
   the colour. They can then be used in whatever situation is wanted. The rest of the cgi
   code will give the view of what structure the colour is being applied to.
- This will limit the number of different css variables defined in the header.pl file

Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
2 years agoCore Update 174: Ship traffic.cgi
Peter Müller [Sat, 11 Mar 2023 16:30:05 +0000 (16:30 +0000)] 
Core Update 174: Ship traffic.cgi

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2 years agotraffic.cgi: Do not use hard-coded red interface name
Stefan Schantl [Tue, 7 Mar 2023 11:53:49 +0000 (12:53 +0100)] 
traffic.cgi: Do not use hard-coded red interface name

If QMI is used the dial in mode has to be set as ppp dialin but the
interface name is red. In such a case the old code tried to display
the stats for the ppp0 interface which is wrong.

This patch fixes this issue by calling the handy function to get
the correct interface name for red.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agoCore Update 174: Ship rules.pl and ipblocklist.cgi
Peter Müller [Sat, 11 Mar 2023 16:28:20 +0000 (16:28 +0000)] 
Core Update 174: Ship rules.pl and ipblocklist.cgi

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2 years agoipblocklist.cgi: Fix settings checkbox handling
Stefan Schantl [Tue, 7 Mar 2023 12:17:35 +0000 (13:17 +0100)] 
ipblocklist.cgi: Fix settings checkbox handling

Checkboxes does not submit any values if they are not checked.
Default them to "off" in such a case.

This fixes the issue not beeing able to disable the logging.

Fixes #12979.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Reviewed-by: Adolf Belka <adolf.belka@ipfire.org>
2 years agofirewall: Silence warnings if blocklist logging is not set.
Stefan Schantl [Tue, 7 Mar 2023 12:17:34 +0000 (13:17 +0100)] 
firewall: Silence warnings if blocklist logging is not set.

Reference: #12979.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agoCore Update 174: Ship ids-functions.pl
Peter Müller [Sat, 11 Mar 2023 16:26:46 +0000 (16:26 +0000)] 
Core Update 174: Ship ids-functions.pl

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2 years agoids-functions.pl: Extract rules files if they are in a providers rules folder.
Stefan Schantl [Tue, 7 Mar 2023 12:38:09 +0000 (13:38 +0100)] 
ids-functions.pl: Extract rules files if they are in a providers rules folder.

Now the rules files in a subfolder like "<provider>-rules" also will get
extracted.

Fixes rule file extraction for Snort Community ruleset.

Fixes #12948.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Reviewed-by: Adolf Belka <adolf.belka@ipfire.org>
2 years agoCore Update 174: Ship grep
Peter Müller [Sat, 11 Mar 2023 16:25:37 +0000 (16:25 +0000)] 
Core Update 174: Ship grep

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2 years agogrep: Update to version 3.9
Adolf Belka [Tue, 7 Mar 2023 22:01:24 +0000 (23:01 +0100)] 
grep: Update to version 3.9

- Update from version 3.8 to 3.9
- Update of rootfile not required
- Changelog
 Noteworthy changes in release 3.9 (2023-03-05) [stable]
 Bug fixes
  With -P, some non-ASCII UTF8 characters were not recognized as
  word-constituent due to our omission of the PCRE2_UCP flag. E.g.,
  given f(){ echo Perú|LC_ALL=en_US.UTF-8 grep -Po "$1"; } and
  this command, echo $(f 'r\w'):$(f '.\b'), before it would print ":r".
  After the fix, it prints the correct results: "rú:ú".
  When given multiple patterns the last of which has a back-reference,
  grep no longer sometimes mistakenly matches lines in some cases.
  [Bug#36148#13 introduced in grep 3.4]

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
2 years agopython3-setuptools: Update to version 67.5.1
Adolf Belka [Tue, 7 Mar 2023 22:01:26 +0000 (23:01 +0100)] 
python3-setuptools: Update to version 67.5.1

- Update from version 65.4.1 to 67.5.1
- Update of rootfile
- Changelog
v67.5.1
Misc
* #3836: Fixed interaction between ``setuptools``' package auto-discovery and
  auto-generated ``htmlcov`` files.
  Previously, the ``htmlcov`` name was ignored when searching for single-file
  modules, however the correct behaviour is to ignore it when searching for
  packages (since it is supposed to be a directory, see `coverage config`_)
  -- by :user:`yukihiko-shinoda`.
  .. _coverage config: https://coverage.readthedocs.io/en/stable/config.html#html-directory
* #3838: Improved error messages for ``pyproject.toml`` validations.
* #3839: Fixed ``pkg_resources`` errors caused when parsing metadata of packages that
  are already installed but do not conform with PEP 440.
v67.5.0
Changes
* #3843: Although pkg_resources has been discouraged for use, some projects still
         consider pkg_resources viable for usage. This change makes it clear that
         pkg_resources should not be used, emitting a DeprecationWarning when imported.

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
2 years agosudo: Update to version 1.9.13p3
Adolf Belka [Tue, 7 Mar 2023 22:01:27 +0000 (23:01 +0100)] 
sudo: Update to version 1.9.13p3

- Update from version 1.9.13p2 to 1.9.13p3
- Update of rootfile not required
- Changelog
What's new in Sudo 1.9.13p3
 * Fixed a bug introduced in sudo 1.9.13 that caused a syntax error
   when "list" was used as a user or host name.  GitHub issue #246.
 * Fixed a bug that could cause sudo to hang when running a command
   in a pseudo-terminal when there is still input buffered after a
   command has exited.
 * Fixed "sudo -U otheruser -l command".  This is a regression in
   sudo 1.9.13.  GitHub issue #248.
 * Fixed "sudo -l command args" when matching a command in sudoers
   with command line arguments.  This is a regression in sudo 1.9.13.
   GitHub issue #249.

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
2 years agoCore Update 174: Ship qpdf
Peter Müller [Sat, 11 Mar 2023 16:22:10 +0000 (16:22 +0000)] 
Core Update 174: Ship qpdf

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2 years agocups-filters: -std=c++17 required due to problem introduced with qpdf-11.3.0
Adolf Belka [Tue, 7 Mar 2023 22:05:16 +0000 (23:05 +0100)] 
cups-filters: -std=c++17 required due to problem introduced with qpdf-11.3.0

- Add -std=c++17 flag to configure
- Disable static libs
- Update of rootfile

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
2 years agoqpdf: Update to version 11.3.0
Adolf Belka [Tue, 7 Mar 2023 22:05:15 +0000 (23:05 +0100)] 
qpdf: Update to version 11.3.0

- Update from version 10.4.0 to 11.3.0
- Update of rootfile
- Build changed to cmake from version 11.0 onwards
- find-dependencies run due to lib so bump. Only qpdf and cups-filters are linked to
   the changed libs. cups-filters being shipped due to a change required because of
   qpdf-11.3.0
- Changelog is too large to include here. Details can be found in the ChangeLog file in
   the source tarball.

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
2 years agoCore Update 174: Ship poppler and poppler-data
Peter Müller [Sat, 11 Mar 2023 16:20:59 +0000 (16:20 +0000)] 
Core Update 174: Ship poppler and poppler-data

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2 years agopoppler-data: Update to version 0.4.12
Adolf Belka [Tue, 7 Mar 2023 22:02:18 +0000 (23:02 +0100)] 
poppler-data: Update to version 0.4.12

- Update from version 0.4.11 to 0.4.12
- Update of rootfile not required
- No Changelog available but the latest version of poppler-data is required by poppler

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
2 years agopoppler: Update to version 23.03.0
Adolf Belka [Tue, 7 Mar 2023 22:02:17 +0000 (23:02 +0100)] 
poppler: Update to version 23.03.0

- Update from version 23.01.0 to 23.03.0
- Update of rootfile not required
- Changelog
Release 23.03.0:
        core:
         * PngWriter: Fix potential uninitialized memory use
Release 23.02.0:
        core:
         * CairoOutputDev: Fix rendering of color type 3 fonts
         * CairoOutputDev: Add handling matte entry
         * Fix segfault on wrong nssdir
         * Fix "NSS could not shutdown"
        utils:
         * pdfsig: Point out supports PKCS#11 URIs as nickname

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
2 years agolog.dat: Fixes Bug#12922 - adjusts regex to catch hostname for hostname or FQDN
Adolf Belka [Wed, 8 Mar 2023 14:59:55 +0000 (15:59 +0100)] 
log.dat: Fixes Bug#12922 - adjusts regex to catch hostname for hostname or FQDN

- Most of the packages being searched for in the system logs section only put hostname into
   the logs. However HAProxy puts the FQDN. Reviewing RFC 5424 shows that this is following
   the requirements. The preferred order fromn the RFC is
   1.  FQDN
   2.  Static IP address
   3.  hostname
   4.  Dynamic IP address
   5.  the NILVALUE
- Most of the programs are using option 3 but option 1 is valid for HAProxy
- The regex change filters out the hostname from the FQDN if an extra 'dot' is present

Fixes: Bug#12922
Suggested-by: Michael <ip.fire@die-fritzens.de>
Tested-by: Michael <ip.fire@die-fritzens.de>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>