Merge branch 'next'

config/rootfiles/core/167/filelists/files

@@ -2,6 +2,7 @@ etc/collectd.conf
 etc/inittab.d
 etc/rc.d/init.d/firewall
 etc/rc.d/init.d/pakfire
+etc/sysctl.conf
 lib/udev/network-hotplug-bridges
 srv/web/ipfire/cgi-bin/connections.cgi
 srv/web/ipfire/cgi-bin/dhcp.cgi
@@ -9,6 +10,7 @@ srv/web/ipfire/cgi-bin/getrrdimage.cgi
 srv/web/ipfire/cgi-bin/ids.cgi
 srv/web/ipfire/cgi-bin/location-block.cgi
 usr/lib/firewall/rules.pl
+usr/local/bin/backupiso
 usr/sbin/unbound-dhcp-leases-bridge
 var/ipfire/backup/include
 var/ipfire/dhcp/advoptions-list

config/rootfiles/core/167/filelists/gzip

@@ -0,0 +1 @@
+../../../common/gzip

config/rootfiles/core/167/update.sh

@@ -310,9 +310,6 @@ rm -rvf \
 	/usr/share/zoneinfo/US/Pacific-New \
 	/var/lib/GeoIP
 
-# Delete old 2007 Pakfire key from GPG keyring
-GNUPGHOME="/opt/pakfire/etc/.gnupg" gpg --batch --yes --delete-keys 179740DC4D8C47DC63C099C74BDE364C64D96617
-
 # Stop services
 /etc/init.d/ipsec stop
 
@@ -322,6 +319,9 @@ extract_files
 # update linker config
 ldconfig
 
+# Delete old 2007 Pakfire key from GPG keyring
+GNUPGHOME="/opt/pakfire/etc/.gnupg" gpg --batch --yes --delete-keys 179740DC4D8C47DC63C099C74BDE364C64D96617
+
 # Add new 2022 Pakfire key to GPG keyring
 GNUPGHOME="/opt/pakfire/etc/.gnupg" gpg --import /opt/pakfire/pakfire-2022.key
 
@@ -341,6 +341,12 @@ dracut --regenerate-all --force
 perl -e "require '/var/ipfire/ids-functions.pl'; &IDS::oinkmaster();"
 /etc/init.d/suricata reload
 
+# Apply sysctl changes
+/etc/init.d/sysctl start
+
+# Apply local configuration to sshd_config
+/usr/local/bin/sshctrl
+
 # Start services
 /etc/init.d/apache restart
 /etc/init.d/sshd restart