]> git.ipfire.org Git - people/stevee/ipfire-2.x.git/log
people/stevee/ipfire-2.x.git
2 years agoipblocklist.cgi: Display reload request as notice instead of error. ipblocklist-rbsed
Stefan Schantl [Tue, 21 Jun 2022 15:52:54 +0000 (17:52 +0200)] 
ipblocklist.cgi: Display reload request as notice instead of error.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agoipblocklist.cgi: Use changed fw reload language string.
Stefan Schantl [Tue, 21 Jun 2022 15:32:39 +0000 (17:32 +0200)] 
ipblocklist.cgi: Use changed fw reload language string.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2 years agoipblocklist: Add neccessary files for logwatch.
Tim FitzGeorge [Tue, 21 Jun 2022 13:05:29 +0000 (15:05 +0200)] 
ipblocklist: Add neccessary files for logwatch.

2 years agoMerge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x into ipblocklist...
Stefan Schantl [Tue, 21 Jun 2022 07:43:13 +0000 (09:43 +0200)] 
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x into ipblocklist-rbsed

3 years agoCore Update 168: Ship fcrontab and rebuild it from scratch
Peter Müller [Sat, 4 Jun 2022 08:43:15 +0000 (08:43 +0000)] 
Core Update 168: Ship fcrontab and rebuild it from scratch

This is necessary due to IDSv4 changes introducing changes to fcrontab.
While this patch will cause any custom cron jobs configured there to be
lost, it is better to start with a defined state rather than sed'ing
on this file.

Cc: Michael Tremer <michael.tremer@ipfire.org>
Cc: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agointel-microcode: Update rootfile
Peter Müller [Tue, 31 May 2022 17:21:54 +0000 (17:21 +0000)] 
intel-microcode: Update rootfile

Reported-by: Jon Murphy <jcmurphy26@gmail.com>
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agoUpdate contributor list
Peter Müller [Mon, 30 May 2022 20:00:53 +0000 (20:00 +0000)] 
Update contributor list

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agocore168: Add script to automatically repair MDRAID arrays
Michael Tremer [Thu, 19 May 2022 08:56:34 +0000 (08:56 +0000)] 
core168: Add script to automatically repair MDRAID arrays

Please see the header of the script for more details.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agocore168: Add rd.auto to kernel command line
Michael Tremer [Thu, 19 May 2022 08:56:33 +0000 (08:56 +0000)] 
core168: Add rd.auto to kernel command line

This parameter will enable dracut to automatically launch any MDRAID
arrays at boot time.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agostrongSwan: Bring back firewall rules for permitting IP-in-IP, ESP and AH traffic
Peter Müller [Wed, 18 May 2022 17:49:00 +0000 (17:49 +0000)] 
strongSwan: Bring back firewall rules for permitting IP-in-IP, ESP and AH traffic

Fixes: #12866
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agoCore Update 168: fcrontab != crontab
Peter Müller [Wed, 18 May 2022 17:42:24 +0000 (17:42 +0000)] 
Core Update 168: fcrontab != crontab

Silly me.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agodracut: Enable automatic assembly of any RAID/LVM devices
Michael Tremer [Mon, 16 May 2022 14:48:14 +0000 (14:48 +0000)] 
dracut: Enable automatic assembly of any RAID/LVM devices

This has changed in dracut 24 and we have used various hacks to enable
this behaviour again when it would have been so easy to just enable this
parameter.

Fixes: #12862 - Upgrade from Core 166 to 167 does not use RAID anymore
Reported-by: Dirk Sihling <dsihling@web.de>
Reported-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
3 years agoCore Update 168: Ship liburcu
Peter Müller [Mon, 16 May 2022 07:12:23 +0000 (07:12 +0000)] 
Core Update 168: Ship liburcu

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agopoppler: Fix rootfile.
Stefan Schantl [Fri, 13 May 2022 21:26:34 +0000 (23:26 +0200)] 
poppler: Fix rootfile.

libpoppler.so.120.0.0 contains all the functions and symbols which
are required by the tools linked against it.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Reviewed-by: Adolf Belka <adolf.belka@ipfire.org>
3 years agolibinih: Fix rootfile.
Stefan Schantl [Fri, 13 May 2022 21:20:44 +0000 (23:20 +0200)] 
libinih: Fix rootfile.

