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 6c79ccaf8b5426b9ce9d58e9e6d3f52b37fd787e..cdfb44946073a344eb9ea0a9c3b981af5561d17b 100644 (file)
--- 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 (symlink)
index 0000000..31e200d
--- /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 (symlink)
index 0000000..f14eabd
--- /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 e4c8c4b84080b079a8454f97ef32dded411aa393..7cec58f922a8eabeb285ce5e64e455af598b283a 100644 (file)
--- 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