Merge branch 'next' into ipblocklist-rbsed-c168

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>

diff --cc config/backup/include
Simple merge

diff --cc config/cron/crontab
index a83c9573af2fb3a5abef9fbb8dfd66a317b2fede,d61d266190d314e773fc36c3c6ab17491c74fea4..1a2537e54130d838cd5ae908dd965f9f46ad859f
--- 1/config/cron/crontab
--- 2/config/cron/crontab
+++ b/config/cron/crontab
@@@ -62,9 -62,9 +62,12 @@@ HOME=
  # Update location database
  %hourly,random * [ -f "/var/ipfire/red/active" ] && /usr/local/bin/update-location-database >/dev/null 2>&1
  
 +# Update Lists for IP-based blocking.
 +%hourly,random * [ -f "/var/ipfire/red/active" ] && /usr/local/bin/update-ipblocklists >/dev/null 2>&1
 +
+ # Update surciata rules.
+ %daily,random * [ -f "/var/ipfire/red/active" ] && /usr/local/bin/update-ids-ruleset >/dev/null 2>&1
+ 
  # Retry sending spooled mails regularly
  %hourly * /usr/sbin/dma -q
  

diff --cc config/rootfiles/common/aarch64/stage2
Simple merge

diff --cc config/rootfiles/common/armv6l/stage2
Simple merge

diff --cc config/rootfiles/common/x86_64/stage2
Simple merge

diff --cc langs/en/cgi-bin/en.pl
Simple merge

diff --cc lfs/configroot
Simple merge

diff --cc lfs/stage2
Simple merge

diff --cc make.sh
index ba8d92564a8af51c3456f49aafac722e076841ce,09b307e362de4406f8822c85a8e91c86893e4095..cca7b3af420d20bf39929da294e62b71d705f9b3
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -1450,9 -1443,7 +1443,8 @@@ buildipfire() 
    lfsmake2 ragel
    lfsmake2 hyperscan
    lfsmake2 suricata
-   lfsmake2 oinkmaster
    lfsmake2 ids-ruleset-sources
 +  lfsmake2 ipblocklist-sources
    lfsmake2 squid
    lfsmake2 squidguard
    lfsmake2 calamaris