Some tools of the xfsprogs are linked against libinih and therefore
we need to ship those libs.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Reviewed-by: Adolf Belka <adolf.belka@ipfire.org>
3 years agoliburcu: Fix rootfile.
Stefan Schantl [Fri, 13 May 2022 21:17:48 +0000 (23:17 +0200)] 
liburcu: Fix rootfile.

At least the xfsprogs is linked agains the urcu libraries and therefore
requires them to run and deal with xfs filesystems.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Reviewed-by: Adolf Belka <adolf.belka@ipfire.org>
3 years agoupdate-ids-ruleset: Silent script if no providers settings file exists.
Stefan Schantl [Fri, 13 May 2022 17:10:44 +0000 (19:10 +0200)] 
update-ids-ruleset: Silent script if no providers settings file exists.

Only try to read-in the providers settings file, in case it exists.
Otherwise the script produces an error message, about the missing file,
each time it gets executed.

Because of the fcron job this would be twice a day in most cases.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
3 years agopango: Fix rootfile.
Stefan Schantl [Fri, 13 May 2022 16:55:48 +0000 (18:55 +0200)] 
pango: Fix rootfile.

The main libraries libpangocairo and libpangosoft2 accidently have been
marked to be not shipped or part of the system.

They are required by collecty and various other libraries or binaries.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agostrongswan: Update rootfile
Peter Müller [Fri, 13 May 2022 09:22:35 +0000 (09:22 +0000)] 
strongswan: Update rootfile

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agoexpat: Fix rootfile.
Stefan Schantl [Fri, 13 May 2022 04:30:57 +0000 (06:30 +0200)] 
expat: Fix rootfile.

The libexpat.so.1 file is just a symlink to libexpat.so.1.8.8 which
contains all the functions and symbols required by the binaries, linked
against it. Therefore this file needs to be present on the systems.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
3 years agoCore Update 168: Ship and restart strongSwan
Peter Müller [Thu, 12 May 2022 18:06:59 +0000 (18:06 +0000)] 
Core Update 168: Ship and restart strongSwan

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agostrongSwan: Update to 5.9.6
Peter Müller [Thu, 12 May 2022 18:04:52 +0000 (18:04 +0000)] 
strongSwan: Update to 5.9.6

See: https://github.com/strongswan/strongswan/releases/tag/5.9.6

Since this addresses security issues, and also with regards to reports
such as https://community.ipfire.org/t/core-update-167-ipsec-issue/7893,
I take the liberty to push this straight into Core Update 168.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agointel-microcode: Update to 20220510
Peter Müller [Thu, 12 May 2022 17:53:50 +0000 (17:53 +0000)] 
intel-microcode: Update to 20220510

Please refer to https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases/tag/microcode-20220510
for further details.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agoCore Update 168: Ship core-files
Peter Müller [Thu, 12 May 2022 17:27:34 +0000 (17:27 +0000)] 
Core Update 168: Ship core-files

https://community.ipfire.org/t/core-168-testing-working/7901/7

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agonagios-plugins: Bump package version for OpenLDAP update
Peter Müller [Tue, 10 May 2022 14:12:53 +0000 (14:12 +0000)] 
nagios-plugins: Bump package version for OpenLDAP update

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agoCore Update 168: Ship necessary dependencies
Peter Müller [Tue, 10 May 2022 14:12:21 +0000 (14:12 +0000)] 
Core Update 168: Ship necessary dependencies

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agoCore Update 168: Ship coreutils
Peter Müller [Tue, 10 May 2022 13:56:59 +0000 (13:56 +0000)] 
Core Update 168: Ship coreutils

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agoCore Update 168: Ship GnuPG
Peter Müller [Tue, 10 May 2022 13:54:25 +0000 (13:54 +0000)] 
Core Update 168: Ship GnuPG

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agosuricata: Perform ruleset update every 12 hours.
Stefan Schantl [Sun, 8 May 2022 13:23:03 +0000 (15:23 +0200)] 
suricata: Perform ruleset update every 12 hours.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
3 years agoUpdate rootfiles
Peter Müller [Sun, 8 May 2022 14:16:10 +0000 (14:16 +0000)] 
Update rootfiles

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agofcron: Try to update ipblocklists every 15 min.
Stefan Schantl [Sun, 8 May 2022 13:32:28 +0000 (15:32 +0200)] 
fcron: Try to update ipblocklists every 15 min.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agorules.pl: Do not check private networks against ipblocklists.
Stefan Schantl [Sun, 8 May 2022 13:15:18 +0000 (15:15 +0200)] 
rules.pl: Do not check private networks against ipblocklists.

