From: Peter Müller <peter.mueller@ipfire.org>
Date: Tue, 4 Apr 2023 20:02:58 +0000 (+0000)
Subject: Core Update 174: Ship ipblocklist-related changes
X-Git-Tag: v2.27-core174~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7970d3937287171035336bd63ee28d0cd1c82d62;p=ipfire-2.x.git

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>
---

diff --git a/config/rootfiles/core/174/filelists/files b/config/rootfiles/core/174/filelists/files
index 8b7058f812..1854e1aa27 100644
--- a/config/rootfiles/core/174/filelists/files
+++ b/config/rootfiles/core/174/filelists/files
@@ -92,7 +92,9 @@ srv/web/ipfire/cgi-bin/proxy.cgi
 srv/web/ipfire/cgi-bin/traffic.cgi
 srv/web/ipfire/cgi-bin/updatexlrator.cgi
 usr/lib/firewall/rules.pl
+usr/local/bin/update-ipblocklists
 var/ipfire/graphs.pl
 var/ipfire/header.pl
 var/ipfire/ids-functions.pl
+var/ipfire/ipblocklist-functions.pl
 var/ipfire/network-functions.pl
diff --git a/config/rootfiles/core/174/update.sh b/config/rootfiles/core/174/update.sh
index 7acaad64e9..25474a7b21 100644
--- a/config/rootfiles/core/174/update.sh
+++ b/config/rootfiles/core/174/update.sh
@@ -184,6 +184,9 @@ if [ -e "/opt/pakfire/db/installed/meta-perl-TimeDate" ] && [ -e "/opt/pakfire/d
 		/opt/pakfire/db/rootfiles/perl-TimeDate
 fi
 
+# Update IP blocklists to resolve fallout of #13072 as quickly as possible
+/usr/local/bin/update-location-database
+
 # This update needs a reboot...
 touch /var/run/need_reboot