Merge remote-tracking branch 'origin/master' into next

config/rootfiles/core/110/update.sh

@@ -47,6 +47,14 @@ ldconfig
 # Remove deprecated options
 sed -e "/^RSAAuthentication/d" -i /etc/ssh/sshd_config
 
+# Remove avahi from system and pakfire db
+for i in $(cat /opt/pakfire/db/rootfiles/avahi); do
+    rm -rfv /${i}
+done
+rm -fv /opt/pakfire/db/rootfiles/avahi
+rm -fv /opt/pakfire/db/*/meta-avahi
+rm -fv /etc/rc.d/rc*.d/???avahi
+
 # Start services
 /etc/init.d/unbound start
 /etc/init.d/sshd restart

config/rootfiles/core/111/filelists/files

@@ -1,5 +1,7 @@
 etc/system-release
 etc/issue
+etc/rc.d/init.d/networking/dhcpcd.exe
+etc/rc.d/init.d/networking/red
 etc/rc.d/init.d/wlanclient
 srv/web/ipfire/cgi-bin/index.cgi
 srv/web/ipfire/cgi-bin/ipinfo.cgi

config/rootfiles/core/111/filelists/i586/openssl-sse2

@@ -0,0 +1 @@
+../../../../common/i586/openssl-sse2

config/rootfiles/core/111/filelists/openssl

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

config/rootfiles/core/111/filelists/openvpn

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