In case some of these private networks are part of an used blocklist
this kind of traffic needs to be allowed. Otherwise some services may
not work properly.

For example:
In case one ore more IPSec N2N connections are configured no traffic can
be passed through it, if the used networks are part of an blocklist.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoCore Update 168: Ship pakfire.cgi
Peter Müller [Sun, 8 May 2022 13:14:16 +0000 (13:14 +0000)] 
Core Update 168: Ship pakfire.cgi

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agopakfire.cgi: Cosmetic fixes
Leo-Andres Hofmann [Sun, 8 May 2022 12:09:52 +0000 (14:09 +0200)] 
pakfire.cgi: Cosmetic fixes

Add formatting to improve readability of dependencies list header.

Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de>
Acked-by: Peter Müller <peter.muelle@ipfire.org>
3 years agopakfire.cgi: Discard tac stderr output
Leo-Andres Hofmann [Sun, 8 May 2022 12:09:51 +0000 (14:09 +0200)] 
pakfire.cgi: Discard tac stderr output

Prevents meaningless "broken pipe" messages in the httpd error log.

Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de>
Acked-by: Peter Müller <peter.muelle@ipfire.org>
3 years agopakfire.cgi: Implement Post/Redirect/Get pattern
Leo-Andres Hofmann [Sun, 8 May 2022 12:09:50 +0000 (14:09 +0200)] 
pakfire.cgi: Implement Post/Redirect/Get pattern

Refreshing the Pakfire page may cause a command to be
executed multiple times and induce odd errors.

This patch implements a HTTP 303 redirect after form processing,
which causes the browser to discard the POST form data.
Navigating backward or reloading the page now does not trigger
multiple executions anymore.

Fixes: #12781
Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de>
Acked-by: Peter Müller <peter.muelle@ipfire.org>
3 years agopakfire.cgi: Notify user if Pakfire is already performing a task
Leo-Andres Hofmann [Sun, 8 May 2022 12:09:49 +0000 (14:09 +0200)] 
pakfire.cgi: Notify user if Pakfire is already performing a task

Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de>
Acked-by: Peter Müller <peter.muelle@ipfire.org>
3 years agopakfire.cgi: Show error and log messages earlier
Leo-Andres Hofmann [Sun, 8 May 2022 12:09:48 +0000 (14:09 +0200)] 
pakfire.cgi: Show error and log messages earlier

The main page cannot be used while an installation is running.
Therefore it makes more sense to generate the log output first.

Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de>
Acked-by: Peter Müller <peter.muelle@ipfire.org>
3 years agopakfire.cgi: Fix indentation
Leo-Andres Hofmann [Sun, 8 May 2022 12:09:47 +0000 (14:09 +0200)] 
pakfire.cgi: Fix indentation

Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de>
Acked-by: Peter Müller <peter.muelle@ipfire.org>
3 years agopakfire.cgi: Separate command processing and HTML generation
Leo-Andres Hofmann [Sun, 8 May 2022 12:09:46 +0000 (14:09 +0200)] 
pakfire.cgi: Separate command processing and HTML generation

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@leo-andres.de>
Acked-by: Peter Müller <peter.muelle@ipfire.org>
3 years agospectre-meltdown-checker: Update to 0.45
Peter Müller [Sun, 8 May 2022 12:05:53 +0000 (12:05 +0000)] 
spectre-meltdown-checker: Update to 0.45

Please refer to https://github.com/speed47/spectre-meltdown-checker/releases/tag/v0.45
for the release announcements of this version.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agoCore Update 168: Delete orphaned symlinks to Suricata ruleset updater
Peter Müller [Sun, 8 May 2022 12:03:18 +0000 (12:03 +0000)] 
Core Update 168: Delete orphaned symlinks to Suricata ruleset updater

Reported-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agoCore Update 168: Stop services before extracting files
Peter Müller [Sun, 8 May 2022 12:00:10 +0000 (12:00 +0000)] 
Core Update 168: Stop services before extracting files

