From: Peter Müller <peter.mueller@ipfire.org>
Date: Sun, 10 Jul 2022 08:33:32 +0000 (+0000)
Subject: Core Update 170: Ship IPBlocklist
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fc842bf1c0b9e04e650a483d044e1174fc6ddcb7;p=people%2Fstevee%2Fipfire-2.x.git

Core Update 170: Ship IPBlocklist

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

diff --git a/config/rootfiles/core/170/filelists/files b/config/rootfiles/core/170/filelists/files
index 6c79ccaf8b..cdfb449460 100644
--- a/config/rootfiles/core/170/filelists/files
+++ b/config/rootfiles/core/170/filelists/files
@@ -1,6 +1,18 @@
+etc/rc.d/init.d/firewall
 opt/pakfire/lib/functions.pl
 srv/web/ipfire/cgi-bin/aliases.cgi
+srv/web/ipfire/cgi-bin/ipblocklist.cgi
+srv/web/ipfire/cgi-bin/logs.cgi/ipblocklists.dat
+srv/web/ipfire/cgi-bin/logs.cgi/log.dat
+srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromblocklist.dat
+usr/lib/firewall/rules.pl
 usr/local/bin/setaliases
+usr/local/bin/update-ipblocklists
 var/ipfire/backup/bin/backup.pl
+var/ipfire/backup/include
+var/ipfire/ipblocklist-functions.pl
+var/ipfire/menu.d/50-firewall.menu
+var/ipfire/menu.d/70-log.menu
 var/ipfire/network-functions.pl
 var/ipfire/urlfilter/autoupdate/autoupdate.urls
+var/spool/cron/root.orig
diff --git a/config/rootfiles/core/170/filelists/ipblocklist-sources b/config/rootfiles/core/170/filelists/ipblocklist-sources
new file mode 120000
index 0000000000..31e200d140
--- /dev/null
+++ b/config/rootfiles/core/170/filelists/ipblocklist-sources
@@ -0,0 +1 @@
+../../../common/ipblocklist-sources
\ No newline at end of file
diff --git a/config/rootfiles/core/170/filelists/logwatch b/config/rootfiles/core/170/filelists/logwatch
new file mode 120000
index 0000000000..f14eabda99
--- /dev/null
+++ b/config/rootfiles/core/170/filelists/logwatch
@@ -0,0 +1 @@
+../../../common/logwatch
\ No newline at end of file
diff --git a/config/rootfiles/core/170/update.sh b/config/rootfiles/core/170/update.sh
index e4c8c4b840..7cec58f922 100644
--- a/config/rootfiles/core/170/update.sh
+++ b/config/rootfiles/core/170/update.sh
@@ -99,10 +99,17 @@ ldconfig
 # Filesytem cleanup
 /usr/local/bin/filesystem-cleanup
 
+# Create directory for IPBlocklist feature
+mkdir -pv /var/lib/ipblocklist
+chown nobody:nobody /var/lib/ipblocklist
+
+# Rebuild fcrontab from scratch
+/usr/bin/fcrontab -z
+
 # Start services
 
 # This update needs a reboot...
-#touch /var/run/need_reboot
+touch /var/run/need_reboot
 
 # Finish
 /etc/init.d/fireinfo start