Merge branch 'temp-stevee-idsv4' into next

diff --cc config/backup/backup.pl
Simple merge

diff --cc config/backup/include
index cc4dc27dd091bb1eebfceef0737dee7a8b9af8d5,354998eea0ad9c0ce510b2c451588702d268ba4f..d310b84875e2c518a356de654c362b5bad485f4c
--- 1/config/backup/include
--- 2/config/backup/include
+++ b/config/backup/include
@@@ -23,7 -23,7 +23,8 @@@ etc/unboun
  root/.bash_history
  root/.gitconfig
  root/.ssh
 +srv/web/ipfire/html/proxy.pac
+ var/cache/suricata
  var/ipfire/auth/users
  var/ipfire/backup/addons/backup
  var/ipfire/backup/exclude.user

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

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

diff --cc lfs/suricata
Simple merge

diff --cc make.sh
Simple merge