https://lists.ipfire.org/pipermail/development/2022-May/013398.html

On a general note, we should do so for every Core Update, as it is more
sane to stop services before deleting or overwriting any files.

Reported-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agomake.sh: Sigh, bump core update version
Peter Müller [Sun, 8 May 2022 11:42:19 +0000 (11:42 +0000)] 
make.sh: Sigh, bump core update version

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agoCore Update 168: Ship intel-microcodes and rebuild initrds
Peter Müller [Sun, 8 May 2022 11:41:09 +0000 (11:41 +0000)] 
Core Update 168: Ship intel-microcodes and rebuild initrds

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agointel-microcode: Update to 20220419
Peter Müller [Sun, 8 May 2022 11:24:06 +0000 (11:24 +0000)] 
intel-microcode: Update to 20220419

Please refer to https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases/tag/microcode-20220419
for the release announcement.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agoSuricata: Install Core Update 167 converter script
Peter Müller [Sun, 8 May 2022 09:01:24 +0000 (09:01 +0000)] 
Suricata: Install Core Update 167 converter script

My fault, again. :-/

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agoipblocklist-sources: Change checksum definition from md5 to b2.
Stefan Schantl [Sat, 7 May 2022 13:42:48 +0000 (15:42 +0200)] 
ipblocklist-sources: Change checksum definition from md5 to b2.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoMerge branch 'next' into ipblocklist-rbsed-c168
Stefan Schantl [Sat, 7 May 2022 09:44:48 +0000 (11:44 +0200)] 
Merge branch 'next' into ipblocklist-rbsed-c168

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agorules.pl: Flush ipblocklist DROP chains.
Stefan Schantl [Mon, 2 May 2022 18:52:42 +0000 (20:52 +0200)] 
rules.pl: Flush ipblocklist DROP chains.

Flush the DROP chains of the blocklist chains while reloading the
firewall. Otherwise the log rules will stay even if logging has been
disabled in the meantime.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agorules.pl: Fix automatic ipset sets cleanup.
Stefan Schantl [Mon, 25 Apr 2022 19:01:29 +0000 (21:01 +0200)] 
rules.pl: Fix automatic ipset sets cleanup.

The array of used/loaded ipsets needs to be reloaded before
the cleanup can be started to also handle sets which are loaded during
runtime.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoipblocklist: Add "v4" as extension to the ipset set names.
Stefan Schantl [Mon, 25 Apr 2022 18:57:04 +0000 (20:57 +0200)] 
ipblocklist: Add "v4" as extension to the ipset set names.

This easily allows us to swap the sets after updating, without
unloading them.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agostage2: Add database directory for ipblocklist feature.
Stefan Schantl [Sun, 10 Apr 2022 09:51:13 +0000 (11:51 +0200)] 
stage2: Add database directory for ipblocklist feature.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agocrontab: Add job for periodic ipblocklist updates.
Stefan Schantl [Sun, 10 Apr 2022 09:40:56 +0000 (11:40 +0200)] 
crontab: Add job for periodic ipblocklist updates.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoipblocklist: Rootfile updates.
Tim FitzGeorge [Tue, 5 Apr 2022 03:34:00 +0000 (05:34 +0200)] 
ipblocklist: Rootfile updates.

Signed-off-by: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk>
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoconfigroot: Create ipblocklist related dir and settings file.
Tim FitzGeorge [Tue, 5 Apr 2022 03:32:51 +0000 (05:32 +0200)] 
configroot: Create ipblocklist related dir and settings file.

Signed-off-by: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk>
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoipblocklist-sources: New package.
Tim FitzGeorge [Tue, 5 Apr 2022 03:29:03 +0000 (05:29 +0200)] 
ipblocklist-sources: New package.

Placing the ipblocklist sources file as an own package, easily
allows to update this single file during a core update and to
keep the vendor details for the blocklists up-to-date.

Signed-off-by: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk>
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agobackup: Add ipblocklist related files.
Tim FitzGeorge [Tue, 5 Apr 2022 03:08:21 +0000 (05:08 +0200)] 
backup: Add ipblocklist related files.

