Merge branch 'master' into next

config/rootfiles/oldcore/165/filelists/aarch64/u-boot

@@ -0,0 +1 @@
+../../../../common/aarch64/u-boot

config/rootfiles/oldcore/165/filelists/core-files

@@ -0,0 +1,5 @@
+etc/system-release
+etc/issue
+etc/os-release
+srv/web/ipfire/cgi-bin/credits.cgi
+var/ipfire/langs

config/rootfiles/oldcore/165/filelists/files

@@ -16,6 +16,7 @@ srv/web/ipfire/cgi-bin/wirelessclient.cgi
 srv/web/ipfire/html/themes/ipfire/include/css/style.css
 usr/lib/firewall/firewall-lib.pl
 usr/lib/firewall/rules.pl
+usr/local/bin/update-ids-ruleset
 usr/local/bin/update-location-database
 usr/sbin/setup
 var/ipfire/ids-functions.pl

config/rootfiles/oldcore/165/update.sh

@@ -129,6 +129,14 @@ ldconfig
 telinit u
 /etc/rc.d/init.d/firewall restart
 
+# Fix ownership of classification file.
+chown nobody:nobody /usr/share/suricata/classification.config
+
+# Rebuild IPS rules
+rm -vf /tmp/ids_page_locked
+perl -e "require '/var/ipfire/ids-functions.pl'; &IDS::oinkmaster();"
+/etc/init.d/suricata reload
+
 # This update needs a reboot...
 touch /var/run/need_reboot