Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x into ipblocklist...

diff --cc config/cron/crontab
index da07f32ff8ea3686fa34ca6a80ae3a0ac2e80e1b,c421046261fb61f5db3a51fa6efa5697d10ddfc6..253a2edc68f6f7024b0d9bc95b50dd4fa0dc7b46
--- 1/config/cron/crontab
--- 2/config/cron/crontab
+++ b/config/cron/crontab
@@@ -62,11 -62,8 +62,11 @@@ HOME=
  # Update location database
  %hourly,random * [ -f "/var/ipfire/red/active" ] && /usr/local/bin/update-location-database >/dev/null 2>&1
  
- # Update surciata rules.
- %daily,random * [ -f "/var/ipfire/red/active" ] && /usr/local/bin/update-ids-ruleset >/dev/null 2>&1
 +# Update Lists for IP-based blocking every 15 minutes.
 +@ 15 [ -f "/var/ipfire/red/active" ] && /usr/local/bin/update-ipblocklists >/dev/null 2>&1
 +
+ # Perform a surciata rules update every 12 hours.
+ @ 12h [ -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 make.sh
Simple merge