Signed-off-by: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk>
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoshowrequestfromblocklist.dat: Fix silly typos.
Stefan Schantl [Tue, 5 Apr 2022 03:02:30 +0000 (05:02 +0200)] 
showrequestfromblocklist.dat: Fix silly typos.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoupdate-ipblocklists: Do not log the pid in syslog.
Stefan Schantl [Tue, 5 Apr 2022 02:57:19 +0000 (04:57 +0200)] 
update-ipblocklists: Do not log the pid in syslog.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agorules.pl: Refactor logic to handle the IP blocklist feature.
Stefan Schantl [Mon, 4 Apr 2022 19:43:49 +0000 (21:43 +0200)] 
rules.pl: Refactor logic to handle the IP blocklist feature.

* Fixes that the same chain would be created each time a firewall
reload is performed.

* Also fixes multiple log and drop rules inside the the BLOCKLIST_DROP
  chains after doing a firewall reload.

* Orphaned BLOCKLIST_DROP chains now will be flushed and removed in case
  the blocklist gets disabled or the entire feature will be swithed off.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agorules.pl: Add function to check if given firewall chain exists.
Stefan Schantl [Mon, 4 Apr 2022 19:43:20 +0000 (21:43 +0200)] 
rules.pl: Add function to check if given firewall chain exists.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agorules.pl: Fix typo when creating blocklist drop chains.
Stefan Schantl [Sun, 3 Apr 2022 12:15:48 +0000 (14:15 +0200)] 
rules.pl: Fix typo when creating blocklist drop chains.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agorules.pl: Check if the blocklist is part of the settings hash.
Stefan Schantl [Sun, 3 Apr 2022 12:14:41 +0000 (14:14 +0200)] 
rules.pl: Check if the blocklist is part of the settings hash.

Otherwise there will pop up some ugly notices on the command line and
the logs.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agofirewall: Add ipblocklist related chains.
Tim FitzGeorge [Sun, 3 Apr 2022 11:44:44 +0000 (13:44 +0200)] 
firewall: Add ipblocklist related chains.

Signed-off-by: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk>
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoshowrequestfromblocklist.dat: Modify regex for added space in
Rob Brewer [Sat, 5 Mar 2022 21:18:42 +0000 (21:18 +0000)] 
showrequestfromblocklist.dat: Modify regex for added space in
log-prefix.

Signed-off-by: Rob Brewer <rob.brewer@ipfire.org>
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoipblocklist.dat: Do not rely on any theme settings.
Rob Brewer [Sun, 3 Apr 2022 08:55:34 +0000 (10:55 +0200)] 
ipblocklist.dat: Do not rely on any theme settings.

The support for themes has been removed since ages, so we
do not need this anymore and may crash the page.

Signed-off-by: Rob Brewer <rob.brewer@ipfire.org>
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agorules.pl: Add space at the end of the log prefix.
Rob Brewer [Sun, 3 Apr 2022 08:52:56 +0000 (10:52 +0200)] 
rules.pl: Add space at the end of the log prefix.

This improves the readabiliy when digging through the logs.

Signed-off-by: Rob Brewer <rob.brewer@ipfire.org>
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoupdate-ipblocklist: Add code to reload updated blocklists.
Stefan Schantl [Mon, 7 Mar 2022 18:54:44 +0000 (19:54 +0100)] 
update-ipblocklist: Add code to reload updated blocklists.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoipblocklist.cgi: Mark and display a notice about a required reload of
Stefan Schantl [Sun, 6 Mar 2022 20:16:07 +0000 (21:16 +0100)] 
ipblocklist.cgi: Mark and display a notice about a required reload of
the firewall.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoipblocklist.cgi: Add better messages in error case.
Stefan Schantl [Sun, 6 Mar 2022 20:15:18 +0000 (21:15 +0100)] 
ipblocklist.cgi: Add better messages in error case.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agologs.cgi/log.dat: Allow to show logged ipblocklist messages.
Tim FitzGeorge [Sun, 6 Mar 2022 20:03:20 +0000 (21:03 +0100)] 
logs.cgi/log.dat: Allow to show logged ipblocklist messages.

Signed-off-by: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk>
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoMenu: Add ipblocklist entry to firewall menu.
Tim FitzGeorge [Sun, 6 Mar 2022 20:01:44 +0000 (21:01 +0100)] 
Menu: Add ipblocklist entry to firewall menu.

