From fc842bf1c0b9e04e650a483d044e1174fc6ddcb7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Peter=20M=C3=BCller?= Date: Sun, 10 Jul 2022 08:33:32 +0000 Subject: [PATCH] Core Update 170: Ship IPBlocklist MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Peter Müller --- config/rootfiles/core/170/filelists/files | 12 ++++++++++++ .../rootfiles/core/170/filelists/ipblocklist-sources | 1 + config/rootfiles/core/170/filelists/logwatch | 1 + config/rootfiles/core/170/update.sh | 9 ++++++++- 4 files changed, 22 insertions(+), 1 deletion(-) create mode 120000 config/rootfiles/core/170/filelists/ipblocklist-sources create mode 120000 config/rootfiles/core/170/filelists/logwatch 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 -- 2.39.5