Signed-off-by: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk>
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoMenu: Add ipblocklist entry to log menu.
Tim FitzGeorge [Sun, 6 Mar 2022 19:58:19 +0000 (20:58 +0100)] 
Menu: Add ipblocklist entry to log menu.

Signed-off-by: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk>
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoipblocklists.dat: Remove uneccessary and broken module includes.
Rob Brewer [Sun, 6 Mar 2022 19:55:25 +0000 (20:55 +0100)] 
ipblocklists.dat: Remove uneccessary and broken module includes.

Signed-off-by: Rob Brewer <rob.brewer@ipfire.org>
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoLanguage file update for ipblocklist
Tim FitzGeorge [Sun, 6 Mar 2022 19:53:07 +0000 (20:53 +0100)] 
Language file update for ipblocklist

Signed-off-by: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk>
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoipblacklist: WUI Log details page
Tim FitzGeorge [Mon, 27 Apr 2020 14:06:14 +0000 (15:06 +0100)] 
ipblacklist: WUI Log details page

Signed-off-by: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk>
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoipblocklist: WUI Log page
Tim FitzGeorge [Mon, 27 Apr 2020 14:05:16 +0000 (15:05 +0100)] 
ipblocklist: WUI Log page

Signed-off-by: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk>
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoipblocklist.cgi: Adjust CGI to work with backend from ipblocklist-functions.pl
Stefan Schantl [Sun, 6 Mar 2022 19:23:55 +0000 (20:23 +0100)] 
ipblocklist.cgi: Adjust CGI to work with backend from ipblocklist-functions.pl

* Slightly adjust code indention.
* Remove Java Script code for show/hiding.
* Remove unnedded functions.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoipblocklist: WUI Settings page
Tim FitzGeorge [Mon, 27 Apr 2020 14:04:38 +0000 (15:04 +0100)] 
ipblocklist: WUI Settings page

Signed-off-by: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk>
3 years agoipblocklist-update: Introduce script to automatically update blacklists.
Stefan Schantl [Sun, 6 Mar 2022 14:11:48 +0000 (15:11 +0100)] 
ipblocklist-update: Introduce script to automatically update blacklists.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoipblocklist-functions.pl: Allow export of modified_file and
Stefan Schantl [Sun, 6 Mar 2022 14:09:58 +0000 (15:09 +0100)] 
ipblocklist-functions.pl: Allow export of modified_file and
blocklist_dir values.

They so easily can be accessed by other perl scripts.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoipblocklist-functions.pl: Store the local time if no last modified could
Stefan Schantl [Sun, 6 Mar 2022 14:09:18 +0000 (15:09 +0100)] 
ipblocklist-functions.pl: Store the local time if no last modified could
be determined.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoipblocklist-functions.pl: Add function to get the holdoff_rate of a
Tim FitzGeorge [Sun, 6 Mar 2022 14:07:17 +0000 (15:07 +0100)] 
ipblocklist-functions.pl: Add function to get the holdoff_rate of a
given list.

The function will return the rate in seconds based on the configured
rate value in the blocklist sources file and the given blocklist.

Signed-off-by: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk>
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agorules.pl: Add code to deal with ipblocklists.
Stefan Schantl [Tue, 1 Mar 2022 16:36:51 +0000 (17:36 +0100)] 
rules.pl: Add code to deal with ipblocklists.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoipblocklist-functions.pl: Abort and return code if a list is empty or
Stefan Schantl [Sat, 5 Mar 2022 09:01:24 +0000 (10:01 +0100)] 
ipblocklist-functions.pl: Abort and return code if a list is empty or
not parse-able.

In case the downloaded list is empty or the parser is not able to parse
it properly, the download_and_create_blocklist() function now exits and
will return "empty_list" as new error code.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoipblocklist-functions.pl: Add helper function to proper calculate the
Tim FitzGeorge [Fri, 4 Mar 2022 21:11:48 +0000 (22:11 +0100)] 
ipblocklist-functions.pl: Add helper function to proper calculate the
hashsize.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoipblocklist-functions.pl: Add parser of dshield.
Tim FitzGeorge [Fri, 4 Mar 2022 21:10:29 +0000 (22:10 +0100)] 
ipblocklist-functions.pl: Add parser of dshield.

This vendor has a different list format and therefore requires an
own parser.

Signed-off-by: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk>
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoipblocklist-functions.pl: Add parser to obtain IP or Net addresses from
Tim FitzGeorge [Fri, 4 Mar 2022 21:08:16 +0000 (22:08 +0100)] 
ipblocklist-functions.pl: Add parser to obtain IP or Net addresses from
a blocklist.

Signed-off-by: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk>
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoipblocklist-functions.pl: Add download_and_create_blocklist function.
Stefan Schantl [Fri, 4 Mar 2022 20:57:03 +0000 (21:57 +0100)] 
ipblocklist-functions.pl: Add download_and_create_blocklist function.

This function is responisible for downloading and converting the
blocklist into an ipset compatible format.

The only required argument is the blocklist (in upper letter format) which should be
performed. It automatically will setup an upstream proxy (if configured)
and grab the file specified in the blocklist vendor configuration hash.

There is a maximum amount of five attempts until the script gives up and
returns a "dl_error". In case the server responses with "Not Modified"
(Code 304) a "not_modified" will be returned.

If the blocklist successfully has been grabbed, the modification date
get stored for further purposes and the list content will be converted
and stored in an ipset compatible format.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Inspired-by: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk>
3 years agoipblocklist-functions.pl: Add get_ipset_db_file() function.
Stefan Schantl [Tue, 1 Mar 2022 16:35:20 +0000 (17:35 +0100)] 
ipblocklist-functions.pl: Add get_ipset_db_file() function.

This function is used to generate the filename and full path
for a given blocklist name.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoipblocklist-functions.pl: Initial commit.
Stefan Schantl [Tue, 1 Mar 2022 14:23:44 +0000 (15:23 +0100)] 
ipblocklist-functions.pl: Initial commit.

This library file will contain a collection of functions, which are
required to deal with the ipblocklist feature.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoipblocklist: Add sources file.
Tim FitzGeorge [Tue, 1 Mar 2022 14:31:58 +0000 (15:31 +0100)] 
ipblocklist: Add sources file.

Signed-off-by: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk>
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
3 years agoRevert "Core Update 168: Ship boost and delete orphaned libraries"
Peter Müller [Thu, 5 May 2022 21:17:47 +0000 (21:17 +0000)] 
Revert "Core Update 168: Ship boost and delete orphaned libraries"

This reverts commit 3bd471b8203b878e9e270d833d49e08921c584e3.

3 years agoRevert "boost: Fix rootfile entries that referred to python3.8 instead of 3.10"
Peter Müller [Thu, 5 May 2022 21:16:45 +0000 (21:16 +0000)] 
Revert "boost: Fix rootfile entries that referred to python3.8 instead of 3.10"

This reverts commit 05a1fe1362b633b82b696a88801bb29fb1070872.

For some reason, the rootfile changes introduced with this patch break
the build, as they do not seem to be present. Needs further
investigation.

3 years agoDrop libusb-compat
Peter Müller [Thu, 5 May 2022 16:47:44 +0000 (16:47 +0000)] 
Drop libusb-compat

This was solely needed for NUT, which has now been updated, and does not
require an older libusb version to be carried around.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agonut: Update to version 2.8.0
Adolf Belka [Thu, 5 May 2022 16:39:53 +0000 (18:39 +0200)] 
nut: Update to version 2.8.0

- Update from version 2.7.4 to 2.8.0
- 2.7.4 was released in 2016 and since then not a lot of progress was made with it but
   since the start of 2022 new work on nut has ocurred culminating in this release
- Update of rootfile
- Ran find-dependencies on the old libraries due to the sobump to confirm that nothing
   else than nut used them, which was the case.
- Changelog
After a long and windy trip since the last official release v2.7.4 half a dozen
         years ago, we the community, contributors and maintainers are proud to announce
         at last the general availability of NUT v2.8.0!
As always, the new release includes numerous new drivers, sub-drivers, protocols
         and bug-fixes, with many companies and individuals chipping in with contributions
         of code.Thanks to everyone involved in making this happen, inspiring the changes,
         and providing the open-source friendly infrastructure.
This release also culminates a significant effort in improvements of NUT QA and
         CI, and as a result -- in codebase quality and portability across a decade or
         two of recent platforms, third-party tools and other dependencies. As a side
         effect, public API (in headers and libraries) has changed a bit, hence a new
         semantic "minor" number is claimed for this major body of work.
During this time, the https://networkupstools.org/ web site has changed to a
         rolling-release model to serve current information to match the evolving
         codebase. There are now special Sub-sites for historic releases to keep
         documentation snapshots relevant for users of packages which are typically based
         on official NUT releases.
We recognize that NUT is an important piece of infrastructure which gets built
         into all sorts of devices, projects and operating systems -- some of which the
         team never heard of until they pop up in a question, and others we haven't heard
         of for years -- so we take a seriously omnivorous stance towards covering many
         versions and implementations of compiler suites, C/C++ revisions, make programs,
         shell and other scripted language interpreters, OSes and CPUs, and other similar
         variables tamed with our new NUT CI farm test matrix dynamically driven by
         currently registered build agents and their declared capabilities.
Sections in the NEWS and UPGRADING files about changes since last release are
         several pages long, so would not all be repeated here. A few important
         highlights for distribution packagers and custom builders follow, however:
    NUT now supports more i2c and modbus devices, as well as libusb-1.0 support
             as an alternative to earlier libusb-0.1 (so new dependency-based categories
             of packages for drivers may be due);
    NUT Python modules and scripts (e.g. NUT-Monitor variants) should work with
             python-2.7 and with python-3.x, so covering historic distro releases as
             well as new ones (and so your distro can deliver one or both, probably in
             several packages with different dependencies in the latter case);
    NUT provides revised reference systemd and SMF service unit definitions,
             including support of drivers wrapped into individual service instances with
             varying dependencies based on different media required (networked stack, USB
             stack, etc.), and many daemons include -F option for running "in foreground"
             to avoid extra forking after one already done by a service framework - you
             may want to use those in your packaged deliverables;
    NUT newly provides the "nut-driver-enumerator" script and service, which
             allows it to follow edition of ups.conf and dynamically define+(re)start and
             stop+undefine service instances for drivers - there are several ways it can
             be integrated for different use-cases;
    There are several new configuration keywords and CLI options - so while new
             NUT builds should work with old configs and scripts, the opposite is not
             necessarily true (old binaries may reject configurations taking advantage
             of new features);
    There are several new protocol keywords - but old and new NUT daemons (data
             server and clients) should be able to communicate both ways;
    It is assumed that API/ABI changes may require third-party NUT clients
             (library consumers of libnutclient, libupsclient, libnutscan... -- their
             version info was bumped accordingly) to get rebuilt, in order to work with
             the new NUT release in a stable fashion;
    The dummy-ups driver used in automated testing now processes *.dev filename
             patterns once and does not loop, like it still does for *.seq and other
             files (by default);
    USB code is now more strict about logical minimum/maximum ranges for data
             reported from devices, and some devices were already found to make mistakes
             - so there is also a mechanism for turning a blind eye to known issues and
             fix-up such report descriptors to produce intended sane values;
    New documentation page docs/config-prereqs.txt highlights packaged
             dependencies installable on a large range of platforms to build as much of
             NUT as possible (incidentally, ones NUT CI farm uses to test every iteration);
    Finally, we hope that NUT codebase might be able to cater for everyone "out
             of the box" (it also simplifies local builds from GitHub sources on any
             systems, for troubleshooting and checking pre-release enhancements): if you
             as a packager have to apply patches for your distribution, give it a thought
             -- whether they address a common issue best solved upstream once and behave
             similarly for everyone (and conversely, if your platform can do with
             existing solutions already tracked in the NUT version du-jour). PRs welcome!
             Or at least Wiki entries to list all the distro efforts for cross-pollination

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
3 years agoRun ./make.sh update-contributors
Peter Müller [Thu, 5 May 2022 16:24:20 +0000 (16:24 +0000)] 
Run ./make.sh update-contributors

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agooinkmaster: Delete remnants
Peter Müller [Thu, 5 May 2022 16:22:51 +0000 (16:22 +0000)] 
oinkmaster: Delete remnants

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
3 years agoCore Update 168: Ship and apply IDSv4 changes
Peter Müller [Thu, 5 May 2022 16:21:23 +0000 (16:21 +0000)] 
Core Update 168: Ship and apply IDSv4 changes

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>